Changeset 99 in ProjectBuilder

Timestamp:

Sep 4, 2007, 1:19:23 AM (18 years ago)

Author:

Bruno Cornec

Message:

topdir also fixed for delivery

Location:

devel

Files:

• pb/bin/pb (modified) (6 diffs)
• pb/lib/ProjectBuilder/Base.pm (modified) (3 diffs)
• pbconf/pb.pb (modified) (1 diff)
• pbconf/project-builder/pbfilter/rpm.pbf (modified) (1 diff)
• pbconf/project-builder/rpm/pb.spec (modified) (1 diff)

devel/pb/bin/pb

@@ -167 +167 @@
             my ($name,$ver) = split(/_/,$d);
             chomp($ver);
-            my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init($name,$ver);
-            print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $dsuf)."\n" if ($debug >= 1);
+            my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver);
+            print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf)."\n" if ($debug >= 1);
             print $LOG "DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n" if ($debug >= 1);
 
@@ -223 +223 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
+                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
                 }
                 if (defined $filteredfiles{$pbpkg}) {
                     foreach my $f (split(/,/,$filteredfiles{$pbpkg})) {
-                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
+                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
                     }
                 }
@@ -286 +286 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
-    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
+    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
+    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n" if ($debug >= 1);
 
     # Get content saved in cms2build
@@ -353 +353 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
-    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
+    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
+    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n" if ($debug >= 1);
 
     # Get content saved in cms2build
@@ -371 +371 @@
         } elsif ($cmt eq "Packages") {
             if ($dtype eq "rpm") {
-                # rpm has its own standard build directory
-                my $tmp=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
-                chomp($tmp);
-                $ENV{'PBBUILDDIR'}=$tmp;
-                $src="$ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$dsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg-$pbver-$pbtag$dsuf.src.rpm"
+                $src="$ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm"
             } elsif ($dtype eq "deb") {
                 my $tmp = "$ENV{'PBBUILDDIR'}/$pbpkg";
@@ -401 +397 @@
     }
     $src = join(' ',@src);
-    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src 2> /dev/null\"","Preparing $dir on $mac");
+    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src 2>&1 > /dev/null\"","Preparing $dir on $mac");
     pb_system("scp -p $src $mac:$dir","$cmt delivery in $dir on $mac");
 }

devel/pb/lib/ProjectBuilder/Base.pm

@@ -334 +334 @@
 my $destfile=shift;
 my $dtype=shift;
-my $dsuf=shift;
+my $pbsuf=shift;
 my $pbpkg=shift;
 my $pbver=shift;
@@ -361 +361 @@
             my $p = $defpkgdir{$pbpkg};
             $p = $extpkgdir{$pbpkg} if (not defined $p);
-            pb_changelog($dtype, $pbpkg, $pbtag, $dsuf, $p, \*DEST);
+            pb_changelog($dtype, $pbpkg, $pbtag, $pbsuf, $p, \*DEST);
         }
         $line =~ s|$s|$tmp|;
@@ -378 +378 @@
 my %filter=%$ptr;
 my $destfile=shift;
+my $pbsuf=shift;
 my $pbpkg=shift;
 my $pbver=shift;

devel/pbconf/pb.pb

@@ -18 +18 @@
 #pkgver project-builder = devel
 #pkgtag project-builder = 1
+pkgver nil
+pkgtag nil
 
 # Hash of default package/package directory

devel/pbconf/project-builder/pbfilter/rpm.pbf

@@ -30 +30 @@
 # PBPKG is replaced by the package name ($pbpkg in code)
 filter PBPKG = $pbpkg
+
+# PBSUF is replaced by the package name ($pbpkg in code)
+filter PBSUF = $pbsuf

devel/pbconf/project-builder/rpm/pb.spec

@@ -8 +8 @@
 Name:       PBPKG
 Version:    PBVER
-Release:    PBTAG
+Release:    PBTAGPBSUF
 License:    GPL
 Group:      PBGRP