summaryrefslogtreecommitdiff
path: root/pkg/bundles
diff options
context:
space:
mode:
authorkali <kali@leap.se>2017-08-07 14:16:57 -0700
committerKali Kaneko <kali@leap.se>2017-08-14 18:10:14 -0400
commit0862810bca720d0d8fe4300569e2cce5ff6d37d4 (patch)
tree7cecb101cc204d1b7ec1f56692fd31949b8785e1 /pkg/bundles
parent523ec97cafcaff3090edbe18a1edcb4e615370a0 (diff)
[bug] report version correctly in bundles
- Resolves: #8992
Diffstat (limited to 'pkg/bundles')
-rw-r--r--pkg/bundles/build.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk
index 158293b..0db7f3a 100644
--- a/pkg/bundles/build.mk
+++ b/pkg/bundles/build.mk
@@ -20,6 +20,7 @@ bundle: bundle_clean
cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)/
cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/bitmask_js $(DIST)/leap/
cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/pixelated_www $(DIST)/leap/
+ echo `git describe` > $(DIST)/version
mv $(DIST) _bundlelib && mkdir $(DIST_VERSION) && mv _bundlelib $(DIST_VERSION)/lib/
cd pkg/launcher && make
cp pkg/launcher/bitmask $(DIST_VERSION)
@@ -55,6 +56,7 @@ bundle_osx_helpers:
bundle_osx_missing:
cp $(DIST_VERSION)/lib/_scrypt.so $(OSX_CON)/
cp $(DIST_VERSION)/lib/bitmaskd.tac $(OSX_CON)/
+ cp $(DIST_VERSION)/lib/version $(OSX_CON)/
cp -r $(DIST_VERSION)/lib/leap $(OSX_CON)/
mv dist/Bitmask.app/Contents/MacOS/bitmask $(OSX_CON)/bitmask-app
cp pkg/osx/bitmask-wrapper $(OSX_CON)/bitmask