Changeset 781 in MondoRescue for branches/stable/tools

Timestamp:

Aug 12, 2006, 11:31:16 AM (19 years ago)

Author:

Bruno Cornec

Message:

• Gentoo build now correct
• 4 articles kept on frontpage
• New announces made
• Build process optimized agin and again :-)

Location:

branches/stable/tools

Files:

• build2pkg (modified) (2 diffs)
• mkchangelog.pl (modified) (3 diffs)
• mknewshtml.pl (modified) (1 diff)
• svn2build (modified) (2 diffs)

branches/stable/tools/build2pkg

@@ -63 +63 @@
             ar=$ARCH
         fi
-        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
+        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
         #rm -f $pkg1
 
@@ -72 +72 @@
         if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
             echo "Using bzip2 files ($dfam)"
-            ln -sf $pv.tar.bz2 SOURCES/
+            ln -sf ${TOPDIR}/${VER}-$TAG/$pv.tar.bz2 SOURCES/
         else
             echo "Using gzip files ($dfam)"

branches/stable/tools/mkchangelog.pl

@@ -58 +58 @@
     }
 }
-print "Using $chglog as input ChangeLog file for $pkg\n";
+#print "Using $chglog as input ChangeLog file for $pkg\n";
 
 open(INPUT,"$chglog") || die "Unable to open $chglog (read)";
 open(OUTPUT,"> $outfile") || die "Unable to open $outfile (write)";
-open(TAG, "$ENV{TOPDIR}/LAST") || die "Unable to open $ENV{TOPDIR}/LAST";
 
-$tmp = <TAG>;
-chomp($tmp);
-my ($tmp2, $tag) = split(/-/, $tmp);
 # Skip first 4 lines
 $tmp = <INPUT>;
@@ -78 +74 @@
     print OUTPUT $tmp;
 }
+
+my $first=1;
 
 # Handle each block separated by newline
@@ -91 +89 @@
     if ($dtype eq "rpm") {
         if ($ver !~ /-/) {
-            $ver2 = "$ver-$tag";
+            if ($first eq 1) {
+                $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
+                $first=0;
+            } else {
+                $ver2 = "$ver-1"."$ENV{suf}";
+            }
         } else {
-            $ver2 = $ver;
+            $ver2 = "$ver"."$ENV{suf}";
         }
         print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";

branches/stable/tools/mknewshtml.pl

@@ -115 +115 @@
 close(NEWS);
 
-my $cpt = 3;
+my $cpt = 4;
 open(NEWS,"> $lastnews") || die "Unable to open $lastnews (write)";
 $all = $dbh->selectall_arrayref("SELECT id,date,announce FROM announces ORDER BY date DESC");

branches/stable/tools/svn2build

@@ -37 +37 @@
 for p in $c; do
     v=`cat ${SVNBRANCH}/$p/VERSION`
-    echo "Management of $p $v-$REVISION"
+    echo "Management of $p $v-$TAG (rev $REVISION)"
     dest="$p-$v"
     rm -fr $dest
@@ -136 +136 @@
 
     # Finally creates the tar files
-    echo "Creating $p tar files"
+    echo -n "Creating $p tar files (gzip... "
     tar cfphz ${DEST}/$p-$v.tar.gz $dest
-    tar cfphj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
+    echo -n " bzip2..."
+    tar cfphj ${DEST}/$p-$v.tar.bz2 $dest
+    echo " )"
 done