Changeset 10c8b78 for common

Timestamp:

12/05/2006 03:25:00 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:

2512414

Parents:

6bb080e

Message:

More compare and related fixes.
Test build in progress.

Location:

common

Files:

• common-functions (modified) (1 diff)
• create-sbu_du-report.sh (modified) (1 diff)
• libs/func_compare.sh (modified) (3 diffs)
• libs/func_wrt_Makefile (modified) (1 diff)

common/common-functions

@@ -56 +56 @@
       # Clean the build directory
       echo -n "Cleaning $BUILDDIR ..."
-      sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib,media,mnt,opt,proc,root,sbin,srv,sys,tmp,tools,cross-tools,usr,var}
+      sudo rm -rf $BUILDDIR/{bin,boot,etc,home,lib,media,mnt,opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
       echo "done"
       echo -n "Cleaning $JHALFSDIR ..."

common/create-sbu_du-report.sh

@@ -20 +20 @@
 # If there is iteration logs directories, copy the logs inside iteration-1
 # to the top level dir
-[[ -d "$LOGSDIR"/iteration-1 ]] && \
-  cp $LOGSDIR/iteration-1/* $LOGSDIR
+[[ -d "$LOGSDIR"/build_1 ]] && \
+  cp $LOGSDIR/build_1/* $LOGSDIR
 
 # Set the report file

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
@@ -47 +48 @@
     fi
   fi
-
-  echo -e "\nsystem_build_$RUN: $PREV_IT $system_build" >> $MKFILE.tmp
 }
 
@@ -107 +106 @@
   echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/\$@ 2>&1" >> $MKFILE.tmp
 }
+
+#----------------------------------#
+wrt_logs() {                       #
+#----------------------------------#
+  local build=build_$1
+  local file
+
+(
+    cat << EOF
+        @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
+}

common/libs/func_wrt_Makefile

@@ -187 +187 @@
 cat  << EOF
         @echo "export  TEST_LOG=\$(TESTLOGDIR)/$TESTLOGFILE" >> envars && \\
-        echo '\$(nl_)\`date\`\$(nl_)' >\$(TESTLOGDIR)/\$@
+        echo "\$(nl_)\`date\`\$(nl_)" >\$(TESTLOGDIR)/\$@
 EOF
 ) >> $MKFILE.tmp