Changeset 108 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm
- Timestamp:
- Sep 6, 2007, 2:18:18 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/lib/ProjectBuilder/Base.pm
r107 r108 44 44 print "DEBUG pbrc: ".Dumper($pbrc)."\n" if ($debug >= 1); 45 45 46 %pbrc = %$pbrc;46 my %pbrc = %$pbrc; 47 47 if (not defined $proj) { 48 48 # Take the first as the default project … … 56 56 # 57 57 my $topdir=dirname($pbrc{$proj}); 58 # Expand potential env variable in it 59 eval { $topdir =~ s/(\$ENV.+\})/$1/eeg }; 58 60 chdir $topdir || die "Unable to change directory to $topdir"; 61 $pbrc{$proj} = $topdir."/pbrc"; 59 62 $ENV{'PBDESTDIR'}=$topdir."/delivery"; 60 63 … … 80 83 81 84 my %version = (); 85 my %defpkgdir = (); 86 my %extpkgdir = (); 87 my %filteredfiles = (); 82 88 83 89 if (-f "$ENV{'PBCONF'}/$proj.pb") { … … 95 101 %defpkgdir = %$defpkgdir; 96 102 # Global 97 %extpkgdir = ();98 103 %extpkgdir = %$defpkgdir if (defined $defpkgdir); 99 %version = ();100 104 %version = %$version if (defined $version); 101 105 # Global 102 %filteredfiles = ();103 106 %filteredfiles = %$filteredfiles if (defined $filteredfiles); 104 107 # … … 185 188 my $cmt=shift || $cmd; 186 189 187 print $LOG"$cmt... ";190 print "$cmt... "; 188 191 system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log"); 189 192 if ($? == -1) { 190 print $LOG "failed to execute ($cmd) : $!\n" if ($debug >= 0);193 print "failed to execute ($cmd) : $!\n"; 191 194 pb_display_file("$ENV{'PBTMP'}/system.log"); 192 195 } elsif ($? & 127) { 193 printf $LOG "child ($cmd) died with signal %d, %s coredump\n", ($? & 127), ($? & 128) ? 'with' : 'without' if ($debug >= 0);196 printf "child ($cmd) died with signal %d, %s coredump\n", ($? & 127), ($? & 128) ? 'with' : 'without'; 194 197 pb_display_file("$ENV{'PBTMP'}/system.log"); 195 198 } elsif ($? == 0) { 196 print $LOG "OK\n" if ($debug >= 0);199 print "OK\n"; 197 200 } else { 198 201 printf "child ($cmd) exited with value %d\n", $? >> 8; … … 207 210 open(FILE,"$file") || die "Unable to open $file"; 208 211 while (<FILE>) { 209 print $ LOG;212 print $_; 210 213 } 211 214 close(FILE); … … 227 230 die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $p->{$ENV{'PBPROJ'}}); 228 231 } 229 print "DEBUG: param: ".Dumper(@ptr)."\n" if ($debug >= 1);232 #print "DEBUG: param: ".Dumper(@ptr)."\n" if ($debug >= 1); 230 233 return(@ptr); 231 234 } … … 239 242 my $trace; 240 243 my @ptr; 244 245 my $debug = 0; 241 246 242 247 if ($debug > 0) { … … 299 304 my $cms = shift; 300 305 my $pbdate = shift || undef; 301 my $ pkgdir= shift;306 my $source = shift; 302 307 my $destdir = shift; 308 my $tmp; 303 309 304 310 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 305 pb_system("svn export $pkgdir $destdir","Exporting $pkgdir from SVN"); 311 if (-d $source) { 312 $tmp = $destdir; 313 } else { 314 $tmp = $destdir."/".basename($source); 315 } 316 pb_system("svn export $source $tmp","Exporting $source from SVN"); 306 317 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 307 318 my $dir=dirname($destdir); 308 319 my $base=basename($destdir); 309 my $tmp=basename($pkgdir); 320 # Doesn't work if called from outside with a full path name to a file/dir to export 321 $tmp=basename($source); 310 322 # CVS needs a relative path ! 311 pb_system("cd $dir ; cvs export -D $pbdate -d $base $tmp","Exporting $ pkgdirfrom CVS");323 pb_system("cd $dir ; cvs export -D $pbdate -d $base $tmp","Exporting $source from CVS"); 312 324 } else { 313 325 die "cms $cms->{$ENV{'PBPROJ'}} unknown"; … … 338 350 339 351 sub pb_get_filters { 352 353 # For the moment not dynamic 354 my $debug = 0; # Debug level 355 my $LOG = *STDOUT; # Where to log 340 356 341 357 my @ffiles; … … 397 413 my $pbrev=shift; 398 414 my $pbdate=shift; 415 my $defpkgdir = shift; 416 my $extpkgdir = shift; 417 418 # For the moment not dynamic 419 my $debug = 0; # Debug level 420 my $LOG = *STDOUT; # Where to log 399 421 400 422 print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1); … … 416 438 } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) { 417 439 $tmp = ""; 418 my $p = $defpkgdir {$pbpkg};419 $p = $extpkgdir {$pbpkg} if (not defined $p);440 my $p = $defpkgdir->{$pbpkg}; 441 $p = $extpkgdir->{$pbpkg} if (not defined $p); 420 442 pb_changelog($dtype, $pbpkg, $pbtag, $pbsuf, $p, \*DEST); 421 443 } … … 441 463 my $pbrev=shift; 442 464 my $pbdate=shift; 465 466 # For the moment not dynamic 467 my $debug = 0; # Debug level 468 my $LOG = *STDOUT; # Where to log 443 469 444 470 print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
Note:
See TracChangeset
for help on using the changeset viewer.