Changeset 34cabf6

Timestamp:

04/14/2006 04:46:50 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

9b5d069

Parents:

9619fd6

Message:

Creating iteration-N.log files to keep clean Makefile output.

Files:

• common/func_compare.sh (modified) (5 diffs)
• extras/do_copy_files (modified) (2 diffs)
• extras/do_ica_prep (modified) (2 diffs)
• extras/do_ica_work (modified) (2 diffs)
• extras/filelist (modified) (2 diffs)

common/func_compare.sh

@@ -60 +60 @@
 (
     cat << EOF
-        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION && \\
-        extras/do_ica_prep $DEST_ICA/$ITERATION
+        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION >>logs/$ITERATION.log 2>&1 && \\
+        extras/do_ica_prep $DEST_ICA/$ITERATION >>logs/$ITERATION.log 2>&1
 EOF
 ) >> $MKFILE.tmp
@@ -73 +73 @@
 (
     cat << EOF
-        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION && \\
-        extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/$ITERATION.filelist
+        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >>logs/$ITERATION.log 2>&1 && \\
+        extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >>logs/$ITERATION.log 2>&1
 EOF
 ) >> $MKFILE.tmp
@@ -86 +86 @@
 wrt_do_ica_work() {                #
 #----------------------------------#
-  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3" >> $MKFILE.tmp
+  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >>logs/$ITERATION.log 2>&1" >> $MKFILE.tmp
 }
 
@@ -94 +94 @@
   local OUTPUT=$FARCELOGDIR/${1}_V_${2}
   local PREDIR=$3/$1
-  local PREFILE=$3/$1.filelist
+  local PREFILE=$3/filelist-$1
   local ITEDIR=$3/$2
-  local ITEFILE=$3/$2.filelist
-  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE" >> $MKFILE.tmp
+  local ITEFILE=$3/filelist-$2
+  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/$ITERATION.log 2>&1" >> $MKFILE.tmp
 }
 
@@ -103 +103 @@
 wrt_logs() {             #
 #----------------------------------#
-  local ITERATION=iteration$1
+  local ITERATION=iteration-$1
 
 (
     cat << EOF
-        @pushd logs && \\
+        @pushd logs 1> /dev/null && \\
         mkdir $ITERATION && \\
         cp ${chapter6} $ITERATION && \\
-        popd
+        popd 1> /dev/null
         @touch \$@
 EOF

extras/do_copy_files

@@ -18 +18 @@
 TMP_FILE=/tmp/prunelist
 
+echo -en "\nCopying system files to $3 ..."
+
 # Create a file that we can pass to tar as an "exclude list".
 # There might be an easier way to achieve tar exclusions? Strip
@@ -31 +33 @@
 # Clear out the temporary file
 rm -f ${TMP_FILE}
+
+echo "done."

extras/do_ica_prep

@@ -27 +27 @@
 if [ ! -f "$CMP_DIR/icaprep" ]; then
 
-  echo -n "Removing symbolic links in ${CMP_DIR}... "
+  echo -en "\nRemoving symbolic links in ${CMP_DIR}... "
   find $CMP_DIR -type l | xargs rm -f
   echo "done."
@@ -70 +70 @@
   # We're all done
   echo -en "\nSuccess: ICA preparation for "
-  echo -e "${CMP_DIR} complete.\n"
+  echo -e "${CMP_DIR} complete."
   touch $CMP_DIR/icaprep
 else

extras/do_ica_work

@@ -28 +28 @@
 REPORT="${3}/REPORT.${1}V${2}"
 
+echo -en "\nGenerating ICA analysis report $1 versus $2 ..."
+
 mkdir -p $3
 
@@ -50 +52 @@
 
 rm -f $RAWDIFF
+
+echo "done."

extras/filelist

@@ -41 +41 @@
 fi
 
-echo "Will create file list in $OUTFILE"
+echo -en "\nCreating file list for farce amalysis in $OUTFILE ..."
 if [ -f $OUTFILE ]; then
   echo "refusing to overwrite $OUTFILE"
@@ -56 +56 @@
 find $LOC -xdev -xtype f | sed "s%^${LOC}%/%" | sort >$OUTFILE
 
+echo -e "done.\n"
+
 exit