Changeset 95 in ProjectBuilder

Timestamp:

Sep 3, 2007, 7:21:53 PM (18 years ago)

Author:

Bruno Cornec

Message:

No more reading files under pkgdir but in project.pb for potential dedicated VERSION and TAG

Location:

devel

Files:

• pb/bin/pb (modified) (2 diffs)
• pbconf/pb.pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -36 +36 @@
 my $option = "";
 my @pkgs;
-my $pbtag;                  # Global TAG variable
-my $pbver;                  # Global VERSION variable
+my $pbtag;                  # Global Tag variable
+my $pbver;                  # Global Version variable
 my %pbver;                  # per package
 my %pbtag;                  # per package
@@ -123 +123 @@
     pb_cms_init($ENV{'PBPROJ'});
 
+    my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgversion","pkgtag");
     foreach my $pbpkg (@pkgs) {
-        if (-f "$ENV{'PBROOT'}/$pbpkg/VERSION") {
-            open(V,"$ENV{'PBROOT'}/$pbpkg/VERSION") || die "Unable to open $ENV{'PBROOT'}/$pbpkg/VERSION";
-            $pbver = <V>;
-            chomp($pbver);
-            close(V);
+        if (defined $pkgv->$pbpkg) {
+            $pbver = $pkgv->$pbpkg;
         } else {
             $pbver = $ENV{'PBVER'};
         }
-
-        if (-f "$ENV{'PBROOT'}/$pbpkg/TAG") {
-            open(T,"$ENV{'PBROOT'}/$pbpkg/TAG") || die "Unable to open $ENV{'PBROOT'}/$pbpkg/TAG";
-            $pbtag = <T>;
-            chomp($pbtag);
-            close(T);
+        if (defined $pkgt->$pbpkg) {
+            $pbtag = $pkgt->$pbpkg;
         } else {
             $pbtag = $ENV{'PBTAG'};
         }
+
         $pbrev = $ENV{'PBREVISION'};
         print $LOG "\n" if ($debug >= 0);

devel/pbconf/pb.pb

@@ -5 +5 @@
 # $Id$
 #
+
+# Adapdt to your needs:
+# Optional if you need to overwrite the global values 
+# from .pbrc
+#pkgversion project-builder = devel
+#pkgtag project-builder = 1
 
 # Hash of default package/package directory
@@ -16 +22 @@
 version stable
 
-pkgversion project-builder = devel
-
 # List of files per pkg on which to apply filters
 # Files are mentioned relatively to pbroot/defpkgdir