Changeset 11817:bb73e856c98b in orange


Ignore:
Timestamp:
12/17/13 12:58:07 (4 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Message:

Fixed Qt4 source urls.

File:
1 edited

Legend:

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

    r11774 r11817  
    7979# Versions of included 3rd party software 
    8080 
    81 PYTHON_VER=2.7.5 
    82 PIP_VER=1.3.1 
     81PYTHON_VER=2.7.6 
     82PIP_VER=1.4.1 
    8383DISTRIBUTE_VER=0.6.49 
    84 NUMPY_VER=1.7.1 
    85 SCIPY_VER=0.12.0 
    86 QT_VER=4.7.4 
     84NUMPY_VER=1.8.0 
     85SCIPY_VER=0.13.1 
     86QT_VER=4.8.5 
    8787SIP_VER=4.14.6 
    8888PYQT_VER=4.10.1 
     
    9696PIP=$APP/Contents/MacOS/pip 
    9797 
    98 export MACOSX_DEPLOYMENT_TARGET=10.5 
     98export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-10.6} 
     99 
     100if [[ $MACOSX_DEPLOYMENT_TARGET < 10.6 ]]; then 
     101    # This is the last Qt version that builds against 10.5 sdk 
     102    QT_VER=4.7.4 
     103fi 
    99104 
    100105SDK=/Developer/SDKs/MacOSX$MACOSX_DEPLOYMENT_TARGET.sdk 
     
    228233    QT_VER_SHORT=${QT_VER%%\.[0-9]} 
    229234 
    230     # 4.8.* (4.8 does not compile for x86_64 using 10.5 SDK) 
    231     #download_and_extract "http://download.qt-project.org/official_releases/qt/$QT_VER_SHORT/$QT_VER/qt-everywhere-opensource-src-$QT_VER.tar.gz" 
    232  
    233     # 4.7 or older 
    234     download_and_extract "http://download.qt-project.org/archive/qt/$QT_VER_SHORT/qt-everywhere-opensource-src-$QT_VER.tar.gz" 
     235    # The official releases seem to only include the latest 
     236    # and the archive the rest 
     237    OFFICIAL="http://download.qt-project.org/official_releases/qt/$QT_VER_SHORT/$QT_VER/qt-everywhere-opensource-src-$QT_VER.tar.gz" 
     238 
     239    if [[ $QT_VER_SHORT < 4.8 ]]; then 
     240        ARCHIVE="http://download.qt-project.org/archive/qt/$QT_VER_SHORT/qt-everywhere-opensource-src-$QT_VER.tar.gz" 
     241    else 
     242        ARCHIVE="http://download.qt-project.org/archive/qt/$QT_VER_SHORT/$QT_VER/qt-everywhere-opensource-src-$QT_VER.tar.gz" 
     243    fi 
     244 
     245    if curl --fail --head --silent -o /dev/null $OFFICIAL ; then 
     246        QT_URL=$OFFICIAL 
     247    else 
     248        QT_URL=$ARCHIVE 
     249    fi 
     250 
     251    download_and_extract $QT_URL 
    235252 
    236253    pushd qt-everywhere-opensource-src-$QT_VER 
Note: See TracChangeset for help on using the changeset viewer.