Changeset d27c9ca for common


Ignore:
Timestamp:
04/11/2006 10:06:37 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
343f27e
Parents:
eb024db
Message:

Generating new iteration-N targets and dummy system_build_N targets.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • common/func_ICA.sh

    reb024db rd27c9ca  
    22
    33#----------------------------------#
    4 wrt_ica_targets() {                #
     4wrt_compare_targets() {            #
    55#----------------------------------#
    66
    … …  
    88                                          # and "ITERATIONS" with no "$".
    99    ITERATION=iteration-$N
    10     if [ "$N" = "1" ] ; then
    11       echo "$ITERATION:  chapter6" >> $MKFILE
    12       echo -e "\t@\$(call echo_message, Building)" >> $MKFILE
    13       wrt_ica_work       "$ITERATION"
    14       wrt_logs_and_clean "$ITERATION"
    15     else
    16       wrt_system_build $N
    17       echo "iteration-last:  $PREV  system_build_$N" >> $MKFILE
    18       echo -e "\t@\$(call echo_message, Building)" >> $MKFILE
    19       wrt_ica_work       "$ITERATION" "$PREV"
    20       if [ "$N" = "$ITERATIONS" ] ; then
    21         wrt_logs           "$ITERATION"
    22       else
    23         wrt_logs_and_clean "$ITERATION"
    24       fi
     10    if [ "$N" != "1" ] ; then
     11      wrt_system_build "$N"
    2512    fi
     13    wrt_target "$ITERATION" "$PREV"
     14    wrt_compare_work "$ITERATION" "$PREV_IT"
     15    wrt_logs "$N"
     16    PREV_IT=$ITERATION
    2617    PREV=$ITERATION
    2718  done
    … …  
    3425
    3526  # Placeholder for now
     27
     28  echo "system_build_$N: $chapter6" >> $MKFILE.tmp
     29  PREV=system_build_$N
    3630}
    3731
    3832#----------------------------------#
    39 wrt_ica_work() {                   #
     33wrt_compare_work() {               #
    4034#----------------------------------#
    4135  local ITERATION=$1
    42   local      PREV=$2
     36  local   PREV_IT=$2
    4337  local PRUNEPATH="/dev /home /jhalfs /lost+found /media /mnt /opt /proc \
    4438/sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
    … …  
    6155        extras/do_ica_prep $DEST_ICA/$ITERATION
    6256EOF
    63 ) >> $MKFILE
     57) >> $MKFILE.tmp
    6458    if [[ "$ITERATION" != "iteration-1" ]] ; then
    65       wrt_do_ica_work "$PREV" "$ITERATION" "$DEST_ICA"
     59      wrt_do_ica_work "$PREV_IT" "$ITERATION" "$DEST_ICA"
    6660    fi
    6761  fi
    … …  
    7468        extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/$ITERATION.filelist
    7569EOF
    76 ) >> $MKFILE
     70) >> $MKFILE.tmp
    7771    if [[ "$ITERATION" != "iteration-1" ]] ; then
    78       wrt_do_farce_work "$PREV" "$ITERATION" "$DEST_FARCE"
     72      wrt_do_farce_work "$PREV_IT" "$ITERATION" "$DEST_FARCE"
    7973    fi
    8074  fi
    … …  
    8478wrt_do_ica_work() {                #
    8579#----------------------------------#
    86   echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3" >> $MKFILE
     80  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3" >> $MKFILE.tmp
    8781}
    8882
    8983#----------------------------------#
    90 wrt_do_farce_work() {                    #
     84wrt_do_farce_work() {              #
    9185#----------------------------------#
    9286  local OUTPUT=$FARCELOGDIR/${1}_V_${2}
    … …  
    9589  local ITEDIR=$3/$2
    9690  local ITEFILE=$3/$2.filelist
    97   echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE" >> $MKFILE
     91  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE" >> $MKFILE.tmp
    9892}
    9993
    10094#----------------------------------#
    101 wrt_logs_and_clean() {             #
     95wrt_logs() {             #
    10296#----------------------------------#
    103   local ITERATION=$1
     97  local ITERATION=iteration$1
    10498
    10599(
    … …  
    107101        @pushd logs && \\
    108102        mkdir $ITERATION && \\
    109         mv $system_rebuild $ITERATION && \\
    110         popd
    111         @rm -f $system_rebuild
    112         @touch \$@
    113 
    114 EOF
    115 ) >> $MKFILE
    116 }
    117 
    118 #----------------------------------#
    119 wrt_logs() {             #
    120 #----------------------------------#
    121   local ITERATION=$1
    122 
    123 (
    124     cat << EOF
    125         @pushd logs && \\
    126         mkdir $ITERATION && \\
    127         cp $system_rebuild $ITERATION && \\
     103        cp ${chapter6}-$N $ITERATION && \\
    128104        popd
    129105        @touch \$@
    130106
    131107EOF
    132 ) >> $MKFILE
     108) >> $MKFILE.tmp
    133109}
Note: See TracChangeset for help on using the changeset viewer.