summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-04 12:09:58 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-04 12:09:58 -0300
commit584866689560bd2ebea01ecc5e6ae5e79ce7fc81 (patch)
tree4fe300c3c105e17721f79eeece9bbd3745b43d78 /pkg
parent1f0f8efc4cb985c082b3b8fe7b3dc45aed047a47 (diff)
parent759d73ae0728f074e0fb0740269249d0e5066574 (diff)
Merge branch 'release-0.3.4'0.3.4
Diffstat (limited to 'pkg')
-rwxr-xr-xpkg/linux/build_bundle.sh12
-rw-r--r--pkg/requirements-docs.pip1
-rw-r--r--pkg/requirements.pip5
3 files changed, 10 insertions, 8 deletions
diff --git a/pkg/linux/build_bundle.sh b/pkg/linux/build_bundle.sh
index 520ff256..60151a80 100755
--- a/pkg/linux/build_bundle.sh
+++ b/pkg/linux/build_bundle.sh
@@ -34,16 +34,18 @@ BITMASK_BIN=$TEMPLATE_BUNDLE/bitmask
BUNDLE_NAME=Bitmask-linux$ARCH-$VERSION
# clean template
-rm $TEMPLATE_BUNDLE/CHANGELOG
-rm $TEMPLATE_BUNDLE/relnotes.txt
+rm -f $TEMPLATE_BUNDLE/CHANGELOG
+rm -f $TEMPLATE_BUNDLE/relnotes.txt
rm -rf $TEMPLATE_BUNDLE/apps/leap
rm -rf $TEMPLATE_BUNDLE/lib/leap/{common,keymanager,soledad,mail}
# checkout the latest tag in all repos
for repo in $REPOSITORIES; do
cd $REPOS_ROOT/$repo
- git fetch
- # checkout to the latest annotated tag, supress 'detached head' warning
+ git checkout master
+ git pull --ff-only origin master && git fetch
+ git reset --hard origin/master # this avoids problems if you are in a commit far in the past
+ # checkout to the closest annotated tag, supress 'detached head' warning
git checkout --quiet `git describe --abbrev=0`
done
@@ -82,7 +84,7 @@ cp src/launcher $BITMASK_BIN
# copy launcher.py to template bundle
# e.g. TEMPLATE_BUNDLE/Bitmask.app/Contents/MacOS/apps/
-cd $REPOS_ROOT/bitmask_client_launcher/src/
+cd $REPOS_ROOT/bitmask_launcher/src/
cp launcher.py $TEMPLATE_BUNDLE/apps/
# copy relnotes, joint changelog and LICENSE to TEMPLATE_BUNDLE
diff --git a/pkg/requirements-docs.pip b/pkg/requirements-docs.pip
index 6966869c..ad14d003 100644
--- a/pkg/requirements-docs.pip
+++ b/pkg/requirements-docs.pip
@@ -1 +1,2 @@
sphinx
+Sphinx-PyPI-upload
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 154e51b4..bb1deb1b 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -14,13 +14,12 @@ psutil
ipaddr
twisted
qt4reactor
-python-gnupg
python-daemon # this should not be needed for Windows.
keyring
-leap.common>=0.3.2
+leap.common>=0.3.4
leap.soledad.client>=0.4.0
-leap.keymanager>=0.2.0
+leap.keymanager>=0.3.3
leap.mail>=0.3.2
# Remove this when u1db fixes its dependency on oauth