Changeset 3cb4ef5b for common

Timestamp:

10/05/2013 05:45:52 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

433a5d4

Parents:

ad4ff97

Message:

Add versions to file names in logs and test-logs: use it for the SBY report

File:

• common/libs/func_wrt_Makefile (modified) (12 diffs)

common/libs/func_wrt_Makefile

@@ -59 +59 @@
 
 
-#==== PACKAGES NAMES ===
+#==== PACKAGES NAMES AND VERSIONS ====
 
 #----------------------------------#
@@ -117 +117 @@
 }
 
+#----------------------------------#
+get_package_version() {            #
+#----------------------------------#
+# Those hacks may change depending on the invention of devs for tarball names.
+# Normally, we expect -digit to signal the beginning of the version field
+# but it may happen that there is no '-' (tcl, expect), that the version
+# field is ddd-d (pkg-config-lite-028-1, since sed is greedy, it finds only
+# the second dash) or that the first character of the version is not a digit
+# (iputils-s20121221)...
+  case ${1} in
+     tcl*|expect*|tzdata*|xmlts*|unzip*|lynx*)
+                           echo ${1} | sed -e 's@^[^[:digit:]]*@@' \
+                                           -e 's@\(-src\)*\.tar.*@@'
+        ;;
+     iputils*)             echo ${1} | sed -e 's@^.*-@@' \
+                                           -e 's@\.tar.*@@'
+        ;;
+     LVM*)                 echo ${1} | sed -e 's@^[^.]*\.@@' \
+                                           -e 's@\.tgz.*@@'
+        ;;
+     iproute*)             echo ${1} | sed -e 's@^[^-]*-@@' \
+                                           -e 's@\.tar.*@@'
+        ;;
+     pkg*|udev*|Singular*)
+                           echo ${1} | sed -e 's@^.*[a-z]-\([[:digit:]]\)@\1@' \
+                                           -e 's@\.tar.*@@' \
+                                           -e 's@\.zip.*@@'
+        ;;
+     *)                    echo ${1} | sed -e 's@^.*[-_]\([[:digit:]]\)@\1@' \
+                                           -e 's@\.tar.*@@' \
+                                           -e 's@\.zip.*@@'
+        ;;
+  esac
+
+}
 #=======================
 
@@ -127 +162 @@
   local i=$1
   local PREV=$2
+  local version
+  if [ "$3" != "" ]; then
+    version=-$3
+  fi
 (
 cat << EOF
@@ -133 +172 @@
         @\$(call echo_message, Building)
 ${NO_PROGRESS}  @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
-        @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@
-        @\$(PRT_DU) >>logs/\$@
+        @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@$version
+        @\$(PRT_DU) >>logs/\$@$version
 EOF
 ) >> $MKFILE.tmp
@@ -144 +183 @@
   local i=$1
   local PREV=$2
+  local version
+  if [ "$3" != "" ]; then
+    version=-$3
+  fi
 (
 cat << EOF
@@ -150 +193 @@
         @\$(call echo_message, Building)
 ${NO_PROGRESS}  @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
-        @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@
-        @\$(PRT_DU_CR) >>logs/\$@
+        @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@$version
+        @\$(PRT_DU_CR) >>logs/\$@$version
 EOF
 ) >> $MKFILE.tmp
@@ -212 +255 @@
 LUSER_wrt_test_log() {             # Initialize testsuite log file
 #----------------------------------#
-  local TESTLOGFILE=$1
+  local version
+  if [ "$2" != "" ]; then
+    version=-$2
+  fi
+  local TESTLOGFILE=$1$version
 (
 cat  << EOF
         @echo "export  TEST_LOG=\$(TESTLOGDIR)/$TESTLOGFILE" >> envars && \\
-        echo "\$(nl_)\`date\`\$(nl_)" >\$(TESTLOGDIR)/\$@
+        echo "\$(nl_)\`date\`\$(nl_)" >\$(TESTLOGDIR)/$TESTLOGFILE
 EOF
 ) >> $MKFILE.tmp
@@ -224 +271 @@
 CHROOT_wrt_test_log() {            #
 #----------------------------------#
-  local TESTLOGFILE=$1
+  local version
+  if [ "$2" != "" ]; then
+    version=-$2
+  fi
+  local TESTLOGFILE=$1$version
 (
 cat  << EOF
         @echo "export TEST_LOG=\$(crTESTLOGDIR)/$TESTLOGFILE" >> envars && \\
-        echo "\$(nl_)\`date\`\$(nl_)" >test-logs/\$@
+        echo "\$(nl_)\`date\`\$(nl_)" >\$(crTESTLOGDIR)/$TESTLOGFILE
 EOF
 ) >> $MKFILE.tmp
@@ -242 +293 @@
 #----------------------------------#
   local MOUNT_ENV
+  local version
+  if [ "$2" != "" ]; then
+    version=-$2
+  fi
   local file=$1
 
@@ -256 +311 @@
 cat << EOF
         @export ${MOUNT_ENV}=\$(MOUNT_PT) && \\
-        ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@ 2>&1 && \\
-        \$(PRT_DU) >>logs/\$@
+        ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@$version 2>&1 && \\
+        \$(PRT_DU) >>logs/\$@$version
 EOF
 ) >> $MKFILE.tmp
@@ -266 +321 @@
 #----------------------------------#
   local file=$1
+  local version
+  if [ "$2" != "" ]; then
+    version=-$2
+  fi
 
 (
 cat << EOF
         @source ~/.bashrc && \\
-        \$(CMDSDIR)/`dirname $file`/\$@ >> logs/\$@ 2>&1 && \\
-        \$(PRT_DU) >>logs/\$@
+        \$(CMDSDIR)/`dirname $file`/\$@ >> logs/\$@$version 2>&1 && \\
+        \$(PRT_DU) >>logs/\$@$version
 EOF
 ) >> $MKFILE.tmp
@@ -280 +339 @@
 #----------------------------------#
   local file=$1
+  local version
+  if [ "$2" != "" ]; then
+    version=-$2
+  fi
 (
 cat << EOF
         @source envars && \\
-        \$(crCMDSDIR)/`dirname $file`/\$@ >>logs/\$@ 2>&1 && \\
-        \$(PRT_DU_CR) >>logs/\$@
+        \$(crCMDSDIR)/`dirname $file`/\$@ >>logs/\$@$version 2>&1 && \\
+        \$(PRT_DU_CR) >>logs/\$@$version
 EOF
 ) >> $MKFILE.tmp