Changeset 6bb080e for common

Timestamp:

12/04/2006 08:58:09 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

10c8b78

Parents:

ac35c8e

Message:

Revised compare code. Test build in progres.

Location:

common/libs

Files:

• func_compare.sh (modified) (5 diffs)
• func_wrt_Makefile (modified) (4 diffs)

common/libs/func_compare.sh

@@ -14 +14 @@
     CHROOT_wrt_target "$ITERATION" "$PREV"
     wrt_compare_work "$ITERATION" "$PREV_IT"
-    wrt_logs "$N"
+    wrt_touch
     PREV_IT=$ITERATION
     PREV=$ITERATION
@@ -68 +68 @@
 (
     cat << EOF
-        @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
+        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION >>logs/\$@ 2>&1 && \\
+        extras/do_ica_prep $DEST_ICA/$ITERATION >>logs/\$@ 2>&1
 EOF
 ) >> $MKFILE.tmp
@@ -81 +81 @@
 (
     cat << EOF
-        @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
+        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >>logs/\$@ 2>&1 && \\
+        extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >>logs/\$@ 2>&1
 EOF
 ) >> $MKFILE.tmp
@@ -94 +94 @@
 wrt_do_ica_work() {                #
 #----------------------------------#
-  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >>logs/$ITERATION.log 2>&1" >> $MKFILE.tmp
+  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >>logs/\$@ 2>&1" >> $MKFILE.tmp
 }
 
@@ -105 +105 @@
   local ITEDIR=$3/$2
   local ITEFILE=$3/filelist-$2
-  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/$ITERATION.log 2>&1" >> $MKFILE.tmp
+  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/\$@ 2>&1" >> $MKFILE.tmp
 }
-
-#----------------------------------#
-wrt_logs() {                       #
-#----------------------------------#
-  local ITERATION=iteration-$1
-
-(
-    cat << EOF
-        @pushd logs 1> /dev/null && \\
-        mkdir $ITERATION && \\
-        mv ${LOGS} $ITERATION && \\
-        popd 1> /dev/null
-        @touch \$@ && \\
-        sleep .25 && \\
-        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
-        echo --------------------------------------------------------------------------------\$(WHITE)
-EOF
-) >> $MKFILE.tmp
-}

common/libs/func_wrt_Makefile

@@ -115 +115 @@
   local i=$1
   local PREV=$2
-  case $i in
-    iteration* ) local LOGFILE="${this_script}.log" ;;
-             * ) local LOGFILE="\$@"      ;;
-  esac
 (
 cat << EOF
@@ -125 +121 @@
         @\$(call echo_message, Building)
         @./progress_bar.sh \$@ \$\$PPID &
-        @echo "\$(nl_)\`date\`\$(nl_)" >logs/$LOGFILE
-        @\$(PRT_DU_CR) >>logs/$LOGFILE
+        @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@
+        @\$(PRT_DU_CR) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -190 +186 @@
 (
 cat  << EOF
-        @echo "export  TEST_LOG=$TESTLOGDIR/$TESTLOGFILE" >> envars && \\
-        echo '\$(nl_)\`date\`\$(nl_)' >$TESTLOGDIR/$TESTLOGFILE
+        @echo "export  TEST_LOG=\$(TESTLOGDIR)/$TESTLOGFILE" >> envars && \\
+        echo '\$(nl_)\`date\`\$(nl_)' >\$(TESTLOGDIR)/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -203 +199 @@
 cat  << EOF
         @echo "export TEST_LOG=\$(crTESTLOGDIR)/$TESTLOGFILE" >> envars && \\
-        echo "\$(nl_)\`date\`\$(nl_)" >test-logs/$TESTLOGFILE
+        echo "\$(nl_)\`date\`\$(nl_)" >test-logs/\$@
 EOF
 ) >> $MKFILE.tmp