Changeset 23056

Timestamp:

08/06/18 14:24:17 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better way to handle changed files

File:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -55 +55 @@
 
         #Get changes from jenkins itself (svn requires credentials)
-        rm -rf changes
-        wget $SERVER/job/$JOB_NAME/$BUILD_NUMBER/changes > /dev/null 2>&1
-
-        #Process html page and get the list of files that has changed (tricky...)
-        #cat changes | grep '="The file was modified"' | sed -e 's/.*<\/td><td><a>\(.*\)<\/a><\/td><td>.*/\1/' > $ISSM_DIR/TEMP
-        #cat changes | grep 'document_edit' |sed -e 's/document_edit.png/document_edit.png\
-                #/g' | sed -e 's/.*<\/a><\/td><td>\(.*\)<\/td><\/tr>.*/\1/' | grep -v 'document_edit.png' > $ISSM_DIR/TEMP
-        cat changes  | tr " " "\n" | grep trunk |  sed -e 's/.*<a>\(.*\)<\/a>.*/\1/' > $ISSM_DIR/TEMP
+        svn diff -r $SVN_PREVIOUS:$SVN_CURRENT --summarize | awk '{print $NF}' > $ISSM_DIR/changes
 
         #Print list of files
         echo "   "
         echo "List of updated files"
-        cat $ISSM_DIR/TEMP
+        cat $ISSM_DIR/changes
         echo "   "
 
         #Do we need to reinstall externalpackages?
         echo "Determining installation type"
-        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep externalpackages)" ] ; then
+        if [ ! -z "$(cat $ISSM_DIR/changes | grep externalpackages)" ] ; then
                 echo "  -- checking for changed externalpackages... yes";
                 ISSM_EXTERNALPACKAGES="yes"
@@ -81 +74 @@
 
         #Do we need to reconfigure
-        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep -e "Makefile.am" -e "m4" )" ] ||
+        if [ ! -z "$(cat $ISSM_DIR/changes | grep -e "Makefile.am" -e "m4" )" ] ||
                 [ ! -f "$ISSM_DIR/bin/issm.exe" ] ||
                 [ "$ISSM_EXTERNALPACKAGES" == "yes" ] ;
@@ -93 +86 @@
 
         #Do we need to recompile
-        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep -e "\.cpp" -e "\.h" )" ] ||
+        if [ ! -z "$(cat $ISSM_DIR/changes | grep -e "\.cpp" -e "\.h" )" ] ||
                 [ "$ISSM_RECONFIGURE" == "yes" ] ;
         then
@@ -103 +96 @@
         fi
         #ISSM_COMPILATION="yes"
+        rm $ISSM_DIR/changes
 
 else