Changeset 2097 in ProjectBuilder

Timestamp:

Jul 10, 2016, 12:25:50 AM (8 years ago)

Author:

Bruno Cornec

Message:

Fix #136

Start of fix by building a correct tar file and rpm names
Use a revision based on the SCM first letter, the SCM id and the date,
using the future stable version to build and a revision of 0

Files:

• devel/pb/bin/pb (modified) (3 diffs)
• pbconf/devel/pb.pb (modified) (1 diff)

devel/pb/bin/pb

@@ -1079 +1079 @@
     foreach my $pbpkg (@pkgs) {
         $ENV{'PBPKG'} = $pbpkg;
+        $pbrev = $ENV{'PBREVISION'};
 
         if ((defined $pkgv) && (defined $pkgv->{$pbpkg})) {
@@ -1085 +1086 @@
             $pbver = $ENV{'PBPROJVER'};
         }
-        # If it's a test version, then tag == 0
+        # If it's a test version, then build a tag to fit distributions need
         if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
-            $pbtag = "0";
+            my $letter = "";
+            if ($scheme =~ /svn/) {
+                $letter = "s";
+            } elsif ($scheme =~ /cvs/) {
+                $letter = "c";
+            } elsif ($scheme =~ /svk/) {
+                $letter = "k";
+            } elsif ($scheme =~ /hg/) {
+                $letter = "h";
+            } elsif ($scheme =~ /git/) {
+                $letter = "g";
+            } else {
+                $letter = "f";
+            }
+            $pbtag = "0.$pbextdir.$letter$pbrev";
             $ENV{'PBPROJTAG'} = $pbtag;
         } elsif ((defined $pkgt) && (defined $pkgt->{$pbpkg})) {
@@ -1095 +1110 @@
         }
 
-        $pbrev = $ENV{'PBREVISION'};
         pb_log(0,"\n");
         pb_log(0,"Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n");

pbconf/devel/pb.pb

@@ -35 +35 @@
 # Global version/tag for the project
 #
-projver pb = devel
+projver pb = 0.14.1
 projtag pb = 1