Changeset 651 in MondoRescue for branches

Timestamp:

Jun 8, 2006, 12:56:31 PM (18 years ago)

Author:

bcornec

Message:

Lots of bug fixes on delivery process
Addition of mkannounce to generate announces of new versions automatically

Location:

branches/stable/tools

Files:

• mkannounce (added)
• mkannounce.pl (added)
• mkchangelog.pl (modified) (5 diffs)
• mknewtag (modified) (2 diffs)
• mknewversion (added)
• svn2build (modified) (4 diffs)

branches/stable/tools/mkchangelog.pl

@@ -10 +10 @@
 use strict;
 use Date::Manip;
+use File::Basename;
+use English;
 
 my $log = "";
@@ -16 +18 @@
 my $pkg2;
 my $outfile = $ARGV[2];
-my $TOOLHOME = $ENV{TOOLHOME};
 my $chglog = "";
 my $ndate = "";
@@ -30 +31 @@
         (not (defined $pkg)) || ($pkg eq "") || 
         (not (defined $outfile)) || ($outfile eq ""));
+
+my $TOOLHOME;
+$tmp = dirname($PROGRAM_NAME);
+if ($tmp =~ /^\//) {
+    $TOOLHOME = $tmp;
+    }
+else {
+    $TOOLHOME = "$ENV{PWD}/$tmp";
+    }
+
+die "TOOLHOME doesn't exist" if (not (defined $TOOLHOME));
 
 if (-f "$TOOLHOME/../$pkg/ChangeLog") {
@@ -52 +64 @@
 $tmp = <INPUT>;
 $tmp = <INPUT>;
+if ($dtype eq "announce") {
+    print OUTPUT $tmp;
+}
 $tmp = <INPUT>;
+if ($dtype eq "announce") {
+    print OUTPUT $tmp;
+}
 
 # Handle each block separated by newline
@@ -59 +77 @@
     chomp($date);
     $date =~ s/\(([0-9-]+)\)/$1/;
-    print "**$date**\n";
+    #print "**$date**\n";
     $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
-    print "**$ndate**\n";
+    #print "**$ndate**\n";
     if ($dtype eq "rpm") {
-        printf OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";
-        printf OUTPUT "- Updated to $ver\n";
+        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";
+        print OUTPUT "- Updated to $ver\n";
+        }
 
-        $tmp = <INPUT>; 
-        while ($tmp !~ /^$/) {
-            printf OUTPUT $tmp;
-            $tmp = <INPUT>; 
-        }
-        printf OUTPUT "\n";
+    $tmp = <INPUT>; 
+    while ($tmp !~ /^$/) {
+        print OUTPUT $tmp;
+        last if (eof(INPUT));
+        $tmp = <INPUT>;
     }
+    print OUTPUT "\n";
+    last if (eof(INPUT));
+    last if ($dtype eq "announce");
 }
 close(OUTPUT);

branches/stable/tools/mknewtag

@@ -8 +8 @@
 #
 
-umask 022
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -39 +38 @@
 else
     for p in mindi mondo; do
-        grep -q "${VER}-${TAG}" $TOOLHOME/../$p/Changelog
+        v=`cat $TOOLHOME/../$p/VERSION`
+        grep -q "${v}-${TAG}" $TOOLHOME/../$p/ChangeLog
         if [ $? -ne 0 ]; then
-            echo "You'll have to document in ${p}'s Changelog for ${VER}-${TAG} related modifications"
+            echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
             exit -1
         fi

branches/stable/tools/svn2build

@@ -54 +54 @@
 
         ddd=`LANG=C ; date '+%Y-%m-%d'`
-        cat > /tmp/mondorescue.mc << EOF
+        cat > $TMP/mondorescue.mc << EOF
 define(\`TTT', ${TAG})dnl
 define(\`RRR', ${TAG}${suf})dnl
@@ -72 +72 @@
             fi
             echo "Using $inc customization to build SPEC file"
-            m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
+            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
-            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/$p.spec
+            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
             if [ $? -ne 0 ]; then
                 echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
                 exit -1
             fi
-
-            ddate=`LANG=C ; date "+%a %b %d %Y"`
-            cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
-* $ddate Bruno Cornec <bruno@mondorescue.org> VVV-RRR
-- Updated to VVV-r${REVISION}
-
-EOF
+            cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
+            rm -f $TMP/$p.spec
         elif [ "$dtype" = "ebuild" ]; then
-            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
+            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
         elif [ "$dtype" = "deb" ]; then
             # To be developped
-            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
+            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
         else
             echo "Unknown Build"
@@ -99 +94 @@
         cd $dest
         for f in mondorescue-howto.sgml *8; do
-            m4 /tmp/mondorescue.mc $f > ${f}.new
+            m4 $TMP/mondorescue.mc $f > ${f}.new
             mv ${f}.new $f
         done
@@ -139 +134 @@
 done
 
-rm -f /tmp/mondorescue.mc
+rm -f $TMP/mondorescue.mc
 
 echo "Version delivered :"