Changeset 11838:bc049611a9cb in orange


Ignore:
Timestamp:
01/15/14 11:33:47 (3 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Message:

Fixes for OSX application build script.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • install-scripts/mac/build-osx-app.sh

    r11635 r11838  
    6767fi 
    6868 
    69 TEMPLATE_URL=${TEMPLATE_URL:-"http://orange.biolab.si/download/bundle-templates/Orange.app.tar.gz"} 
     69TEMPLATE_URL=${TEMPLATE_URL:-"http://orange.biolab.si/download/bundle-templates/Orange.app-template.tar.gz"} 
    7070 
    7171SCHEMA_REGEX='^(https?|ftp|local)://.*' 
     
    7777    # check for a url schema 
    7878    if [[ $TEMPLATE_URL =~ $SCHEMA_REGEX ]]; then 
    79         curl --fail --silent "$TEMPLATE_URL" | tar -xf -C "$BUILD_DIR" 
     79        curl --fail --silent "$TEMPLATE_URL" | tar -x -C "$BUILD_DIR" 
    8080        TEMPLATE=( $BUILD_DIR/*.app ) 
    8181 
     
    101101 
    102102PREFIX=$("$PYTHON" -c'import sys; print sys.prefix') 
     103SITE_PACKAGES=$("$PYTHON" -c'import sysconfig as sc; print(sc.get_path("platlib"))') 
    103104 
    104105echo "Building Orange" 
     
    115116EXTRA_CXXFLAGS="-F$FDIR -I$FDIR/QtCore.framework/Headers -I$FDIR/QtGui.framework/Headers" 
    116117EXTRA_LDFLAGS="-F$FDIR -framework QtCore -framework QtGui" 
     118 
     119echo "Fixing sip/pyqt configuration" 
     120 
     121sed -i.bak "s@/.*/Orange.app/@$TEMPLATE/@g" "${SITE_PACKAGES}"/PyQt4/pyqtconfig.py 
     122sed -i.bak "s@/.*/Orange.app/@$TEMPLATE/@g" "${SITE_PACKAGES}"/sipconfig.py 
     123 
    117124 
    118125( 
     
    149156echo "==================" 
    150157 
    151 "$PIP" install hg+https://bitbucket.org/biolab/orange-bioinformatics 
    152 "$PIP" install hg+https://bitbucket.org/biolab/orange-text 
     158# Install as eggs. The application's Add-ons dialog has problem with 
     159# upgrading flat installs. 
     160"$PIP" install --egg hg+https://bitbucket.org/biolab/orange-bioinformatics 
     161"$PIP" install --egg hg+https://bitbucket.org/biolab/orange-text 
    153162 
    154163 
     
    158167        rm -rf "$APP" 
    159168    fi 
    160  
     169    mkdir -p $(dirname "$APP") 
    161170    mv "$TEMPLATE" "$APP" 
    162171fi 
Note: See TracChangeset for help on using the changeset viewer.