Changeset 83 in ProjectBuilder

Timestamp:

Sep 3, 2007, 1:22:49 PM (17 years ago)

Author:

Bruno Cornec

Message:

Additional version allow now for optimal reuse of parameters

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -87 +87 @@
 print $LOG "Action: $action\n" if ($debug >= 0);
 
+# Keeps those project value to store at end each time
+my $pbprojtag = $ENV{'PBTAG'};
+my $pbprojver = $ENV{'PBVER'};
+
 # Act depending on action
 if ($action =~ /^cms2build$/) {
@@ -241 +245 @@
         pb_system("tar cfpz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
         print $LOG "Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n" if ($debug >= 0);
+
         # Keep track of what is generated for default
-        $pbver{$pbpkg} = $pbver;
-        $pbtag{$pbpkg} = $pbtag;
+        open(LAST,"> $pbrc{$ENV{'PBPROJ'}}") || die "Unable to create $pbrc{$ENV{'PBPROJ'}}";
+        print LAST "pbroot $pbprojver-$pbprojtag = $ENV{'PBROOT'}\n";
+        close(LAST);
+
+        # Keep track of per package version
+        if (! -f "$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb") {
+            open(PKG,">$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb") || die "Unable to create $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb";
+            print PKG "# Empty\n";
+            close(PKG);
+        }
+        my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+        $pkg = { } if (not defined $pkg);
+        my %pkg = %$pkg;
+        if ((not defined $pkg{$pbpkg}) || ($pkg{$pbpkg} ne "$pbver-$pbtag")) {
+            $pkg{$pbpkg} = "$pbver-$pbtag";
+        }
+
+        print $LOG "DEBUG pkg: ".Dumper(\%pkg)."\n" if ($debug >= 1);
+        open(PKG,"> $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb") || die "Unable to create $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb";
+        foreach my $p (keys %pkg) {
+            print PKG "pbpkg $p = $pkg{$p}\n";
+        }
+        close(PKG);
     }
-    open(LAST,"> $pbrc{$ENV{'PBPROJ'}}") || die "Unable to create $pbrc{$ENV{'PBPROJ'}}";
-    foreach my $v (keys %pbver) {
-        print LAST "pbroot $v-_-$pbver{$v}-$pbtag{$v} = $ENV{'PBROOT'}\n";
-    }
-    close(LAST);
 }
 
@@ -258 +279 @@
     @pkgs = @$ptr;
 
-    # Check whether we have a specific version to build
-    my $vertag = shift @ARGV;
-
     # 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);
 
+    # Get content saved in cms2build
+    my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+    $pkg = { } if (not defined $pkg);
+    my %pkg = %$pkg;
+
     chdir "$ENV{'PBBUILDDIR'}";
     foreach my $pbpkg (@pkgs) {
+        my $vertag = $pkg{$pbpkg};
         # get the version of the current package - maybe different
-        if (not defined $vertag) {
-            if (-f $pbrc{$ENV{'PBPROJ'}}) {
-                my $pbroot = pb_conf_read($pbrc{$ENV{'PBPROJ'}},"pbroot");
-                # All lines should point to the same pbroot so take the first
-                $ENV{'PBROOT'} = (values %$pbroot)[0];
-                foreach my $k (keys %$pbroot) {
-                        if ($k =~ /^$pbpkg-_-/) {
-                            ($ptr,$vertag) = split(/-_-/,$k);
-                            last;
-                        }
-                }
-                die "Unable to find $pbpkg in $pbrc{$ENV{'PBPROJ'}}\nYou may want to precise as parameter version-tag" if (not defined $vertag);
-            } else {
-                die "Unable to open $pbrc{$ENV{'PBPROJ'}}\nYou may want to precise as parameter version-tag";
-            }
-        }
         ($pbver,$pbtag) = split(/-/,$vertag);