Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support of MSI packaging in Linux #138

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,18 @@ ${SUSE}: ${WAR} $(shell find suse/build -type f)
suse.publish: ${SUSE} $(shell find suse/publish -type f)
./suse/publish/publish.sh


msi: ${MSI}
msi.publish: ${MSI}
mkdir -p "${MSIDIR}/${VERSION}/"
mkdir -p "${MSI_WEBDIR}"
sha256sum ${MSI} | sed 's, .*, ${ARTIFACTNAME}.msi,' > ${MSI_SHASUM}
cat ${MSI_SHASUM}
rsync -avz "${MSI}" "${MSIDIR}/${VERSION}/${ARTIFACTNAME}.msi"
rsync -avz "${MSI_SHASUM}" "${MSIDIR}/${VERSION}/"
./bin/indexGenerator.py \
--distribution windows \
--binaryDir "${MSIDIR}" \
--targetDir "${WAR_WEBDIR}"

${CLI}:
@mkdir ${TARGET} || true
Expand Down
2 changes: 2 additions & 0 deletions env/release.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export SUSEDIR=/srv/releases/jenkins/opensuse${RELEASELINE}
export RPM_WEBDIR=/var/www/pkg.jenkins.io.staging/redhat${RELEASELINE}
export SUSE_WEBDIR=/var/www/pkg.jenkins.io.staging/opensuse${RELEASELINE}
export DEB_WEBDIR=/var/www/pkg.jenkins.io.staging/debian${RELEASELINE}
export WAR_WEBDIR=/var/www/pkg.jenkins.io.staging/war${RELEASELINE}
export MSI_WEBDIR=/var/www/pkg.jenkins.io.staging/windows${RELEASELINE}

# URL to the aforementioned webdir
export RPM_URL=https://pkg.jenkins.io/redhat${RELEASELINE}
Expand Down
2 changes: 2 additions & 0 deletions env/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export SUSEDIR=${TESTDIR}/opensuse${RELEASELINE}
export RPM_WEBDIR=${TESTDIR}/redhat${RELEASELINE}
export SUSE_WEBDIR=${TESTDIR}/opensuse${RELEASELINE}
export DEB_WEBDIR=${TESTDIR}/debian${RELEASELINE}
export WAR_WEBDIR=${TESTDIR}/war${RELEASELINE}
export MSI_WEBDIR=${TESTDIR}/windows${RELEASELINE}

# URL to the aforementioned webdir.
WEBSERVER=pkg.jenkins.io
Expand Down
4 changes: 2 additions & 2 deletions setup.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export TARGET:=target
# jenkins-cli.jar
export CLI:=${TARGET}/jenkins-cli.jar

# where to generate MSI file?
export MSI:=${TARGET}/msi/${ARTIFACTNAME}-${VERSION}.zip
# MSI file to release
export MSI?=$(error Required variable MSI must point to the jenkins.msi file you are packaging)
export MSI_SHASUM:=${MSI}.sha256

# where to generate OSX PKG file?
Expand Down