diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-04 22:49:56 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-06 17:30:25 -0400 |
| commit | c35d9f6338300dcf6f1688ee2df9475dd14b8c94 (patch) | |
| tree | 5e48490fbf10de3fcc3abb9e7784b59fee190c43 | |
| parent | b4dde3d5112c95574f85f62daf0c2c75db391f52 (diff) | |
[pkg] move the pyinstaller bundle to a child folder
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | docs/release_checklist.wiki | 3 | ||||
| -rw-r--r-- | pkg/next-version | 1 | ||||
| -rw-r--r-- | pkg/pyinst/pyinst-build.mk | 27 |
4 files changed, 28 insertions, 6 deletions
@@ -41,7 +41,10 @@ PYLUP = pyside-lupdate LRELE = lrelease # pyinst dist dir + DIST = dist/bitmask/ +NEXT_VERSION = $(shell cat pkg/next-version) +DIST_VERSION = dist/bitmask-$(NEXT_VERSION)/ ################################# diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index 075591a7..f831d965 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -1,6 +1,7 @@ = Bitmask Release Checklist (*) = * [ ] Check that all tests are passing! * [ ] Check that the version in bitmask_client/pkg/linux/bitmask-root is bumped if needed. + * [ ] Update pkg/next-release * [ ] Tag everything * Should be done for the following packages, in order: * [ ] 1. leap.common @@ -31,7 +32,7 @@ * [ ] git push origin master; git push origin X.Y.Z * [ ] git checkout develop && git merge master && git push origin develop * [ ] Build and upload bundles - * [ ] Use the scripts under pkg/<os>/ to build the the bundles. + * [ ] Use 'make pyinst-linux' to build bundles. * [ ] Sign them with gpg -a --sign --detach-sign <path/to/bundle> * [ ] Upload bundle and signature to downloads.leap.se/client/<os>/Bitmask-<os>-<ver>.(tar.bz2,dmg,zip) * [ ] Update symbolic link for latest upload and signature: diff --git a/pkg/next-version b/pkg/next-version new file mode 100644 index 00000000..8df8fe62 --- /dev/null +++ b/pkg/next-version @@ -0,0 +1 @@ +0.9.2.alpha3 diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk index 532ec88c..637390a8 100644 --- a/pkg/pyinst/pyinst-build.mk +++ b/pkg/pyinst/pyinst-build.mk @@ -1,5 +1,7 @@ pyinst: - echo "MAKE SURE OF FREEZING VERSION FIRST!" + echo "*********************************************" + echo "MAKE SURE OF MANUALLY FREEZING VERSION FIRST!" + echo "*********************************************" pyinstaller -y pkg/pyinst/bitmask.spec pyinst-hacks: @@ -19,6 +21,7 @@ pyinst-trim: #rm -f dist/bitmask/libgstreamer-1.0.so.0 pyinst-wrapper: + # TODO this *is* an ugly hack, See #7352 mv $(DIST)libQtCore.so.4 $(DIST)libQtCore.so.4.orig mv $(DIST)libQtGui.so.4 $(DIST)libQtGui.so.4.orig mv $(DIST)libQtNetwork.so.4 $(DIST)libQtNetwork.so.4.orig @@ -28,12 +31,26 @@ pyinst-wrapper: mv $(DIST)libQtXml.so.4 $(DIST)libQtXml.so.4.orig mv $(DIST)bitmask $(DIST)bitmask-app cp pkg/linux/bitmask-launcher $(DIST)bitmask - cp pkg/PixelatedWebmail.README $(DIST) - -pyinst-dist: +pyinst-cleanup: rm -rf $(DIST)config - cd dist/ && tar cvzf Bitmask.0.9.2.alpha2.tar.gz bitmask + mkdir -p $(DIST_VERSION) + mv $(DIST) $(DIST_VERSION)libs + cd pkg/launcher && make + mv pkg/launcher/bitmask $(DIST_VERSION) + +pyinst-distribution-data: + cp release-notes.rst $(DIST_VERSION) + cp pkg/PixelatedWebmail.README $(DIST_VERSION) + cp LICENSE $(DIST_VERSION) + +pyinst-tar: + cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION) + +pyinst-sign: + # TODO ---- get LEAP_MAINTAINER from environment + +pyinst-linux: pyinst pyinst-hacks pyinst-trim pyinst-wrapper pyinst-cleanup pyinst-distribution-data pyinst-tar clean_pkg: rm -rf build dist |