Changeset 782 in MondoRescue for trunk/tools

Timestamp:

Aug 12, 2006, 11:32:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r763:781 $SVN_M/branches/stable

Location:

trunk/tools

Files:

• build2pkg (modified) (4 diffs)
• mkchangelog.pl (modified) (4 diffs)
• mknewshtml.pl (modified) (1 diff)
• mknewtag (modified) (1 diff)
• pkg2ftp (modified) (1 diff)
• pkg2mdv (modified) (1 diff)
• svn-env (modified) (1 diff)
• svn2build (modified) (2 diffs)

trunk/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)"
@@ -96 +96 @@
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
-        log=$TMP/$p-gentoo.log
         tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
@@ -108 +107 @@
 
         cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
+        ebuild $p-${PVER}.ebuild digest
         if [ $? != 0 ]; then 
-            cat $log
             status=-1
         fi
-        ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
+        ebuild $p-${PVER}.ebuild package
         if [ $? != 0 ]; then 
-            cat $log
             status=-1
         fi
     elif [  _"$dtype" = _"deb" ]; then
-        log=$TMP/$p-deb.log
         export TMPDIR=/tmp
         cd $TOPBUILDDIR

trunk/tools/mkchangelog.pl

@@ -23 +23 @@
 my $tmp = "";
 my $ver = "";
+my $ver2 = "";
 my $date = "";
 
@@ -57 +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)";
+
 # Skip first 4 lines
 $tmp = <INPUT>;
@@ -73 +75 @@
 }
 
+my $first=1;
+
 # Handle each block separated by newline
 while (<INPUT>) {
     ($ver, $date) = split(/ /);
+    $ver =~ s/^v//;
     chomp($date);
     $date =~ s/\(([0-9-]+)\)/$1/;
@@ -83 +88 @@
     #print "**$ndate**\n";
     if ($dtype eq "rpm") {
-        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> VVV-RRR\n";
+        if ($ver !~ /-/) {
+            if ($first eq 1) {
+                $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
+                $first=0;
+            } else {
+                $ver2 = "$ver-1"."$ENV{suf}";
+            }
+        } else {
+            $ver2 = "$ver"."$ENV{suf}";
+        }
+        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";
         print OUTPUT "- Updated to $ver\n";
         }

trunk/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");

trunk/tools/mknewtag

@@ -35 +35 @@
 if [ $nb -gt 0 ]; then
     echo "You'll have to check in before updating the TAG"
-    echo "$TAG" > $TOOLHOME/TAG
+    exit -1
 else
     for p in mindi mondo; do
         v=`cat $TOOLHOME/../$p/VERSION`
-        grep -q "${v}-${TAG}" $TOOLHOME/../$p/ChangeLog
+        grep -q "${v}" $TOOLHOME/../$p/ChangeLog
         if [ $? -ne 0 ]; then
-            echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
+            echo "You'll have to document in ${p}'s ChangeLog for ${v} related modifications"
             exit -1
         fi

trunk/tools/pkg2ftp

@@ -63 +63 @@
         pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
         spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
+    elif [  _"$dtype" = "_ebuild" ]; then
+        spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
+        pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
     fi
 done

trunk/tools/pkg2mdv

@@ -51 +51 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
-    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
-    ppkg="$ppkg $pv${suf}.src.rpm"
+    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
+    ppkg="$ppkg $pv-${TAG}${suf}.src.rpm"
 done
 

trunk/tools/svn-env

@@ -6 +6 @@
 #
 
-export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
+export SVNBRANCH="`cat ${TOOLHOME}/../mondo/VERSION`"
 export VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
 

trunk/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