diff options
| -rwxr-xr-x | createbundle.sh | 47 | ||||
| -rw-r--r-- | pkg/requirements.pip | 6 |
2 files changed, 37 insertions, 16 deletions
diff --git a/createbundle.sh b/createbundle.sh index 825fb43..e8b7583 100755 --- a/createbundle.sh +++ b/createbundle.sh @@ -52,6 +52,7 @@ else fi install_dependencies() { + sudo apt-get update # update apt, otherwise some packages may not be found sudo apt-get install -y build-essential python-dev cmake git autoconf \ libtool liblzo2-dev libqt4-dev libxml2-dev libxslt1-dev qtmobility-dev \ libsqlite3-dev libffi-dev python-virtualenv @@ -145,10 +146,6 @@ setup_bundler() { git clone https://github.com/leapcode/bitmask_bundler.git bitmask_bundler.git virtualenv bundler.venv && source bundler.venv/bin/activate - # install dependencies by hand... - pip install psutil - pip install tuf # used in the launher, it is not in any requirements.txt - git clone https://github.com/chiiph/protobuf-socket-rpc protobuf-socket-rpc.git cd protobuf-socket-rpc.git python setup.py easy_install -Z . @@ -156,28 +153,50 @@ setup_bundler() { pip install -r $BASE/bitmask_bundler.git/pkg/requirements.pip } +clean() { + cd $BASE + rm -fr bitmask_bundler.git bundler.venv protobuf-socket-rpc.git bundler.output +} + run_bundler() { cd $BASE # if the virtualenv is not sourced, then source it! - # this is helpful if you want to run this step only + # this is helpful if you want to run only this step [[ -z "$VIRTUAL_ENV" ]] && source bundler.venv/bin/activate set_pyside_environment mkdir bundler.output - python bitmask_bundler.git/bundler/main.py --workon bundler.output --binaries binaries/ --paths-file bundler.paths --do gitclone pythonsetup $VERSION - python bitmask_bundler.git/bundler/main.py --workon bundler.output --binaries binaries/ --paths-file bundler.paths --skip gitclone pythonsetup $VERSION + + # Use a shortcut for the bundler command + bundler="python bitmask_bundler.git/bundler/main.py --workon bundler.output --binaries binaries/ --paths-file bundler.paths" + + $bundler --do gitclone + $bundler --do gitcheckout --versions-file $BASE/bitmask.json + + $bundler --do pythonsetup + $bundler --skip gitclone gitcheckout pythonsetup --versions-file $BASE/bitmask.json } [[ "$1" == 'nightly' ]] && VERSION='--nightly' -install_dependencies -build_boost -build_launcher -build_openvpn -build_pyside -copy_binaries -create_bundler_paths +REUSE_BINARIES=$BASE/reuse-binaries.lock + +if [[ ! -f $REUSE_BINARIES ]]; then + install_dependencies + build_boost + build_launcher + build_openvpn + build_pyside + copy_binaries + create_bundler_paths +else + echo "Reusing existing binaries, cleaning up before creating a new bundle..." + clean +fi + setup_bundler run_bundler + +echo 'If you remove this file the createbundle.sh script will rebuild all the binaries.' > $REUSE_BINARIES diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 60186b8..06d6c02 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,3 +1,5 @@ -sh -modulegraph altgraph +modulegraph +psutil +sh +tuf |