summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-06 16:02:11 -0400
committerKali Kaneko <kali@leap.se>2016-04-06 17:30:25 -0400
commit40604c0b2abe4d51e5e7b41a0e71c78a958b0b87 (patch)
tree7529113afb388f1396c17625f63d3387052926f8
parentbb0dd2d30c7408cf3a50bafd8085aa69ca02e4f2 (diff)
[pkg] copy helpers, freeze version
-rw-r--r--Makefile1
-rw-r--r--pkg/pyinst/pyinst-build.mk32
-rw-r--r--pkg/version-template8
3 files changed, 35 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 6a8fbecb..f96d810d 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ LRELE = lrelease
DIST = dist/bitmask/
NEXT_VERSION = $(shell cat pkg/next-version)
DIST_VERSION = dist/bitmask-$(NEXT_VERSION)/
+GIT_COMMIT = $(shell git rev-parse HEAD)
#################################
diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk
index 637390a8..a14f2a8d 100644
--- a/pkg/pyinst/pyinst-build.mk
+++ b/pkg/pyinst/pyinst-build.mk
@@ -1,9 +1,14 @@
-pyinst:
- echo "*********************************************"
- echo "MAKE SURE OF MANUALLY FREEZING VERSION FIRST!"
- echo "*********************************************"
+freeze-ver:
+ cp pkg/version-template src/leap/bitmask/_version.py
+ sed -i 's/^version_version\(.*\)/version_version = "$(NEXT_VERSION)"/' src/leap/bitmask/_version.py
+ sed -i 's/^full_revisionid\(.*\)/full_revisionid = "$(GIT_COMMIT)"/' src/leap/bitmask/_version.py
+
+pyinst: freeze-ver
pyinstaller -y pkg/pyinst/bitmask.spec
+reset-ver:
+ git checkout -- src/leap/bitmask/_version.py
+
pyinst-hacks:
cp ../leap_common/src/leap/common/cacert.pem $(DIST)
mkdir -p $(DIST)pysqlcipher
@@ -44,13 +49,28 @@ pyinst-distribution-data:
cp pkg/PixelatedWebmail.README $(DIST_VERSION)
cp LICENSE $(DIST_VERSION)
+pyinst-linux-helpers:
+ mkdir -p $(DIST_VERSION)apps/eip/files
+ # TODO compile static
+ cp /usr/sbin/openvpn $(DIST_VERSION)apps/eip/files/leap-openvpn
+ cp pkg/linux/bitmask-root $(DIST_VERSION)apps/eip/files/
+ cp pkg/linux/leap-install-helper.sh $(DIST_VERSION)apps/eip/files/
+ cp pkg/linux/polkit/se.leap.bitmask.bundle.policy $(DIST_VERSION)apps/eip/files/
+ mkdir -p $(DIST_VERSION)apps/mail
+ # TODO compile static
+ cp /usr/bin/gpg $(DIST_VERSION)apps/mail
+
pyinst-tar:
cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION)
pyinst-sign:
- # TODO ---- get LEAP_MAINTAINER from environment
+ gpg2 -a --sign --detach-sign dist/Bitmask.$(NEXT_VERSION).tar.gz
+
+pyinst-upload:
+ scp dist/Bitmask.$(NEXT_VERSION).* salmon.leap.se:./
-pyinst-linux: pyinst pyinst-hacks pyinst-trim pyinst-wrapper pyinst-cleanup pyinst-distribution-data pyinst-tar
+#pyinst-linux: pyinst pyinst-hacks pyinst-trim pyinst-wrapper pyinst-cleanup pyinst-distribution-data pyinst-tar
+pyinst-linux: pyinst reset-ver pyinst-hacks pyinst-trim pyinst-cleanup pyinst-distribution-data pyinst-linux-helpers pyinst-tar
clean_pkg:
rm -rf build dist
diff --git a/pkg/version-template b/pkg/version-template
new file mode 100644
index 00000000..ecb5b987
--- /dev/null
+++ b/pkg/version-template
@@ -0,0 +1,8 @@
+version_version = "xxx"
+full_revisionid = 'deadbeef'
+
+
+def get_versions(default={}, verbose=False):
+ return {'version': version_version,
+ 'full-revisionid': full_revisionid}
+