Changeset 10702:cb5132258dab in orange


Ignore:
Timestamp:
04/02/12 10:30:45 (2 years ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
rebase_source:
cf50a6f318712dad92a9bfd87d832f7abd6f7026
Message:

Fixes for daily build scripts.

Location:
install-scripts/mac
Files:
3 edited

Legend:

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

    r10622 r10702  
    1 #!/bin/bash -e 
     1#!/bin/bash 
    22# 
    33# $1 workdir 
     
    9797fi 
    9898 
     99# Remove any old remaining local .info files 
     100rm -f $FINK_INFO_DIR/orange-*.info 
     101 
    99102# Directory where fink .info templates are stored 
    100103FINK_TEMPLATES=$WORK_DIR/fink 
     
    112115    curl --silent -o $FINK_TEMPLATES/orange-gui-dev-py.info https://bitbucket.org/biolab/orange/raw/tip/install-scripts/mac/fink/orange-gui-dev-py.info 
    113116    ./fink-register-info.sh "$FINK_TEMPLATES/orange-gui-dev-py.info" $BASE_URL/$FINK_ORANGE_SOURCE_TEMPLATE $ORANGE_SOURCE_MD5 $ORANGE_VERSION $FINK_INFO_DIR/orange-gui-dev-py.info >> $FINK_LOG 2>&1 
     117    FINK_ORANGE_INFO_EXIT_VALUE=$? 
    114118fi 
    115119 
     
    118122    curl --silent -o $FINK_TEMPLATES/orange-bioinformatics-gui-dev-py.info https://bitbucket.org/biolab/orange/raw/tip/install-scripts/mac/fink/orange-bioinformatics-gui-dev-py.info 
    119123    ./fink-register-info.sh "$FINK_TEMPLATES/orange-bioinformatics-gui-dev-py.info" $BASE_URL/$FINK_BIOINFORMATICS_SOURCE_TEMPLATE $BIOINFORMATICS_SOURCE_MD5 $BIOINFORMATICS_VERSION $FINK_INFO_DIR/orange-bioinformatics-gui-dev-py.info >> $FINK_LOG 2>&1 
     124    FINK_BIOINFORMATICS_INFO_EXIT_VALUE=$? 
    120125fi 
    121126 
     
    124129    curl --silent -o $FINK_TEMPLATES/orange-text-gui-dev-py.info https://bitbucket.org/biolab/orange/raw/tip/install-scripts/mac/fink/orange-text-gui-dev-py.info 
    125130    ./fink-register-info.sh "$FINK_TEMPLATES/orange-text-gui-dev-py.info" $BASE_URL/$FINK_TEXT_SOURCE_TEMPLATE $TEXT_SOURCE_MD5 $TEXT_VERSION $FINK_INFO_DIR/orange-text-gui-dev-py.info >> $FINK_LOG 2>&1 
     131    FINK_TEXT_INFO_EXIT_VALUE=$? 
    126132fi 
    127133 
     
    130136fi 
    131137 
     138EXIT_VALUE=$(($FINK_ORANGE_INFO_EXIT_VALUE + $FINK_BIOINFORMATICS_INFO_EXIT_VALUE + $FINK_TEXT_INFO_EXIT_VALUE)) 
     139if (($EXIT_VALUE)); then 
     140    echo "Running fink-register-info.sh failed" 
     141    rm -f $FINK_INFO_DIR/orange-*.info 
     142fi 
    132143 
    133144## daily fink build 
  • install-scripts/mac/dailyrun.sh

    r10625 r10702  
    1 #!/bin/bash -e 
     1#!/bin/bash 
    22# 
    33# Should be run as: sudo ./dailyrun.sh 
     
    131131fi 
    132132 
     133# Remove any old remaining local .info files 
     134rm -f $FINK_INFO_DIR/orange-*.info 
     135 
    133136# Directory where fink .info templates are 
    134137FINK_TEMPLATES=$WORK_DIR/orange/install-scripts/mac/fink 
     
    140143    FINK_ORANGE_SOURCE_TEMPLATE="Orange-%v.tar.gz" 
    141144    ./fink-register-info.sh "$FINK_TEMPLATES/orange-gui-dev-py.info" $BASE_URL/$FINK_ORANGE_SOURCE_TEMPLATE $ORANGE_SOURCE_MD5 $ORANGE_VERSION $FINK_INFO_DIR/orange-gui-dev-py.info >> $FINK_LOG 2>&1 
     145    FINK_ORANGE_INFO_EXIT_VALUE=$? 
    142146fi 
    143147 
     
    145149    FINK_BIOINFORMATICS_SOURCE_TEMPLATE="Orange-Bioinformatics-%v.tar.gz" 
    146150    ./fink-register-info.sh "$FINK_TEMPLATES/orange-bioinformatics-gui-dev-py.info" $BASE_URL/$FINK_BIOINFORMATICS_SOURCE_TEMPLATE $BIOINFORMATICS_SOURCE_MD5 $BIOINFORMATICS_VERSION $FINK_INFO_DIR/orange-bioinformatics-gui-dev-py.info >> $FINK_LOG 2>&1 
     151    FINK_BIOINFORMATICS_INFO_EXIT_VALUE=$? 
    147152fi 
    148153 
     
    150155    FINK_TEXT_SOURCE_TEMPLATE="Orange-Text-Mining-%v.tar.gz" 
    151156    ./fink-register-info.sh "$FINK_TEMPLATES/orange-text-gui-dev-py.info" $BASE_URL/$FINK_TEXT_SOURCE_TEMPLATE $TEXT_SOURCE_MD5 $TEXT_VERSION $FINK_INFO_DIR/orange-text-gui-dev-py.info >> $FINK_LOG 2>&1 
     157    FINK_TEXT_INFO_EXIT_VALUE=$? 
    152158fi 
    153159 
     
    156162fi 
    157163 
     164EXIT_VALUE=$(($FINK_ORANGE_INFO_EXIT_VALUE + $FINK_BIOINFORMATICS_INFO_EXIT_VALUE + $FINK_TEXT_INFO_EXIT_VALUE)) 
     165if (($EXIT_VALUE)); then 
     166    echo "Running fink-register-info.sh failed" 
     167    rm -f $FINK_INFO_DIR/orange-*.info 
     168fi 
    158169 
    159170## daily fink build 
  • install-scripts/mac/fink-daily-build-packages.sh

    r10622 r10702  
    7575rm -f $FINK_ROOT/fink/dists/biolab/main/finkinfo/all.tgz 
    7676 
    77 # Move info files from local/main/finkinfo (put there by dailyru[-finkonly].sh 
    78 if [ -e $FINK_ROOT/fink/dists/local/main/finkinfo/*.info ]; then 
     77# Move info files from local/main/finkinfo (put there by dailyrun[-finkonly].sh 
     78if [[ $(ls -A $FINK_ROOT/fink/dists/local/main/finkinfo/ | grep "\.info") ]]; then 
    7979    echo "Updating new fink info files." 
    8080    mv $FINK_ROOT/fink/dists/local/main/finkinfo/*.info $FINK_ROOT/fink/dists/biolab/main/finkinfo/ 
Note: See TracChangeset for help on using the changeset viewer.