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

common/func_compare.sh

@@ -59,8 +59,8 @@ wrt_compare_work() {               #
     local DEST_ICA=$DEST_TOPDIR/ICA && \
 (
     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
     if [[ "$ITERATION" != "iteration-1" ]] ; then
@@ -72,8 +72,8 @@ EOF
     local DEST_FARCE=$DEST_TOPDIR/farce && \
 (
     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
     if [[ "$ITERATION" != "iteration-1" ]] ; then
@@ -85,7 +85,7 @@ EOF
 #----------------------------------#
 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
 }
 
 #----------------------------------#
@@ -93,23 +93,23 @@ wrt_do_farce_work() {              #
 #----------------------------------#
   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
 }
 
 #----------------------------------#
 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
 ) >> $MKFILE.tmp

extras/do_copy_files

@@ -17,6 +17,8 @@ inline_doc
 
 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
 # the leading /.
@@ -30,3 +32,5 @@ tar -X $TMP_FILE -cf - . | tar -C $3 -xf -
 
 # Clear out the temporary file
 rm -f ${TMP_FILE}
+
+echo "done."

extras/do_ica_prep

@@ -26,7 +26,7 @@ CMP_DIR=$1
 # Run ica_prep if it hasn't been done already
 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."
 
@@ -69,7 +69,7 @@ if [ ! -f "$CMP_DIR/icaprep" ]; then
 
   # 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
   echo -e "\n$CMP_DIR was already processed\n"

extras/do_ica_work

@@ -27,6 +27,8 @@ inline_doc
 RAWDIFF=/tmp/rawdiff.$$
 REPORT="${3}/REPORT.${1}V${2}"
 
+echo -en "\nGenerating ICA analysis report $1 versus $2 ..."
+
 mkdir -p $3
 
 cd $4
@@ -49,3 +51,5 @@ grep -v "iles.*differ$" $RAWDIFF | \
 grep -v "^Only in" > ${ICA_DIR}/${1}V${2}.ASCII.DIFF
 
 rm -f $RAWDIFF
+
+echo "done."

extras/filelist

@@ -40,7 +40,7 @@ else
   LOC=`echo $1 | sed 's%[^/]$%&/%'`
 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"
   exit 1
@@ -55,4 +55,6 @@ fi
 
 find $LOC -xdev -xtype f | sed "s%^${LOC}%/%" | sort >$OUTFILE
 
+echo -e "done.\n"
+
 exit