Changeset 8ba8df4 for common/func_ICA.sh

Timestamp:

04/09/2006 08:31:19 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

6a14368

Parents:

a101844

Message:

Added wrt_do_X_work functions.

File:

• common/func_ICA.sh (modified) (7 diffs)

common/func_ICA.sh

@@ -33 +33 @@
       wrt_prepare        "$ITERATION"
       wrt_logs_and_clean "$ITERATION"
-      echo -e "\t@touch \$@\n" >> $MKFILE
       PREV=$ITERATION
     elif [ "$N" = "$ITERATIONS" ] ; then
       echo "iteration-last:  $PREV  system_rebuild" >> $MKFILE
-      wrt_prepare        "$ITERATION"
+      wrt_prepare        "$ITERATION" "$PREV"
       wrt_logs           "$ITERATION"
-      #I need to gigure out how to handle this for ITERATIONS > 2
-      # @do_ica_work $1 $2
-      # @farce $1 $2
-      echo -e "\t@touch \$@\n" >> $MKFILE
     else
       echo "$ITERATION:  $PREV  system_rebuild" >> $MKFILE
-      wrt_prepare        "$ITERATION"
+      wrt_prepare        "$ITERATION" "$PREV"
       wrt_logs_and_clean "$ITERATION"
-      echo -e "\t@touch \$@\n" >> $MKFILE
       PREV=$ITERATION
     fi
@@ -57 +51 @@
 #----------------------------------#
   local ITERATION=$1
+  local      PREV=$2
 
   if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
     local PRUNEPATH="/jhalfs /sources /var/log/paco /opt /dev /home /mnt /proc \
 /root /sys /tmp /usr/src /lost+found /tools"
-    local ROOT_DIR=/
+    local    ROOT_DIR=/
     local DEST_TOPDIR=/jhalfs
+    local   ICALOGDIR=/jhalfs/logs/ICA
+    local FARCELOGDIR=/jhalfs/logs/farce
   else
     local PRUNEPATH="$BUILDDIR/jhalfs $BUILDDIR/sources $BUILDDIR/var/log/paco \
@@ -68 +65 @@
 $BUILDDIR/proc $BUILDDIR/root $BUILDDIR/sys $BUILDDIR/tmp \
 $BUILDDIR/usr/src $BUILDDIR/lost+found $BUILDDIR/tools"
-    local ROOT_DIR=$BUILDDIR
+    local    ROOT_DIR=$BUILDDIR
     local DEST_TOPDIR=$BUILDDIR/jhalfs
   fi
@@ -80 +77 @@
 EOF
 ) >> $MKFILE
+    if [[ "$ITERATION" != "iteration-1" ]] ; then
+      wrt_do_ica_work "$PREV" "$ITERATION" "$DEST_ICA"
+    fi
   fi
 
@@ -90 +90 @@
 EOF
 ) >> $MKFILE
+    if [[ "$ITERATION" != "iteration-1" ]] ; then
+      wrt_do_farce_work "$PREV" "$ITERATION" "$DEST_FARCE"
+    fi
   fi
+}
+
+#----------------------------------#
+wrt_do_ica_work() {                #
+#----------------------------------#
+  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3" >> $MKFILE
+}
+
+#----------------------------------#
+wrt_do_farce_work() {                    #
+#----------------------------------#
+  local OUTPUT=$FARCELOGDIR/${1}_V_${2}
+  local PREDIR=$3/$1
+  local PREFILE=$3/$1.filelist
+  local ITEDIR=$3/$2
+  local ITEFILE=$3/$2.filelist
+  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE" >> $MKFILE
 }
 
@@ -105 +125 @@
         popd
         @rm -f $system_rebuild
+        @touch \$@
+
 EOF
 ) >> $MKFILE
@@ -120 +142 @@
         cp $system_rebuild $ITERATION && \\
         popd
+        @touch \$@
+
 EOF
 ) >> $MKFILE