From b226c1a3c44df3bfe9b888be1f8661a69f53a88b Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 15 Jan 2015 17:21:01 -0400 Subject: gather bitmask dependency tree --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e7173c80..3ef61df9 100644 --- a/Makefile +++ b/Makefile @@ -119,5 +119,8 @@ install_wheel: # if it's the first time, you'll need to get_wheels first pip install --pre --use-wheel --no-index --find-links=../wheelhouse -r pkg/requirements.pip +gather_deps: + pipdeptree | pkg/scripts/filter-bitmask-deps + clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) -- cgit v1.2.3 From c06bf409d3fe2268011214301c59dc1c279fae44 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 4 Feb 2015 00:59:32 -0400 Subject: create sumo tarball with leap dependencies (Closes: #6683) --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3ef61df9..efd27b12 100644 --- a/Makefile +++ b/Makefile @@ -122,5 +122,14 @@ install_wheel: gather_deps: pipdeptree | pkg/scripts/filter-bitmask-deps +all_leap_develop: + cd ../keymanager && git checkout develop + cd ../leap_common && git checkout develop + cd ../leap_mail && git checkout develop + cd ../soledad && git checkout develop + +all_leap_release_tags: + pkg/scripts/checkout_leap_versions.sh + clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) -- cgit v1.2.3 From d0dc9d7d5319bd26e33b3d72eace2c8230570373 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 21 Jul 2015 01:00:58 -0400 Subject: [pkg] add sumo_tarball target, with cleanup steps --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index efd27b12..b2fb5051 100644 --- a/Makefile +++ b/Makefile @@ -131,5 +131,10 @@ all_leap_develop: all_leap_release_tags: pkg/scripts/checkout_leap_versions.sh +sumo_tarball: + python setup.py sdist --sumo + git checkout -- src/leap/__init__.py + rm -rf src/leap/soledad + clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) -- cgit v1.2.3 From c68754c16629a6b45c7feba57f14d51a1617c4a2 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 22 Jun 2015 19:15:22 -0400 Subject: [feat] initial working bundle with pyinstaller linux only, at the moment, but it's a good start :) --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b2fb5051..d0d68f2d 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,8 @@ sumo_tarball: python setup.py sdist --sumo git checkout -- src/leap/__init__.py rm -rf src/leap/soledad +pyinst: + pyinstaller pkg/pyinst/bitmask.spec clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) -- cgit v1.2.3 From 09fed97dc5150e38086b443d5e83c6591f5d834f Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 Jul 2015 14:35:57 -0700 Subject: [pkg] utility targets on makefile, spec changes --- Makefile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d0d68f2d..011e437c 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,7 @@ ifndef RESOURCE_TIME export RESOURCE_TIME=10 endif +CURDIR = $(shell pwd) # all : resources ui @@ -122,13 +123,13 @@ install_wheel: gather_deps: pipdeptree | pkg/scripts/filter-bitmask-deps -all_leap_develop: - cd ../keymanager && git checkout develop - cd ../leap_common && git checkout develop - cd ../leap_mail && git checkout develop - cd ../soledad && git checkout develop +install_base_deps: + for repo in leap_common keymanager leap_mail soledad/common soledad/client; do cd $(CURDIR)/../$$repo && pkg/pip_install_requirements.sh; done -all_leap_release_tags: +checkout_leapdeps_develop: + for repo in leap_common keymanager leap_mail soledad; do cd $(CURDIR)/../$$repo && git checkout develop; done + +checkout_leapdeps_release: pkg/scripts/checkout_leap_versions.sh sumo_tarball: @@ -136,7 +137,13 @@ sumo_tarball: git checkout -- src/leap/__init__.py rm -rf src/leap/soledad pyinst: - pyinstaller pkg/pyinst/bitmask.spec + pyinstaller -y pkg/pyinst/bitmask.spec + mkdir -p dist/bitmask/cryptography/hazmat/bindings/openssl/src/ + cp pkg/pyinst/cryptography/* dist/bitmask/cryptography/hazmat/bindings/openssl/src + cp -r dist/bitmask/cryptography dist/Bitmask.app/Contents/Resources/ + +clean_pkg: + rm -rf build dist clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) -- cgit v1.2.3 From 38ff5acc29b775291c9d4c799e89a81098fbde8b Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 3 Aug 2015 14:01:01 -0400 Subject: [pkg] fix name of common repo --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 011e437c..4848ae17 100644 --- a/Makefile +++ b/Makefile @@ -124,10 +124,10 @@ gather_deps: pipdeptree | pkg/scripts/filter-bitmask-deps install_base_deps: - for repo in leap_common keymanager leap_mail soledad/common soledad/client; do cd $(CURDIR)/../$$repo && pkg/pip_install_requirements.sh; done + for repo in leap_pycommon keymanager leap_mail soledad/common soledad/client; do cd $(CURDIR)/../$$repo && pkg/pip_install_requirements.sh; done checkout_leapdeps_develop: - for repo in leap_common keymanager leap_mail soledad; do cd $(CURDIR)/../$$repo && git checkout develop; done + for repo in leap_pycommon keymanager leap_mail soledad; do cd $(CURDIR)/../$$repo && git checkout develop; done checkout_leapdeps_release: pkg/scripts/checkout_leap_versions.sh -- cgit v1.2.3 From b7d6437b5fcd4c503e475dbbd1ed4e6ae81824ac Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 3 Aug 2015 16:04:02 -0400 Subject: [pkg] add checkout-release target as a requisite for sumo-tarball --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4848ae17..2f0c15d7 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ checkout_leapdeps_develop: checkout_leapdeps_release: pkg/scripts/checkout_leap_versions.sh -sumo_tarball: +sumo_tarball: checkout_leapdeps_release python setup.py sdist --sumo git checkout -- src/leap/__init__.py rm -rf src/leap/soledad -- cgit v1.2.3 From f69c59b403326953d11e7c1ffbd4734b491063c0 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 3 Aug 2015 16:23:11 -0400 Subject: [pkg] add missing step to install our own deps --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2f0c15d7..86ca490e 100644 --- a/Makefile +++ b/Makefile @@ -125,6 +125,7 @@ gather_deps: install_base_deps: for repo in leap_pycommon keymanager leap_mail soledad/common soledad/client; do cd $(CURDIR)/../$$repo && pkg/pip_install_requirements.sh; done + pkg/pip_install_requirements.sh checkout_leapdeps_develop: for repo in leap_pycommon keymanager leap_mail soledad; do cd $(CURDIR)/../$$repo && git checkout develop; done -- cgit v1.2.3 From 981c2a231384a67077061b29708e6feef49c78d8 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 4 Aug 2015 14:36:11 -0400 Subject: [pkg] add target to pull latest from all repos --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 86ca490e..7df6bbb1 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,8 @@ LRELE = lrelease ################################# # DO NOT EDIT FOLLOWING +LEAP_REPOS = leap_pycommon keymanager leap_mail soledad + COMPILED_UI = $(UI_FILES:%.ui=$(COMPILED_DIR)/ui_%.py) COMPILED_RESOURCES = $(RESOURCES:%.qrc=$(COMPILED_DIR)/%_rc.py) @@ -58,7 +60,8 @@ ifndef RESOURCE_TIME endif CURDIR = $(shell pwd) -# + +########################################### all : resources ui @@ -77,6 +80,7 @@ $(COMPILED_DIR)/ui_%.py : $(UI_DIR)/%.ui $(COMPILED_DIR)/%_rc.py : $(RESOURCE_DIR)/%.qrc $(PYRCC) $< -o $@ + manpages: rst2man docs/man/bitmask.1.rst docs/man/bitmask.1 @@ -127,8 +131,11 @@ install_base_deps: for repo in leap_pycommon keymanager leap_mail soledad/common soledad/client; do cd $(CURDIR)/../$$repo && pkg/pip_install_requirements.sh; done pkg/pip_install_requirements.sh +pull_leapdeps: + for repo in $(LEAP_REPOS); do cd $(CURDIR)/../$$repo && git pull; done + checkout_leapdeps_develop: - for repo in leap_pycommon keymanager leap_mail soledad; do cd $(CURDIR)/../$$repo && git checkout develop; done + for repo in $(LEAP_REPOS); do cd $(CURDIR)/../$$repo && git checkout develop; done checkout_leapdeps_release: pkg/scripts/checkout_leap_versions.sh -- cgit v1.2.3 From ddd112e53179cbccbf852d3dd70a80cfc171a957 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Thu, 13 Aug 2015 16:26:42 -0300 Subject: [bug] copy for cryptography files not needed Those files are no longer needed (nor present on the repo). - Resolves: #7384 --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7df6bbb1..f6d4d33a 100644 --- a/Makefile +++ b/Makefile @@ -144,11 +144,9 @@ sumo_tarball: checkout_leapdeps_release python setup.py sdist --sumo git checkout -- src/leap/__init__.py rm -rf src/leap/soledad + pyinst: pyinstaller -y pkg/pyinst/bitmask.spec - mkdir -p dist/bitmask/cryptography/hazmat/bindings/openssl/src/ - cp pkg/pyinst/cryptography/* dist/bitmask/cryptography/hazmat/bindings/openssl/src - cp -r dist/bitmask/cryptography dist/Bitmask.app/Contents/Resources/ clean_pkg: rm -rf build dist -- cgit v1.2.3 From 728f542753c7307cc908e8d40e5ca0df4feaa5da Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 21 Aug 2015 14:28:22 -0400 Subject: [pkg] add sumo_tarball_latest target --- Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f6d4d33a..39fe7717 100644 --- a/Makefile +++ b/Makefile @@ -140,9 +140,22 @@ checkout_leapdeps_develop: checkout_leapdeps_release: pkg/scripts/checkout_leap_versions.sh -sumo_tarball: checkout_leapdeps_release +sumo_tarball_release: checkout_leapdeps_release python setup.py sdist --sumo git checkout -- src/leap/__init__.py + git checkout -- src/leap/bitmask/_version.py + rm -rf src/leap/soledad + +# 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 + python setup.py sdist --sumo # --latest + git checkout -- src/leap/__init__.py + git checkout -- src/leap/bitmask/_version.py rm -rf src/leap/soledad pyinst: -- cgit v1.2.3