From b4dde3d5112c95574f85f62daf0c2c75db391f52 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 4 Apr 2016 22:19:52 -0400 Subject: [pkg] modularize main makefile to remove clutter --- pkg/pyinst/pyinst-build.mk | 39 +++++++++++++++++++++++++++++++++++++++ pkg/sumo-tarballs.mk | 25 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 pkg/pyinst/pyinst-build.mk create mode 100644 pkg/sumo-tarballs.mk (limited to 'pkg') diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk new file mode 100644 index 00000000..532ec88c --- /dev/null +++ b/pkg/pyinst/pyinst-build.mk @@ -0,0 +1,39 @@ +pyinst: + echo "MAKE SURE OF FREEZING VERSION FIRST!" + pyinstaller -y pkg/pyinst/bitmask.spec + +pyinst-hacks: + cp ../leap_common/src/leap/common/cacert.pem $(DIST) + mkdir -p $(DIST)pysqlcipher + cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysqlcipher/_sqlite.so $(DIST)pysqlcipher + cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/pixelated_www $(DIST) + +pyinst-trim: + rm -f $(DIST)libQtOpenGL.so.4 + rm -f $(DIST)libQtSql.so.4 + rm -f $(DIST)libQt3Support.so.4 + rm -f $(DIST)libaudio.so.2 + rm -f $(DIST)libnvidia-* + #rm -f dist/bitmask/libgstvideo-1.0.so.0 + #rm -f dist/bitmask/libgstaudio0.0.so.0 + #rm -f dist/bitmask/libgstreamer-1.0.so.0 + +pyinst-wrapper: + 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 + mv $(DIST)libQtSvg.so.4 $(DIST)libQtSvg.so.4.orig + mv $(DIST)libQtWebKit.so.4 $(DIST)libQtWebKit.so.4.orig + mv $(DIST)libQtXmlPatterns.so.4 $(DIST)libQtXmlPatterns.so.4.orig + 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: + rm -rf $(DIST)config + cd dist/ && tar cvzf Bitmask.0.9.2.alpha2.tar.gz bitmask + +clean_pkg: + rm -rf build dist diff --git a/pkg/sumo-tarballs.mk b/pkg/sumo-tarballs.mk new file mode 100644 index 00000000..3bd5fa77 --- /dev/null +++ b/pkg/sumo-tarballs.mk @@ -0,0 +1,25 @@ +checkout_leapdeps_release: + pkg/scripts/checkout_leap_versions.sh + +setup_without_namespace: + awk '!/namespace_packages*/' setup.py > file && mv file setup.py + +sumo_tarball_release: checkout_leapdeps_release setup_without_namespace + python setup.py sdist --sumo + git checkout -- src/leap/__init__.py + git checkout -- src/leap/bitmask/_version.py + rm -rf src/leap/soledad + git checkout -- setup.py + +# XXX We need two sets of sumo-tarballs: the one published for a release +# (that will pick the pinned leap deps), and the other which will be used +# for the nightly builds. +# TODO change naming scheme for sumo-latest: should include date (in case +# bitmask is not updated bu the dependencies are) + +sumo_tarball_latest: checkout_leapdeps_develop pull_leapdeps setup_without_namespace + python setup.py sdist --sumo # --latest + git checkout -- src/leap/__init__.py + git checkout -- src/leap/bitmask/_version.py + rm -rf src/leap/soledad + git checkout -- setup.py -- cgit v1.2.3