diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | pkg/bundles/build.mk | 10 | ||||
| -rw-r--r-- | pkg/pyinst/headless.spec | 1 | 
3 files changed, 12 insertions, 0 deletions
| @@ -2,6 +2,7 @@ DIST=dist/bitmask  HEADLESS_DIST=dist/bitmask-nox  NEXT_VERSION = $(shell cat pkg/next-version)  DIST_VERSION = dist/bitmask-$(NEXT_VERSION)/ +HEADLESS_DIST_VERSION = dist/bitmask-nox-$(NEXT_VERSION)/  BITMASK_ROOT = src/leap/bitmask/vpn/helpers/linux/bitmask-root  POLKIT_POLICY = src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk index ab2bdadf..305b16f5 100644 --- a/pkg/bundles/build.mk +++ b/pkg/bundles/build.mk @@ -120,3 +120,13 @@ bundle_headless:  	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/_scrypt.so $(HEADLESS_DIST)  	cp src/leap/bitmask/core/bitmaskd.tac $(HEADLESS_DIST)  	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(HEADLESS_DIST)/ +	mkdir -p $(HEADLESS_DIST)/leap/soledad/client/_db +	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/soledad/client/_db/dbschema.sql $(HEADLESS_DIST)/leap/soledad/client/_db/ +	echo `git describe` > $(HEADLESS_DIST)/version +	mv $(HEADLESS_DIST) _bundlelib && mkdir $(HEADLESS_DIST_VERSION) && mv _bundlelib $(HEADLESS_DIST_VERSION)lib/ +	ln $(HEADLESS_DIST_VERSION)lib/bitmask-nox $(HEADLESS_DIST_VERSION)lib/bitmask +	mkdir -p $(HEADLESS_DIST_VERSION)apps/mail +	test -f /usr/bin/gpg1 && cp /usr/bin/gpg1 $(HEADLESS_DIST_VERSION)apps/mail/gpg || cp /usr/bin/gpg $(HEADLESS_DIST_VERSION)apps/mail/gpg +	cd pkg/launcher && make +	cp release-notes.rst $(HEADLESS_DIST_VERSION) +	cp pkg/launcher/bitmask $(HEADLESS_DIST_VERSION) diff --git a/pkg/pyinst/headless.spec b/pkg/pyinst/headless.spec index d7a6f34c..7dbb77bc 100644 --- a/pkg/pyinst/headless.spec +++ b/pkg/pyinst/headless.spec @@ -16,6 +16,7 @@ if IS_MAC:  hiddenimports = [       'appdirs', +     'cython',       'scrypt._scrypt',       'scrypt', 'zope.interface', 'zope.proxy',       'pysqlcipher', 'service_identity', | 
