Changeset 1268 in ProjectBuilder

Timestamp:

Mar 12, 2011, 6:46:29 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #94 RM parallel building doesn't comply with user defined settings
• 0.11.2 is not under the test dir !!!

Files:

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

0.11.2/pb/bin/pb

@@ -3719 +3719 @@
 # Maybe a port was given as parameter so overwrite
 $nport = "$pbport" if (defined $pbport);
-# Maybe in // mode so use the env var set up as an offset to the base port, except when called from send2target for Packages
-if ($cmt ne "Packages") {
+# Maybe in // mode so use the env var set up as an offset to the base port, except when called from send2target for Packages or for RM
+if (($cmt ne "Packages") || ($cmt =~ /^RM/i)) {
     $nport += $ENV{'PBVMPORT'} if ((defined $pbparallel) && (defined $ENV{'PBVMPORT'}));
 }

devel/pb/bin/pb

@@ -3719 +3719 @@
 # Maybe a port was given as parameter so overwrite
 $nport = "$pbport" if (defined $pbport);
-# Maybe in // mode so use the env var set up as an offset to the base port, except when called from send2target for Packages
-if ($cmt ne "Packages") {
+# Maybe in // mode so use the env var set up as an offset to the base port, except when called from send2target for Packages or for RM
+if (($cmt ne "Packages") || ($cmt =~ /^RM/i)) {
     $nport += $ENV{'PBVMPORT'} if ((defined $pbparallel) && (defined $ENV{'PBVMPORT'}));
 }

pbconf/0.11.2/pb.pb

@@ -46 +46 @@
 # Is it a test version
 #testver pb = true
-delivery pb = test
+delivery pb = .
 
 # Hash of default package name/package directory