Changeset 66 in ProjectBuilder

Timestamp:

Aug 31, 2007, 1:19:46 PM (17 years ago)

Author:

Bruno Cornec

Message:

Add the -r option to support multiple version in parallel

Location:

0.5/pb

Files:

• bin/pb (modified) (5 diffs)
• lib/ProjectBuilder/common.pm (modified) (1 diff)

0.5/pb/bin/pb

@@ -41 +41 @@
 my $pbdate = strftime("%Y-%m-%d", @date);
 
-getopts('hl:p:qtv',\%opts);
+getopts('hl:p:qr:tv',\%opts);
 
 version_init();
@@ -70 +70 @@
 die syntax() if (not defined $action);
 
+# Handle root of the project if defined
+if (defined $opts{'r'}) {
+    $ENV{'PBROOT'} = $opts{'r'};
+}
 # Handles project name if any
 if (defined $opts{'p'}) {
@@ -253 +257 @@
         print $LOG "Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n" if ($debug >= 0);
         # Keep track of what is generated for build2pkg default
-        open(LAST,"> $ENV{'PBDESTDIR'}/LAST") || die "Unable to create $ENV{'PBDESTDIR'}/LAST";
+        open(LAST,"> $ENV{'PBTOPDIR'}/LAST") || die "Unable to create $ENV{'PBTOPDIR'}/LAST";
         print LAST "$pbver-$pbtag\n";
         close(LAST);
@@ -261 +265 @@
     my $vertag = shift @ARGV;
     if (not defined $vertag) {
-        open(LAST,"$ENV{'PBDESTDIR'}/LAST") || die "Unable to open $ENV{'PBDESTDIR'}/LAST\nYou may want to precise as parameter version-tag";
+        open(LAST,"$ENV{'PBTOPDIR'}/LAST") || die "Unable to open $ENV{'PBTOPDIR'}/LAST\nYou may want to precise as parameter version-tag";
         $vertag = <LAST>;
         chomp($vertag);
@@ -279 +283 @@
     foreach my $pbpkg (@pkgs) {
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-        print $LOG "Handling source file $src\n" if ($debug >= 0);
+        print $LOG "Source file: $src\n" if ($debug >= 0);
 
         if ($dtype eq "rpm") {

0.5/pb/lib/ProjectBuilder/common.pm

@@ -33 +33 @@
 }
 #
-# Use project configuration file
+# Use project configuration file if needed
 #
-pb_init("$ENV{'PBETC'}");
+if (not defined $ENV{'PBROOT'}) {
+    pb_init("$ENV{'PBETC'}");
 
-if (not defined $proj) {
-    # Take the first as the default project
-    $proj = (keys %pbroot)[0];
+    if (not defined $proj) {
+        # Take the first as the default project
+        $proj = (keys %pbroot)[0];
     print $LOG "Using $proj as default project as none has been specified\n" if (($debug >= 0) and (defined $proj));
+    }
+    die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
+
+    $ENV{'PBROOT'} = $pbroot{$proj}; 
+} else {
+    die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
 }
-die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
-
-$ENV{'PBROOT'} = $pbroot{$proj}; 
 
 #