From 0236c16af176a4049b9ff1354f8af42764c5bdc8 Mon Sep 17 00:00:00 2001
From: Simon Fondrie-Teitler <simonft@riseup.net>
Date: Fri, 22 Dec 2017 18:13:09 -0500
Subject: [pkg] Include required files in headless build

Also pull in cython and restructure the package.
---
 pkg/bundles/build.mk     | 10 ++++++++++
 pkg/pyinst/headless.spec |  1 +
 2 files changed, 11 insertions(+)

(limited to 'pkg')

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',
-- 
cgit v1.2.3