Changeset 1425 in ProjectBuilder

Timestamp:

Feb 25, 2012, 3:43:20 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds a new -k option to kep some temporary files for debug purposes
• Fix newvm as the awk call was broken

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (2 diffs)
• pb/bin/pb (modified) (10 diffs)

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -140 +140 @@
 my $pbinit=shift || undef;
 my $action=shift;
+my $pbkeep=shift || 0;
 my $ver;
 my $tag;
@@ -251 +252 @@
 
 # Need to do that earlier as it's used potentialy in pb_cms_add
-pb_temp_init();
+pb_temp_init($pbkeep);
 pb_log(2,"PBTMP: $ENV{'PBTMP'}\n");
 

devel/pb/bin/pb

@@ -44 +44 @@
 my $pbforce = 0;            # Force VE/VM rebuild
 my $pbsnap = 0;             # Do not use snapshot mode for VM/VE by default
+my $pbkeep = 0;             # keep temporary directory at the end
 my $option = "";            # Not used
 my @pkgs;                   # list of packages
@@ -149 +150 @@
 
 New version of the project to create based on the current one.
+
+=item B<-k|--keep>
+
+Keep the temporary dir where files have been created in or der to help debug
 
 =item B<--rebuild>
@@ -490 +495 @@
         "iso|i=s" => \$opts{'i'},
         "version|V=s" => \$opts{'V'},
+        "keep|k" => \$opts{'k'},
 ) || pb_syntax(-1,0);
 
@@ -509 +515 @@
 if (defined $opts{'S'}) {
     $pbsnap=1;
+}
+if (defined $opts{'k'}) {
+    $pbkeep=1;
 }
 if (defined $opts{'l'}) {
@@ -556 +565 @@
 # Handles project name if any
 # And get global params
-($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($opts{'p'},$pbinit,$action);
+($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($opts{'p'},$pbinit,$action,$pbkeep);
 
 #
@@ -2119 +2128 @@
         }
     }
-    unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if (($cmt =~ /^(V[ME]|RM)/) || ($cmt =~ /Packages/));
+    unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if ((($cmt =~ /^(V[ME]|RM)/) || ($cmt =~ /Packages/)) && ($pbkeep eq 0));
 
     pb_log(2,"Before halt, vmexist: $vmexist, vmpid: $vmpid\n");
@@ -2759 +2768 @@
 our $pblocale = "";
 pb_log_init($pbdebug, $pbLOG);
-pb_temp_init();
+EOF
+    print SCRIPT << "EOF";
+pb_temp_init($pbkeep);
 
 EOF
@@ -2975 +2986 @@
 EOF
         foreach my $c (@sudocmds) {
-            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   ALL = NOPASSWD: $c\n\";";
+            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   ALL = NOPASSWD: $c\";\n";
         }
     } elsif ($vtype =~ /^rm/) {
@@ -2983 +2994 @@
 EOF
         foreach my $c (@sudocmds) {
-            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   ALL = NOPASSWD: $c\n\";";
+            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   ALL = NOPASSWD: $c\";\n";
         }
     } else {
@@ -3070 +3081 @@
 }
 EOF
-        print SCRIPT << "EOF";
-pb_system("rm -rf ProjectBuilder-* ; rm -rf project-builder-* ; rm -rf `perl -V:installvendorlib  | awk -F"'" '{print  \$2}'`/ProjectBuilder ; $cmdget ; gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
+        print SCRIPT << 'EOF';
+pb_system("rm -rf ProjectBuilder-* ; rm -rf project-builder-* ; rm -rf `perl -V:installvendorlib  | awk -F\"'\" '{print \$2}'`/ProjectBuilder ;
+EOF
+        print SCRIPT " $cmdget ; ";
+        print SCRIPT << 'EOF'
+gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
 EOF
     } elsif ($itype =~ /^pkg/) {