Aleš Erjavec avatar Aleš Erjavec committed 1f924d0

Install/upgrade the latest 'distribute' package into the bundle.

Comments (0)

Files changed (1)

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

 #Python interpreter in the bundle
 PYTHON=${TMP_BUNDLE_DIR}/Orange.app/Contents/MacOS/python
 
+#easy_install script in the bundle
+EASY_INSTALL=${TMP_BUNDLE_DIR}/Orange.app/Contents/MacOS/easy_install
+
 #Python version
 PY_VER=`$PYTHON -c "import sys; print sys.version[:3]"`
 
+# First install/upgrade distrubute. The setup.py scripts might
+# need it
+echo "Installing/upgrading distribute in the bundle"
+echo "============================================="
+$EASY_INSTALL -U distribute
+
+
 echo "Checkouting and building orange"
 echo "==============================="
 ./bundle-inject-hg.sh https://bitbucket.org/biolab/orange orange $REVISION $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
 
 echo "Specifically building orangeqt"
+echo "------------------------------"
+
 CUR_DIR=`pwd`
 cd $REPOS_DIR/orange/source/orangeqt
 echo "Fixing sip/pyqt configuration"
 echo "[Paths]
 Plugins = ../../../../../Resources/Qt4/plugins/" > $APP/Contents/Frameworks/Python.framework/Resources/Python.app/Contents/Resources/qt.conf
 
+
 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-text text $REVISION $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
 
 echo "Installing networkx"
-echo "+++++++++++++++++++++"
+echo "+++++++++++++++++++"
 ./bundle-inject-pypi.sh networkx-1.6 http://pypi.python.org/packages/source/n/networkx/networkx-1.6.tar.gz $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
 
-echo "Installing distribute"
-echo "+++++++++++++++++++++"
-./bundle-inject-pypi.sh distribute-0.6.24 http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
-
-# TODO: from here on we could use easy_install to install pip and then use that
 echo "Installing suds library"
 echo "+++++++++++++++++++++++"
 ./bundle-inject-pypi.sh suds-0.4 http://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz $REPOS_DIR ${TMP_BUNDLE_DIR}/Orange.app
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.