Changeset 98 in ProjectBuilder

Timestamp:

Sep 3, 2007, 8:33:06 PM (18 years ago)

Author:

Bruno Cornec

Message:

Last removal of VERSION TAG files

Location:

devel

Files:

• pb/bin/pb (modified) (1 diff)
• pb/lib/ProjectBuilder/Base.pm (modified) (1 diff)
• pbconf/pb.pb (modified) (1 diff)

devel/pb/bin/pb

@@ -123 +123 @@
     pb_cms_init($ENV{'PBPROJ'});
 
-    my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgversion","pkgtag");
+    my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgver","pkgtag");
     foreach my $pbpkg (@pkgs) {
-        if (defined $pkgv->$pbpkg) {
-            $pbver = $pkgv->$pbpkg;
+        if ((defined $pkgv) && (defined $pkgv->{$pbpkg})) {
+            $pbver = $pkgv->{$pbpkg};
         } else {
             $pbver = $ENV{'PBVER'};
         }
-        if (defined $pkgt->$pbpkg) {
-            $pbtag = $pkgt->$pbpkg;
+        if ((defined $pkgt) && (defined $pkgt->{$pbpkg})) {
+            $pbtag = $pkgt->{$pbpkg};
         } else {
             $pbtag = $ENV{'PBTAG'};

devel/pb/lib/ProjectBuilder/Base.pm

@@ -111 +111 @@
 
 #
-# Get global VERSION
-#
-open(VER, "$ENV{'PBCONF'}/VERSION") || die "Unable to open $ENV{'PBCONF'}/VERSION: $?";
-$ver = <VER>;
-chomp($ver);
-#print Dumper(%version);
-die "Invalid version name $ver in $ENV{'PBROOT'}/VERSION" if ($ver !~ /[0-9.]+/) && (not exists $version{$ver});
-$ENV{'PBVER'}=$ver;
-close(VER);
-
-#
-# Get global TAG
-#
-open(TAG, "$ENV{'PBCONF'}/TAG") || die "Unable to open $ENV{'PBCONF'}/TAG: $?";
-$tag = <TAG>;
-chomp($tag);
-die "Invalid tag name $tag in $ENV{'PBROOT'}/TAG" if ($tag !~ /[0-9]+/);
-$ENV{'PBTAG'}=$tag;
-close(TAG);
+# Get global Version/Tag
+#
+my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","projver","projtag");
+
+if (not defined $ENV{'PBVER'}) {
+    if ((defined $pkgv) && (defined $pkgv->{$proj})) {
+        $ENV{'PBVER'}=$pkgv->{$proj};
+    } else {
+        die "No projver found in $ENV{'PBCONF'}/$proj.pb";
+    }
+}
+die "Invalid version name $ENV{'PBVER'} in $ENV{'PBCONF'}/$proj.pb" if (($ENV{'PBVER'} !~ /[0-9.]+/) && (not exists $version{$ENV{'PBVER'}}));
+
+if (not defined $ENV{'PBTAG'}) {
+    if ((defined $pkgt) && (defined $pkgt->{$proj})) {
+        $ENV{'PBTAG'}=$pkgt->{$proj};
+    } else {
+        die "No projtag found in $ENV{'PBCONF'}/$proj.pb";
+    }
+}
+die "Invalid tag name $ENV{'PBTAG'} in $ENV{'PBCONF'}/$proj.pb" if ($ENV{'PBTAG'} !~ /[0-9.]+/);
 
 #

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
+#
+# Global version/tag for the project
+#
+projver pb = devel
+projtag pb = 1
+
+# Adapt to your needs:
+# Optional if you need to overwrite the global values above
+#
+#pkgver project-builder = devel
 #pkgtag project-builder = 1