Changeset 20425

Timestamp:

04/01/16 10:20:22 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: if external packages need to be reinstalled, everything needs to be recompiled as well

File:

• issm/trunk-jpl/jenkins/jenkins.sh (modified) (3 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -57 +57 @@
 
         #Do we need to reinstall externalpackages?
+        echo "Determining installation type"
         if [ ! -z "$(cat $ISSM_DIR/TEMP | grep externalpackages)" ] ; then
                 echo "  -- checking for changed externalpackages... yes";
@@ -66 +67 @@
 
         #Do we need to reconfigure
-        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep -e "Makefile.am" -e "m4" )" ] ; then
+        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep -e "Makefile.am" -e "m4" )" ] || [ "$ISSM_EXTERNALPACKAGES" == "yes" ] ; then
                 echo "  -- checking for reconfiguration... yes";
                 ISSM_RECONFIGURE="yes"
@@ -92 +93 @@
         ISSM_COMPILATION="yes"
 fi
+echo " "
 echo "Recording current svn version: $SVN_REVISION_1"
 echo $SVN_REVISION_1 > $ISSM_DIR/svn_revision_old