Changeset 1908 in ProjectBuilder

Timestamp:

Oct 10, 2014, 12:03:41 PM (10 years ago)

Author:

Bruno Cornec

Message:

• prepve phase now working

File:

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

devel/pb/bin/pb

@@ -2046 +2046 @@
             ($pbver,$pbtag) = split(/-/,$vertag);
 
-            if (($cmt eq "Sources") || ($cmt =~ /(V[EM]|RM)build/)) {
+            if (($cmt eq "Sources") || ($cmt =~ /(V[EM]|RM)(build|prep)/)) {
                 $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.tar.gz $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.pbconf.tar.gz";
                 if ($cmd eq "") {
@@ -2503 +2503 @@
         }
         $cptarget = "$tpdir/$homedir/$tdir";
-        if ($cmt eq "VEbuild") {
+        if ($cmt =~ /VE(build|prep)/) {
             $cp2target = "$tpdir/$homedir/$bdir";
         }
@@ -2534 +2534 @@
         $cpcmd = "$scpcmd $keyopt -p -o NoHostAuthenticationForLocalhost=yes -P $nport";
         $cptarget = "$mac:$tdir";
-        if ($cmt =~ /^(V|R)Mbuild/) {
+        if ($cmt =~ /^(V|R)M(build|prep)/) {
             $cp2target = "$mac:$bdir";
         }
@@ -3076 +3076 @@
     $pbstep = 3;
 }
+
+pb_log(1,"Entering in pb_build2v ($action in $vtype) \n");
 
 # We prepare scripts for all V of this vtype to allow sharing that part