Changeset 1712 in ProjectBuilder

Timestamp:

Mar 9, 2013, 10:22:28 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Adds target build2setup*
• Improve date setup when ntp is failing (don't know yet why for some VMs)
• pb now prints the name of the VM as a prefix for each command result, improving greatly debug in parallel mode

File:

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

devel/pb/bin/pb

@@ -320 +320 @@
 
 Setup a remote machine for pb usage using the sandbox version of pb instead of the latest stable
+Reserved to dev team.
+
+=item B<build2setupvm>
+
+Setup a virtual machine for pb usage using the build available
+Reserved to dev team.
+
+=item B<build2setupve>
+
+Setup a virtual environment for pb usage using the build available
+Reserved to dev team.
+
+=item B<build2setuprm>
+
+Setup a remote machine for pb usage using the build available
 Reserved to dev team.
 
@@ -896 +911 @@
     die "This feature is limited to the pb project" if ($ENV{'PBPROJ'} ne $appname);
     pb_cms2build("SandBox");
+    pb_setup2v("vm","SandBox");
+} elsif ($action =~ /^build2setuprm$/) {
+    die "This feature is limited to the pb project" if ($ENV{'PBPROJ'} ne $appname);
+    pb_setup2v("rm","SandBox");
+} elsif ($action =~ /^build2setupve$/) {
+    die "This feature is limited to the pb project" if ($ENV{'PBPROJ'} ne $appname);
+    pb_setup2v("ve","SandBox");
+} elsif ($action =~ /^build2setupvm$/) {
+    die "This feature is limited to the pb project" if ($ENV{'PBPROJ'} ne $appname);
     pb_setup2v("vm","SandBox");
 } elsif ($action =~ /^updaterm$/) {
@@ -2403 +2427 @@
         $shcmd .= " \"echo \'cd $tdir ; if [ -x $pbscript ]; then ./$pbscript; fi ; rm -f ./$pbscript\' | bash\"";
     }
-    my $cmdverb = "verbose";
+    my $cmdverb = "verbose_\[$v\] ";
     if (($cmt eq "Announce") || ($cmt eq "CPAN")) {
         $cmdverb = undef;
@@ -2720 +2744 @@
 my $vtype = shift;
 my $pbos = shift;
+my $nontp = shift || 0;
 
 # VE gets time from parent OS.
@@ -2739 +2764 @@
 my $upddate = strftime("%m%d%H%M%Y", @date);
 my $dateline = "sudo /bin/date $upddate";
-if (defined $ntpline) {
+if ((defined $ntpline) && ($nontp == 0)) {
     return($ntpline);
 } else {
@@ -2800 +2825 @@
 
     print SCRIPT "echo ... Execution needed\n";
+    print SCRIPT "echo '==== Start of script $$ for $vtype $v =====\n";
     print SCRIPT "# This is in directory delivery\n";
     print SCRIPT "# Setup the variables required for building\n";
@@ -2823 +2849 @@
     print SCRIPT "echo setting up date with $ntpline\n";
     print SCRIPT "$ntpline\n";
+    print SCRIPT 'if [ $? -ne 0 ]; then\n';
+    # Force if bad status a trick using date
+    $ntpline = pb_date2v($vtype,$pbos, 1);
+    print SCRIPT "  $ntpline\n";
+    print SCRIPT "fi\n";
     # Use potential local proxy declaration in case we need it to download repo, pkgs, ...
     if (defined $ENV{'http_proxy'}) {
@@ -2874 +2905 @@
     }
 
-    print SCRIPT q{echo "********** Successful exit of script $$ for $v *********************"}, "\n";
+    print SCRIPT "echo '==== End of script $$ for $vtype $v =====\n";
     close(SCRIPT);
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript.$$";