r2574 - in jhalfs/branches/experimental: LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Apr 24 11:26:00 PDT 2006


Author: manuel
Date: 2006-04-24 12:25:56 -0600 (Mon, 24 Apr 2006)
New Revision: 2574

Modified:
   jhalfs/branches/experimental/LFS/master.sh
   jhalfs/branches/experimental/common/func_compare.sh
Log:
Improved logs manegament in iterative builds.

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-04-24 16:44:57 UTC (rev 2573)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-04-24 18:25:56 UTC (rev 2574)
@@ -146,6 +146,7 @@
 chapter6_Makefiles() {
 #----------------------------#
   # Set envars and scripts for iteration targets
+  LOGS="" # Start with an empty global LOGS envar
   if [[ -z "$1" ]] ; then
     local N=""
   else
@@ -198,10 +199,14 @@
       esac
     fi
 
-    # First append each name of the script files to a list (this will become
-    # the names of the targets in the Makefile
+    # Append each name of the script files to a list (this will become
+    # the names of the targets in the Makefile)
     chapter6="$chapter6 ${this_script}${N}"
 
+    # Append each name of the script files to a list (this will become
+    # the names of the logs to be moved for each iteration)
+    LOGS="$LOGS ${this_script}"
+
     #--------------------------------------------------------------------#
     #         >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<          #
     #--------------------------------------------------------------------#
@@ -337,7 +342,7 @@
   chapter4_Makefiles
   chapter5_Makefiles
   chapter6_Makefiles
-  # Add the ICA/farce targets, if needed
+  # Add the iterations targets, if needed
   [[ "$COMPARE" != "0" ]] && wrt_compare_targets
   chapter789_Makefiles
 

Modified: jhalfs/branches/experimental/common/func_compare.sh
===================================================================
--- jhalfs/branches/experimental/common/func_compare.sh	2006-04-24 16:44:57 UTC (rev 2573)
+++ jhalfs/branches/experimental/common/func_compare.sh	2006-04-24 18:25:56 UTC (rev 2574)
@@ -10,6 +10,7 @@
     if [ "$N" != "1" ] ; then
       wrt_system_build "$N" "$PREV_IT"
     fi
+    this_script=$ITERATION
     wrt_target "$ITERATION" "$PREV"
     wrt_compare_work "$ITERATION" "$PREV_IT"
     wrt_logs "$N"
@@ -108,7 +109,7 @@
     cat << EOF
 	@pushd logs 1> /dev/null && \\
 	mkdir $ITERATION && \\
-	cp ${chapter6} $ITERATION && \\
+	mv ${LOGS} $ITERATION && \\
 	popd 1> /dev/null
 	@touch \$@
 EOF




More information about the alfs-log mailing list