Changeset 18 in ProjectBuilder for devel/pb/bin

Timestamp:

Jul 31, 2007, 12:50:36 AM (17 years ago)

Author:

Bruno Cornec

Message:

cms2build roughly working

Location:

devel/pb/bin

Files:

• cms2build.pl (deleted)
• pb.pl (modified) (6 diffs)

devel/pb/bin/pb.pl

@@ -10 +10 @@
 # Syntax: pb [-p project] <action> [<params>...]
 
-use strict;
+use strict 'vars';
 use Switch;
 use Getopt::Std;
@@ -21 +21 @@
 use POSIX qw(strftime);
 
+use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles);
 use lib qw (lib);
-use vars qw (%defpkgdir %extpkgdir %version %param %filteredfiles);
 use common qw (env_init);
-use pb qw (defpkgdir extpkgdir version param filteredfiles pb_init);
+use pb qw (pb_init);
 use distro qw (distro_init);
 use cms;
@@ -70 +70 @@
     } elsif ($ARGV[0] =~ /^all$/) {
         @pkgs = keys %defpkgdir;
-        push(@pkgs, keys %extpkgdir);
+        if (defined %extpkgdir) {
+            my $k = keys %extpkgdir;
+            if (defined $k) {
+                push(@pkgs, keys %extpkgdir);
+            }
+        }
     } else {
         @pkgs = @ARGV;
@@ -231 +236 @@
                 }
             }
-            # Prepare the dest directory for archive
-            if (-x "$ENV{'PBCONF'}/$pkg/pbpkginit") {
-                system("cd $dest ; $ENV{'PBCONF'}/$pkg/pbinit");
-                if ($? == -1) {
-                    print "failed to execute: $!\n";
-                } elsif ($? & 127) {
-                    printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
-                } else {
-                    print " $dest\n";
-                }
-            }
-            # Archive dest dir
-            chdir "$dest/..";
-            print "Creating $pkg tar files (gzip... ";
-            system("tar cfphz $pkg-$pbver.tar.gz $pkg-$pbver");
+        }
+        close(D);
+        # Prepare the dest directory for archive
+        if (-x "$ENV{'PBCONF'}/$pkg/pbpkginit") {
+            system("cd $dest ; $ENV{'PBCONF'}/$pkg/pbinit");
             if ($? == -1) {
                 print "failed to execute: $!\n";
@@ -251 +246 @@
                 printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
             } else {
-                print " OK)\n";
-                print "Under $dest/../$pkg-$pbver.tar.gz\n";
-            }
-        }
-        close(D);
+                print " $dest\n";
+            }
+        }
+        # Archive dest dir
+        chdir "$dest/..";
+        print "Creating $pkg tar files (gzip... ";
+        system("tar cfphz $pkg-$pbver.tar.gz $pkg-$pbver");
+        if ($? == -1) {
+            print "failed to execute: $!\n";
+        } elsif ($? & 127) {
+            printf "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
+        } else {
+            print " OK)\n";
+            print "Under $dest/../$pkg-$pbver.tar.gz\n";
+        }
     }
 } else {
@@ -290 +295 @@
         # special case for ChangeLog
         } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/)) {
-            $tmp = changelog($dtype, $pkg, $pbtag, $dsuf, \*DEST);
+            my $p = $defpkgdir{$pkg};
+            $p = $extpkgdir{$pkg} if (not defined $p);
+            $tmp = changelog($dtype, $pkg, $pbtag, $dsuf, $p, \*DEST);
         }
         $line =~ s|$s|$tmp|;