Changeset 34cabf6 for common

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.

File:

• common/func_compare.sh (modified) (5 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