summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-10-09 10:45:55 -0400
committerKali Kaneko <kali@leap.se>2015-10-09 10:55:13 -0400
commit88650850f95dba88cb4026a37d10285021ffbc4f (patch)
tree644c6866540e97f197d9b8bb17ba3e0515b7e56a
parentc947a34a712d221b31560a637bbfdf5b16eccd0b (diff)
[pkg] make sumo tar non-namespace package
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cd421d16..1cfeecb4 100644
--- a/Makefile
+++ b/Makefile
@@ -141,11 +141,15 @@ checkout_leapdeps_develop:
checkout_leapdeps_release:
pkg/scripts/checkout_leap_versions.sh
-sumo_tarball_release: checkout_leapdeps_release
+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
@@ -153,11 +157,12 @@ sumo_tarball_release: checkout_leapdeps_release
# 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
+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
pyinst:
pyinstaller -y pkg/pyinst/bitmask.spec