Changeset 10594:23b10aabc543 in orange


Ignore:
Timestamp:
03/21/12 13:49:09 (2 years ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
rebase_source:
82d6dfee9fbb9ef5b052cebfa33f1c8190d6efde
Message:

Fixes to build scripts.

Location:
install-scripts/mac
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • install-scripts/mac/dailyrun-finkonly.sh

    r10556 r10594  
    2323fi 
    2424 
     25 
    2526if [ ! -e $WORK_DIR ]; then 
    2627    mkdir -p $WORK_DIR 
     28fi 
     29 
     30 
     31if [ ! $LOCAL ]; then 
     32    /Users/ailabc/mount-dirs.sh || { echo "Mounting failed." ; exit 1 ; } 
    2733fi 
    2834 
     
    5460if [ ! $LOCAL ]; then 
    5561    # Compare with the published info files 
    56     BASE="http://orange.biolab.si/fink/dists/$ARCH/main/finkinfo" 
     62    BASE="http://orange.biolab.si/fink/dists/10.$MAC_VERSION/main/finkinfo" 
    5763else 
    5864    # Compare with the local info files 
     
    9197fi 
    9298 
    93 # Directory where fink .info templates are 
    94 FINK_TEMPLATES=$WORK_DIR/repos/orange/install-scripts/mac/fink 
     99# Directory where fink .info templates are stored 
     100FINK_TEMPLATES=$WORK_DIR/fink 
     101 
     102if [ ! -e $FINK_TEMPLATES ]; then 
     103    mkdir -p $FINK_TEMPLATES 
     104fi 
    95105 
    96106FINK_LOG=$WORK_DIR/fink-daily-build.log 
     
    100110if [[ $NEW_ORANGE || $FORCE ]]; then 
    101111    FINK_ORANGE_SOURCE_TEMPLATE="Orange-%v.tar.gz" 
     112    curl --silent -o $FINK_TEMPLATES/orange-gui-hg-py.info https://bitbucket.org/biolab/orange/raw/tip/install-scripts/mac/fink/orange-gui-hg-py.info 
    102113    ./fink-register-info.sh "$FINK_TEMPLATES/orange-gui-hg-py.info" $BASE_URL/$FINK_ORANGE_SOURCE_TEMPLATE $ORANGE_SOURCE_MD5 $ORANGE_VERSION $FINK_INFO_DIR/orange-gui-hg-py.info >> $FINK_LOG 2>&1 
    103114fi 
     
    105116if [[ $NEW_BIOINFORMATICS || $FORCE ]]; then 
    106117    FINK_BIOINFORMATICS_SOURCE_TEMPLATE="Orange-Bioinformatics-%v.tar.gz" 
     118    curl --silent -o $FINK_TEMPLATES/orange-bioinformatics-gui-hg-py.info https://bitbucket.org/biolab/orange/raw/tip/install-scripts/mac/fink/orange-bioinformatics-gui-hg-py.info 
    107119    ./fink-register-info.sh "$FINK_TEMPLATES/orange-bioinformatics-gui-hg-py.info" $BASE_URL/$FINK_BIOINFORMATICS_SOURCE_TEMPLATE $BIOINFORMATICS_SOURCE_MD5 $BIOINFORMATICS_VERSION $FINK_INFO_DIR/orange-bioinformatics-gui-hg-py.info >> $FINK_LOG 2>&1 
    108120fi 
     
    110122if [[ $NEW_TEXT || $FORCE ]]; then 
    111123    FINK_TEXT_SOURCE_TEMPLATE="Orange-Text-Mining-%v.tar.gz" 
     124    curl --silent -o $FINK_TEMPLATES/orange-text-gui-hg-py.info https://bitbucket.org/biolab/orange/raw/tip/install-scripts/mac/fink/orange-text-gui-hg-py.info 
    112125    ./fink-register-info.sh "$FINK_TEMPLATES/orange-text-gui-hg-py.info" $BASE_URL/$FINK_TEXT_SOURCE_TEMPLATE $TEXT_SOURCE_MD5 $TEXT_VERSION $FINK_INFO_DIR/orange-text-gui-hg-py.info >> $FINK_LOG 2>&1 
    113126fi 
  • install-scripts/mac/fink-daily-build-packages.sh

    r10556 r10594  
    7676 
    7777# Move info files from local/main/finkinfo (put there by dailyru[-finkonly].sh 
    78 echo "Updating new fink info files." 
    79 mv $FINK_ROOT/fink/dists/local/main/finkinfo/*.info $FINK_ROOT/fink/dists/biolab/main/finkinfo/ 
     78if [ -e $FINK_ROOT/fink/dists/local/main/finkinfo/*.info ]; then 
     79    echo "Updating new fink info files." 
     80    mv $FINK_ROOT/fink/dists/local/main/finkinfo/*.info $FINK_ROOT/fink/dists/biolab/main/finkinfo/ 
     81fi 
    8082 
    8183if ! grep '^Trees:' $FINK_ROOT/etc/fink.conf | grep -q 'biolab/main'; then 
Note: See TracChangeset for help on using the changeset viewer.