Changeset 12508

Timestamp:

2020-03-04T17:00:49+01:00 (5 years ago)

Author:

mathiot

Message:

ticket #2304 : change in display output, synchrose all files that are not links instead of a selection of files as there is no consistancy in the various EXPREF between what is link or not, touch source files after synchronisation to trigger compilation in the unlikely case where source in CFG/MY_SRC is more recent than in REF/MY_SRC

File:

• utils/CI/sette_ticket2304/all_functions.sh (modified) (6 diffs)

utils/CI/sette_ticket2304/all_functions.sh

@@ -95 +95 @@
    if [ ${SYNC_CONFIGS} == "yes" ]; then
 
+      echo '-------------------------------------------------------------------------------'
+      echo '                    SOURCE AND CONFIG FILES SYNCHRONISATION                    '
+      echo ''
       echo "configuration $3/$2 will be synchronised with $3/$1"
+      echo ''
 
       lREF=$3/$1    # reference 
@@ -107 +111 @@
             # Manage case number of file in MY_SRC changes
             # find number of file only in $lCFG/MY_SRC
-            FCFG=`diff -r $lREF/MY_SRC $lCFG/MY_SRC | grep $lCFG/MY_SRC | awk '{print $4}'`
+            FCFG=`diff -r $lREF/MY_SRC $lCFG/MY_SRC | grep "Only in $lCFG/MY_SRC" | awk '{print $4}'`
 
             # if more than 0, trigger a cleaning as Makenemo do not properly manage this case.
@@ -113 +117 @@
                echo ''
                echo "$lCFG contains a different file list than $lREF :"
-               diff -r $lREF/MY_SRC $lCFG/MY_SRC | grep $lCFG/MY_SRC | awk '{print $4}'
+               diff -r $lREF/MY_SRC $lCFG/MY_SRC | grep "Only in $lCFG/MY_SRC" | awk '{print $4}'
                echo "Synchronisation is not enough because Makenemo does not handle well case where a file in MY_SRC is removed"
                echo "Therefore, we need to clean $lCFG before starting runing it"
@@ -123 +127 @@
          # synchronisation $lREF/MY_SRC directory (and delete file in target location if needed)
          rsync -av --delete $lREF/MY_SRC/ $lCFG/MY_SRC
+
+         # rsync keep preserve the modification time stamp.
+         # To avoid case where a file in MY_SRC is replace by an older file, we touch the file
+         touch $lCFG/MY_SRC/*
       fi
 
       # synchronize EXPREF
       if [ -d $lREF/EXPREF ] && [ -d $lCFG/EXP00 ] ; then
-         rsync $lREF/EXPREF/*namelist*_cfg  $lCFG/EXP00/.
-         rsync $lREF/EXPREF/iodef.xml       $lCFG/EXP00/.
-         rsync $lREF/EXPREF/*context_*.xml  $lCFG/EXP00/.
-         rsync $lREF/EXPREF/file_def_*.xml  $lCFG/EXP00/.
+         rsync -aq --no-links $lREF/EXPREF/ $lCFG/EXP00/.
       fi
-
+      echo '-------------------------------------------------------------------------------'
    fi
 }
@@ -142 +147 @@
       lCFG=$2
       lTYP=$3
+      echo ''
+      echo '-------------------------------------------------------------------------------'
+      echo '                         CLEANING CONFIGURATION                                '
+      echo ''
+      echo "./makenemo -n $lCFG -a/-r $lREF clean"
+      echo ''
       if [ ${lTYP} == 'tests' ]; then
          ./makenemo -n $lCFG -a $lREF clean
@@ -152 +163 @@
       echo "$lCFG configuration has been cleaned"
       echo ''
+      echo '-------------------------------------------------------------------------------'
    fi
 }