Commits

Aleš Erjavec committed afc4dba

Small fixes to OSX application bundle build scripts.

Comments (0)

Files changed (2)

install-scripts/mac/bundle-build-hg.sh

 
 echo "Checkouting and building bioinformatics addon"
 echo "============================================="
-./bundle-inject-hg.sh https://bitbucket.org/biolab/orange-bioinformatics bioinformatics $REVISION $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
+./bundle-inject-hg.sh https://bitbucket.org/biolab/orange-bioinformatics bioinformatics tip $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
 
 echo "Checkouting and building text addon"
 echo "==================================="
-./bundle-inject-hg.sh https://bitbucket.org/biolab/orange-text text $REVISION $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
+./bundle-inject-hg.sh https://bitbucket.org/biolab/orange-text text tip $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
 
 echo "Installing networkx"
 echo "+++++++++++++++++++"

install-scripts/mac/bundle-inject-hg.sh

 	echo "Repository $CLONE_FULLPATH already present".
 fi
 
+cd $CLONE_FULLPATH
+
 echo "Checking for incomming changesets"
-if hg incoming -R $CLONE_FULLPATH; then 
-	echo "Changesets found. Pulling and updating."
-	hg pull --update -R $CLONE_FULLPATH
+if hg incoming; then
+	echo "Changesets found. Pulling."
+	hg pull
 fi
 
-cd $CLONE_FULLPATH
+echo "Updating to ${REVISION}"
+hg update -r ${REVISION}
 
 # Run installation
 echo "Running setup.py install with python '$PYTHON'"
 $PYTHON setup.py install --single-version-externally-managed --record=RECORD.txt
 
-# Clean up the archive
-cd $WORK_DIR
-
 true
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.