Index: /issm/trunk-jpl/jenkins/imac-012301-gil =================================================================== --- /issm/trunk-jpl/jenkins/imac-012301-gil (revision 20393) +++ /issm/trunk-jpl/jenkins/imac-012301-gil (revision 20394) @@ -36,12 +36,4 @@ #-----------------------------------# -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages - #List of external pakages to be installed and their installation scripts EXTERNALPACKAGES="autotools install.sh Index: /issm/trunk-jpl/jenkins/jenkins.sh =================================================================== --- /issm/trunk-jpl/jenkins/jenkins.sh (revision 20393) +++ /issm/trunk-jpl/jenkins/jenkins.sh (revision 20394) @@ -30,27 +30,9 @@ #}}} -#SVN version issue requires that we set SVN and SVNVERSION explicitly in order -#to remain compatible with the version used by Jenkins to do checkouts -#{{{ -if [[ -z $SVN ]]; then - echo "SVN variable is not set!" - echo "Defaulting to SVN found in path..." - SVN='svn' -fi -if [[ -z $SVNVERSION ]]; then - echo "SVNVERSION variable is not set!" - echo "Defaulting to SVNVERSION found in path..." - SVNVERSION='svnversion' -fi -#}}} - -PYTHON_TEST=0 -#testing {{{ + +#Determinig Installation type depending on svn changes{{{ echo "======================================================"; echo " Determining Installation type " echo "======================================================"; -ISSM_EXTERNALPACKAGES="none" -ISSM_RECONFIGURE="no" -ISSM_COMPILATION="no" if [ -a $ISSM_DIR/svn_revision_old ] then @@ -60,6 +42,9 @@ echo "Current revision number: $SVN_CURRENT" - wget http://ross.ics.uci.edu:8080/job/$JOB_NAME/$BUILD_NUMBER/changes - cat changes | grep "The file was modified" > $ISSM_DIR/TEMP + #Get changes from jenkins itself (svn requires credentials) + wget http://ross.ics.uci.edu:8080/job/$JOB_NAME/$BUILD_NUMBER/changes > /dev/null 2>&1 + + #Process html page and get the list of files that has changed + cat changes | grep "The file was modified" | sed -e 's/.*<\/a><\/td>\(.*\)<\/td><\/tr><\/table>.*/\1/' > $ISSM_DIR/TEMP cat $ISSM_DIR/TEMP @@ -92,4 +77,8 @@ else + echo "Previous revision not found, this must be a fresh install" + echo " -- checking for changed externalpackages... yes"; + echo " -- checking for reconfiguration... yes"; + echo " -- checking for recompilation... yes"; ISSM_EXTERNALPACKAGES="install" ISSM_RECONFIGURE="yes" @@ -100,5 +89,5 @@ #}}} -#install/copy/none external packages (ISSM_EXTERNALPACKAGES){{{ +#install/none external packages (ISSM_EXTERNALPACKAGES){{{ if [ "$ISSM_EXTERNALPACKAGES" == "install" ] then @@ -119,76 +108,25 @@ cd $ISSM_DIR/externalpackages/$PACKAGENAME - #tricky part here. We do not want to reinstall this package if it's already installed - #and the svn file which does the install has not be modified! To keep track of - #this, we check the current svn version against the "last changed" revision number. If they - #are the same, we reinstall the package. - current_version=`$SVNVERSION` - last_changed_version=`$SVN info $PACKAGEINST | grep "Last Changed Rev" | awk '{printf("%s\n",$4);}'` - - if [[ $current_version == $last_changed_version ]]; then - #go ahead and reinstall. - echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version" - echo "Triggering new install of $PACKAGENAME" - install_test=1 + echo "======================================================"; + echo " Installing $PACKAGENAME "; + echo "======================================================"; + ./$PACKAGEINST | tee compil.log + if [ $? -ne 0 ]; then + echo "======================================================"; + echo " ERROR: installation of $PACKAGENAME failed "; + echo "======================================================"; + #erase install directory, so that next time, we still try and compile this! + rm -rf install + echo "" >> $EXTERNAL_TEST_FILE + echo 'External packages did not install right. Check it.' >> $EXTERNAL_TEST_FILE + echo '' >> $EXTERNAL_TEST_FILE else - #ok, we want to skip, unless the package is not installed: - if [ -d install ]; then - #could be empty, signaling a failed previous install: - if [ "$(ls -A install)" ];then - echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version" - echo "and install directory exists, so skipping install of $PACKAGENAME" - install_test=0; - else - echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version" - echo "and install directory exists, however, it is empty, so triggering install of $PACKAGENAME" - install_test=1; - fi - else - echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version" - echo "However, install directory does not exist, so triggering install of $PACKAGENAME" - install_test=1; - fi - fi - - if [[ $install_test == 1 ]]; then - echo "======================================================"; - echo " Installing $PACKAGENAME "; - echo "======================================================"; - ./$PACKAGEINST | tee compil.log - if [ $? -ne 0 ]; then - echo "======================================================"; - echo " ERROR: installation of $PACKAGENAME failed "; - echo "======================================================"; - #erase install directory, so that next time, we still try and compile this! - rm -rf install - echo "" >> $EXTERNAL_TEST_FILE - echo 'External packages did not install right. Check it.' >> $EXTERNAL_TEST_FILE - echo '' >> $EXTERNAL_TEST_FILE - else - echo "" >> $EXTERNAL_TEST_FILE - fi - source $ISSM_DIR/etc/environment.sh - else - echo "======================================================"; - echo " Skipping install of $PACKAGENAME "; - echo "======================================================"; - source $ISSM_DIR/etc/environment.sh #for good measure :) - echo "" >> $EXTERNAL_TEST_FILE fi + source $ISSM_DIR/etc/environment.sh cd .. done echo '' >> $EXTERNAL_TEST_FILE -elif [ "$ISSM_EXTERNALPACKAGES" == "copy" ] -then - cd $ISSM_DIR - rm -rf externalpackages - cp -Rf $EXTERNALPACKAGESDIR ./ -elif [ "$ISSM_EXTERNALPACKAGES" == "link" ] -then - cd $ISSM_DIR - rm -rf externalpackages - ln -s $EXTERNALPACKAGESDIR . elif [ "$ISSM_EXTERNALPACKAGES" == "none" ] then Index: /issm/trunk-jpl/jenkins/linux64_caladan =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_caladan (revision 20394) @@ -37,20 +37,9 @@ #repo: -#We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use. REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts @@ -64,5 +53,4 @@ m1qn3 install.sh shell2junit install.sh" - #---------------------# Index: /issm/trunk-jpl/jenkins/linux64_caladan_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan_ad (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_caladan_ad (revision 20394) @@ -28,18 +28,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_caladan_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan_ampi (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_caladan_ampi (revision 20394) @@ -37,18 +37,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_murdo =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_murdo (revision 20394) @@ -36,20 +36,9 @@ #repo: -#We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use. REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts @@ -74,5 +63,4 @@ netcdf-python install.sh shell2junit install.sh" - #---------------------# Index: /issm/trunk-jpl/jenkins/linux64_murdo_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_ad (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_murdo_ad (revision 20394) @@ -27,18 +27,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_murdo_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_ampi (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_murdo_ampi (revision 20394) @@ -36,18 +36,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_murdo_gia =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_gia (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_murdo_gia (revision 20394) @@ -33,18 +33,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_murdo_iceocean =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_iceocean (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_murdo_iceocean (revision 20394) @@ -31,18 +31,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_murdo_python =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_python (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_murdo_python (revision 20394) @@ -37,18 +37,8 @@ #We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use. REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_ross =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_ross (revision 20394) @@ -39,18 +39,8 @@ #We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use. REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_ross_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_ad (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_ross_ad (revision 20394) @@ -30,18 +30,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_ross_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_ampi (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_ross_ampi (revision 20394) @@ -39,18 +39,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_ross_gia =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_gia (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_ross_gia (revision 20394) @@ -41,12 +41,4 @@ #-----------------------------------# -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages - #List of external pakages to be installed and their installation scripts EXTERNALPACKAGES="autotools install.sh Index: /issm/trunk-jpl/jenkins/linux64_ross_iceocean =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_iceocean (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_ross_iceocean (revision 20394) @@ -32,18 +32,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_ross_se =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_se (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_ross_se (revision 20394) @@ -32,20 +32,9 @@ #repo: -#We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use. REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/linux64_ross_test =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_test (revision 20393) +++ /issm/trunk-jpl/jenkins/linux64_ross_test (revision 20394) @@ -37,20 +37,9 @@ #repo: -#We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use. REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/bin/svn' -SVNVERSION='/usr/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -#ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/macosx_pine-island =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island (revision 20393) +++ /issm/trunk-jpl/jenkins/macosx_pine-island (revision 20394) @@ -31,18 +31,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/local/bin/svn' -SVNVERSION='/usr/local/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/macosx_pine-island_dakota =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_dakota (revision 20393) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_dakota (revision 20394) @@ -34,18 +34,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/local/bin/svn' -SVNVERSION='/usr/local/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/macosx_pine-island_static =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_static (revision 20393) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_static (revision 20394) @@ -35,18 +35,8 @@ #repo: REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" -SVN='/usr/local/bin/svn' -SVNVERSION='/usr/local/bin/svnversion' #-----------------------------------# # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #List of external pakages to be installed and their installation scripts Index: /issm/trunk-jpl/jenkins/windows =================================================================== --- /issm/trunk-jpl/jenkins/windows (revision 20393) +++ /issm/trunk-jpl/jenkins/windows (revision 20394) @@ -42,12 +42,4 @@ #-----------------------------------# -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages - #List of external pakages to be installed and their installation scripts EXTERNALPACKAGES="autotools install-win.sh Index: /issm/trunk-jpl/jenkins/windows-par =================================================================== --- /issm/trunk-jpl/jenkins/windows-par (revision 20393) +++ /issm/trunk-jpl/jenkins/windows-par (revision 20394) @@ -40,12 +40,4 @@ #-----------------------------------# -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="install" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages - #List of external pakages to be installed and their installation scripts EXTERNALPACKAGES="autotools install-win.sh Index: /issm/trunk-jpl/jenkins/windows_test =================================================================== --- /issm/trunk-jpl/jenkins/windows_test (revision 20393) +++ /issm/trunk-jpl/jenkins/windows_test (revision 20394) @@ -17,12 +17,4 @@ # 3: External packages installation # #-----------------------------------# - -#ISSM_EXTERNALPACKAGES can have 3 values: -# - "install" install all external packages listed below -# - "copy" copy existing directories (EXTERNALPACKAGESDIR) -# - "none" leave external packages as is -# ->skip to section 4 -ISSM_EXTERNALPACKAGES="none" -EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages #---------------------#