Changeset 9c9775f for common/libs/func_compare.sh

Timestamp:

09/19/2007 04:50:48 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

3778352

Parents:

0510381

Message:

Updated experimental branch to current trunk code.

File:

• common/libs/func_compare.sh (moved) (moved from common/func_compare.sh ) (9 diffs)

common/libs/func_compare.sh

@@ -15 +15 @@
     wrt_compare_work "$ITERATION" "$PREV_IT"
     wrt_logs "$N"
+    wrt_touch
     PREV_IT=$ITERATION
     PREV=$ITERATION
@@ -26 +27 @@
   local PREV_IT=$2
 
-  if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "chroot" ]] ; then
-    chroot_final_system_Makefiles $RUN
-  elif [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
-    boot_final_system_Makefiles $RUN
+  if [[ "$PROGNAME" = "clfs" ]] ; then
+    final_system_Makefiles $RUN
   else
     chapter6_Makefiles $RUN
@@ -47 +46 @@
     fi
   fi
-
-  echo -e "\nsystem_build_$RUN: $PREV_IT $system_build" >> $MKFILE.tmp
 }
 
@@ -57 +54 @@
   local   PREV_IT=$2
   local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt /proc \
-/sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
+/sources /root /srv /sys /tmp /tools /usr/local /usr/src"
 
   local    ROOT_DIR=/
@@ -68 +65 @@
 (
     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 +78 @@
 (
     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 +91 @@
 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 +102 @@
   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
 }
 
@@ -111 +108 @@
 wrt_logs() {                       #
 #----------------------------------#
-  local ITERATION=iteration-$1
+  local build=build_$1
+  local file
 
 (
     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)
+        @cd logs && \\
+        mkdir $build && \\
+        mv -f ${system_build} $build && \\
+        if [ ! $build = build_1 ] ; then \\
+          cd $build && \\
+          for file in \`ls .\` ; do \\
+            mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
+          done ; \\
+        fi ;
+        @cd /\$(SCRIPT_ROOT)
+        @if [ -d test-logs ] ; then \\
+          cd test-logs && \\
+          mkdir $build && \\
+          mv -f ${system_build} $build && \\
+          if [ ! $build = build_1 ] ; then \\
+            cd $build && \\
+            for file in \`ls .\` ; do \\
+              mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
+            done ; \\
+          fi ; \\
+          cd /\$(SCRIPT_ROOT) ; \\
+        fi ;
 EOF
 ) >> $MKFILE.tmp