Changeset 5 in ProjectBuilder for devel/pb/bin

Timestamp:

Jul 29, 2007, 12:50:34 AM (18 years ago)

Author:

Bruno Cornec

Message:

Lots of modifs to find the right way. Probably still not good

Location:

devel/pb/bin

Files:

• cms2build.pl (modified) (9 diffs)
• mdv-changelog.pl (modified) (2 diffs)
• mkannounce.pl (modified) (1 diff)
• mkchangelog.pl (modified) (2 diffs)
• mknewshtml.pl (modified) (1 diff)
• pb.pl (added)

devel/pb/bin/cms2build.pl

@@ -8 +8 @@
 use strict;
 use common.pm;
-use proj.pm;
+use pb.pm;
 use cms.pm;
 
-set_env();
-
-VER=`cat ${TOOLHOME}/VERSION`
-TAG=`cat ${TOOLHOME}/TAG`
-my $DEST=$ENV{'TOPDIR'}."/".$VER."-".$TAG
 TEST="false"
 OPT=""
@@ -37 +32 @@
 
 # Make it safe for CMS commands
-cd ${TOOLHOME}/..
+cd ${PBROOT}/..
 
 for pkg in $c; do
     p=$PKGDIR[
-    v=`cat ${TOOLHOME}/../$p/VERSION`
-    tag=`cat ${TOOLHOME}/../$p/TAG`
+    v=`cat ${PBROOT}/../$p/VERSION`
+    tag=`cat ${PBROOT}/../$p/TAG`
     echo "Management of $p $v-$tag (rev $REVISION)"
     dest="$DEST/$p-$v"
     rm -fr $dest
-    $CMSEXP $OPT ${TOOLHOME}/../$p $dest
+    $CMSEXP $OPT ${PBROOT}/../$p $dest
     echo "$REVISION" > $dest/REVISION
     echo "Generating SVN log file ..."
-    $SVNLOG $OPT -v ${TOOLHOME}/../$p > $dest/history.log
+    $SVNLOG $OPT -v ${PBROOT}/../$p > $dest/history.log
 
-    for d in `cat ${TOOLHOME}/DISTROS`; do
+    for d in `cat ${PBROOT}/DISTROS`; do
         export ddir=`echo $d | cut -d_ -f1`
         export dver=`echo $d | cut -d_ -f2`
         echo "Generating build files for $ddir ($dver)"
-        . $TOOLHOME/distro-env
+        . $PBROOT/distro-env
 
         ddd=`LANG=C ; date '+%Y-%m-%d'`
-        cat > $PROJTMP/mondorescue.mc << EOF
+        cat > $PBTMP/mondorescue.mc << EOF
 define(\`TTT', ${tag})dnl
 define(\`RRR', ${tag}${suf})dnl
@@ -77 +72 @@
 
             if [ $ddir = "fedora" ]; then
-                $TOOLHOME/mkchangelog.pl fc $p $PROJTMP/$p-fc.spec
-                m4 $PROJTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p-fc.spec > $dest/distributions/${ddir}-$dver/$p-fc.spec
+                $PBROOT/mkchangelog.pl fc $p $PBTMP/$p-fc.spec
+                m4 $PBTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p-fc.spec > $dest/distributions/${ddir}-$dver/$p-fc.spec
             fi
-            $TOOLHOME/mkchangelog.pl $dtype $p $PROJTMP/$p.spec
+            $PBROOT/mkchangelog.pl $dtype $p $PBTMP/$p.spec
             if [ $? -ne 0 ]; then
                 echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
                 exit -1
             fi
-            m4 $PROJTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
+            m4 $PBTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
             if [ _"`/bin/arch`" = _"x86_64" ] && [ $ddir = "rhel" ]; then
                 # Bug on x86_64 on _sysconfdir on rhel4 at least
@@ -91 +86 @@
             fi
 
-            rm -f $PROJTMP/$p.spec
+            rm -f $PBTMP/$p.spec
         elif [ "$dtype" = "ebuild" ]; then
-            m4 $PROJTMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
+            m4 $PBTMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
         elif [ "$dtype" = "tgz" ]; then
-            m4 $PROJTMP/mondorescue.mc $dest/distributions/$dfam/slack-desc > $dest/distributions/${ddir}-$dver/slack-desc
+            m4 $PBTMP/mondorescue.mc $dest/distributions/$dfam/slack-desc > $dest/distributions/${ddir}-$dver/slack-desc
         elif [ "$dtype" = "port" ]; then
-            m4 $PROJTMP/mondorescue.mc $dest/distributions/$dfam/Makefile > $dest/distributions/${ddir}-$dver/Makefile
+            m4 $PBTMP/mondorescue.mc $dest/distributions/$dfam/Makefile > $dest/distributions/${ddir}-$dver/Makefile
         elif [ "$dtype" = "deb" ]; then
             if [ -f $dest/distributions/$ddir/rules ]; then
@@ -109 +104 @@
                 exit -1
             fi
-            m4 $PROJTMP/mondorescue.mc $inc > $dest/distributions/${ddir}-$dver/rules
-            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
+            m4 $PBTMP/mondorescue.mc $inc > $dest/distributions/${ddir}-$dver/rules
+            $PBROOT/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
             if [ $? -ne 0 ]; then
                 echo "Unable to create changelog for ${ddir}-$dver/changelog"
@@ -125 +120 @@
         cd $dest
         for f in mondorescue-howto.sgml *8; do
-            m4 $PROJTMP/mondorescue.mc $f > ${f}.new
+            m4 $PBTMP/mondorescue.mc $f > ${f}.new
             mv ${f}.new $f
         done
@@ -146 +141 @@
 
     if [ _"`echo $p | grep -vE 'kernel|busybox' | grep mindi`" != _"" ]; then
-        v1=`cat ${TOOLHOME}/../mondo-doc/VERSION`
+        v1=`cat ${PBROOT}/../mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
@@ -155 +150 @@
     fi
     if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
-        v1=`cat ${TOOLHOME}/../mondo-doc/VERSION`
+        v1=`cat ${PBROOT}/../mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
@@ -177 +172 @@
 done
 
-rm -rf $PROJTMP
+rm -rf $PBTMP
 
 echo "Version delivered :"

devel/pb/bin/mdv-changelog.pl

@@ -8 +8 @@
 
 open(FILE, $ARGV[0]) || die "Unable to open $ARGV[0]";
-open(OUT, "> $ENV{'PROJTMP'}/out.spec") || die "Unable to create $ENV{'MONDOTMP'}/out.spec";
-open(CMT, "> $ENV{'PROJTMP'}/cmt.spec") || die "Unable to create $ENV{'MONDOTMP'}/out.spec";
+open(OUT, "> $ENV{'PBTMP'}/out.spec") || die "Unable to create $ENV{'MONDOTMP'}/out.spec";
+open(CMT, "> $ENV{'PBTMP'}/cmt.spec") || die "Unable to create $ENV{'MONDOTMP'}/out.spec";
 while (<FILE>) {
     if ($_ !~ /^\%changelog/) {
@@ -29 +29 @@
                 close (FILE);
 
-                move("$ENV{'PROJTMP'}/out.spec", $ARGV[0]);
+                move("$ENV{'PBTMP'}/out.spec", $ARGV[0]);
                 exit(0);
             }

devel/pb/bin/mkannounce.pl

@@ -18 +18 @@
 $ENV{LANG}="C";
 
-my $TOOLHOME;
+my $PBROOT;
 my $tmp = dirname($PROGRAM_NAME);
 print "$tmp\n";
 if ($tmp =~ /^\//) {
-    $TOOLHOME = $tmp;
+    $PBROOT = $tmp;
     }
 else {
-    $TOOLHOME = "$ENV{PWD}/$tmp";
+    $PBROOT = "$ENV{PWD}/$tmp";
     }
 
-my $db="$TOOLHOME/../website/announces3.sql";
+my $db="$PBROOT/../website/announces3.sql";
 
 my $dbh = DBI->connect("dbi:SQLite:dbname=$db","","",

devel/pb/bin/mkchangelog.pl

@@ -35 +35 @@
         (not (defined $outfile)) || ($outfile eq ""));
 
-my $TOOLHOME;
+my $PBROOT;
 $tmp = dirname($PROGRAM_NAME);
 if ($tmp =~ /^\//) {
-    $TOOLHOME = $tmp;
+    $PBROOT = $tmp;
     }
 else {
-    $TOOLHOME = "$ENV{PWD}/$tmp";
+    $PBROOT = "$ENV{PWD}/$tmp";
     }
 
-die "TOOLHOME doesn't exist" if (not (defined $TOOLHOME));
+die "PBROOT doesn't exist" if (not (defined $PBROOT));
 
-if (-f "$TOOLHOME/../$pkg/ChangeLog") {
-    $chglog = "$TOOLHOME/../$pkg/ChangeLog";
+if (-f "$PBROOT/../$pkg/ChangeLog") {
+    $chglog = "$PBROOT/../$pkg/ChangeLog";
     }
 else {
     $pkg2 = $pkg;
     $pkg2 =~ s/-..*//;
-    if (-f "$TOOLHOME/../$pkg2/ChangeLog") {
-        $chglog = "$TOOLHOME/../$pkg2/ChangeLog";
+    if (-f "$PBROOT/../$pkg2/ChangeLog") {
+        $chglog = "$PBROOT/../$pkg2/ChangeLog";
         }
     else {
@@ -59 +59 @@
     }
 }
-$tmp="$TOOLHOME/../$pkg/TAG";
+$tmp="$PBROOT/../$pkg/TAG";
 if (-f "$tmp") {
     open(TAG,"$tmp") || die "Unable to open $tmp";

devel/pb/bin/mknewshtml.pl

@@ -18 +18 @@
 $ENV{LANG}="C";
 
-my $TOOLHOME;
+my $PBROOT;
 my $tmp = dirname($PROGRAM_NAME);
 if ($tmp =~ /^\//) {
-    $TOOLHOME = $tmp;
+    $PBROOT = $tmp;
     }
 else {
-    $TOOLHOME = "$ENV{PWD}/$tmp";
+    $PBROOT = "$ENV{PWD}/$tmp";
     }
 
 my $lastnews="$ARGV[0]/latest-news.html";
 my $news="$ARGV[0]/news.shtml";
-my $db="$TOOLHOME/../website/announces3.sql";
+my $db="$PBROOT/../website/announces3.sql";
 
 print "Using Database $db\n";