Changeset 1079 in MondoRescue for trunk/tools

Timestamp:

Jan 28, 2007, 5:58:18 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1045:1078 £SVN_M/branches/stable

Location:

trunk/tools

Files:

• build2pkg (modified) (1 diff)
• distro-env (modified) (1 diff)
• mdiff (copied) (copied from branches/stable/tools/mdiff )
• mval (modified) (1 diff, 1 prop)
• quality (modified) (2 diffs)
• svn2build (modified) (1 diff)

trunk/tools/build2pkg

@@ -56 +56 @@
     pv=`basename $src .tar.gz`
     PVER=`echo $pv | sed "s|^$p-||" | cut -d- -f1`
+
+    if [ _"$p" = _"mindi" ]; then
+        # Copy FindDistroFailsafe if it makes sense for that distro
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/FindDistroFailsafe 2> /dev/null
+        ln $p-${PVER}/distributions/${ddir}-$dver/FindDistroFailsafe $p-${PVER} 2> /dev/null
+    fi
 
     if [  _"$dtype" = _"rpm" ]; then

trunk/tools/distro-env

@@ -29 +29 @@
         elif grep -q CentOS /etc/redhat-release ; then
             export ddir="centos"
-            export dver=`awk '{print $3}' /etc/redhat-release`
+            export dver=`awk '{print $3}' /etc/redhat-release | cut -d. -f1`
         else
             export ddir="redhat"

trunk/tools/mval

@@ -1 @@
-valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes
+valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes $*

trunk/tools/quality

@@ -31 +31 @@
     echo "monodrescue $s usage : "
     tot=0
-    for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
+    for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|mindi-busybox' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
             echo " === $i"
             ((tot=$tot+`echo $i | cut -d: -f2`))
@@ -40 +40 @@
 echo " "
 echo "Qualimetry: "
-find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | xargs grep -r asprintf | egrep -v '/\*' | egrep -v 'asprintf\(&' > /tmp/mondo.quality
+find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -r asprintf | egrep -v '/\*' | egrep -v 'asprintf\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
 echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` asprintf without &"
-find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | xargs grep -r getline | egrep -v '/\*' | egrep -v 'getline\(&' > /tmp/mondo.quality
+find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -r getline | egrep -v '/\*' | egrep -v 'getline\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
 echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` getline without &"

trunk/tools/svn2build

@@ -80 +80 @@
                 exit -1
             fi
-            echo "Using $inc customization to build SPEC file"
 
             $TOOLHOME/mkchangelog.pl $dtype $p $MONDOTMP/$p.spec