diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2017-03-06 10:11:57 +0100 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-03-06 10:11:57 +0100 |
| commit | 72d6835ff22ac926675c31789a332112ee73a2cf (patch) | |
| tree | 5ea68100924051d8b661d4539ae0bfa0c09a91d3 /pkg/build_bundle_with_venv.sh | |
| parent | a8c215ca65b8dde0d15973528eba5e765810bcd5 (diff) | |
[pkg] several bundling fixes
Diffstat (limited to 'pkg/build_bundle_with_venv.sh')
| -rwxr-xr-x | pkg/build_bundle_with_venv.sh | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh index daaa6393..5658a837 100755 --- a/pkg/build_bundle_with_venv.sh +++ b/pkg/build_bundle_with_venv.sh @@ -6,26 +6,36 @@ ########################################################### virtualenv venv source venv/bin/activate -$VIRTUAL_ENV/bin/pip install -U pyinstaller==3.1 packaging +$VIRTUAL_ENV/bin/pip install appdirs packaging +# $VIRTUAL_ENV/bin/pip install -U pyinstaller==3.1 +$VIRTUAL_ENV/bin/pip install -U pyinstaller $VIRTUAL_ENV/bin/pip install zope.interface zope.proxy +# fix for #8789 +$VIRTUAL_ENV/bin/pip --no-cache-dir install pysqlcipher --install-option="--bundled" +# FIXME pixelated needs chardet but doesn't declare it +$VIRTUAL_ENV/bin/pip install chardet + + # For the Bitmask 0.9.5 bundles. -#$VIRTUAL_ENV/bin/pip install -U leap.soledad.common==0.9.3 -#$VIRTUAL_ENV/bin/pip install -U leap.soledad.client==0.9.3 +$VIRTUAL_ENV/bin/pip install -U leap.soledad.common==0.9.3 +$VIRTUAL_ENV/bin/pip install -U leap.soledad.client==0.9.3 # CHANGE THIS IF YOU WANT A DIFFERENT BRANCH CHECKED OUT FOR COMMON/SOLEDAD -------------------- -$VIRTUAL_ENV/bin/pip install -U leap.soledad.common --find-links https://devpi.net/kali/dev -$VIRTUAL_ENV/bin/pip install -U leap.soledad.client --find-links https://devpi.net/kali/dev +# $VIRTUAL_ENV/bin/pip install -U leap.soledad.common --find-links https://devpi.net/kali/dev +# $VIRTUAL_ENV/bin/pip install -U leap.soledad.client --find-links https://devpi.net/kali/dev # ---------------------------------------------------------------------------------------------- # XXX hack for the namespace package not being properly handled by pyinstaller touch $VIRTUAL_ENV/lib/python2.7/site-packages/zope/__init__.py touch $VIRTUAL_ENV/lib/python2.7/site-packages/leap/soledad/__init__.py -make dev-all +make dev-gui +make dev-mail -$VIRTUAL_ENV/bin/pip uninstall leap.bitmask -$VIRTUAL_ENV/bin/pip install . +$VIRTUAL_ENV/bin/pip uninstall --yes leap.bitmask +$VIRTUAL_ENV/bin/python setup.py sdist bdist_wheel --universal +$VIRTUAL_ENV/bin/pip install dist/*.whl # install pixelated from kali dev repo until assets get packaged. pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/ |