Changeset 106 for devel/pb/bin/pb


Ignore:
Timestamp:
Sep 5, 2007, 1:21:18 AM (12 years ago)
Author:
bruno
Message:

Lots of various fixes for CVS support with LinuxCOE

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r105 r106  
    2929use ProjectBuilder::Changelog qw (pb_changelog);
    3030use ProjectBuilder::Version qw (pb_version_init);
    31 use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb);
     31use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_cms_export pb_cms_log);
    3232
    3333my %opts;                   # CLI Options
     
    117117    pb_build2ssh();
    118118    pb_pkg2ssh();
     119} elsif ($action =~ /^clean$/) {
    119120} else {
    120121    print $LOG "'$action' is not available\n";
     
    126127    my $ptr = pb_get_pkg();
    127128    @pkgs = @$ptr;
    128     pb_cms_init($ENV{'PBPROJ'});
     129    my $cms=pb_cms_init($ENV{'PBPROJ'},$pbdate);
    129130
    130131    my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgver","pkgtag");
     
    156157        my $dir = $defpkgdir{$pbpkg};
    157158        $dir = $extpkgdir{$pbpkg} if (not defined $dir);
    158         pb_system("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null", "Exporting $ENV{'PBROOT'}/$dir");
    159 
    160         # Creates a REVISION file
    161         open(R,"> $dest/REVISION") || die "Unable to create $dest/REVISION";
    162         print R "$pbrev\n";
    163         close(R);
     159        pb_cms_export($cms,$pbdate,"$ENV{'PBROOT'}/$dir",$dest);
    164160
    165161        # Extract cms log history and store it
    166         pb_system("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}", "Extracting log info");
     162        pb_cms_log($cms,"$ENV{'PBROOT'}/$dir","$dest/$ENV{'PBCMSLOGFILE'}");
    167163
    168164        my %build;
     
    402398    }
    403399    $src = join(' ',@src);
    404     pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src\" 2>/dev/null","Preparing $dir on $mac");
     400    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src\"","Preparing $dir on $mac");
    405401    pb_system("scp -p $src $mac:$dir","$cmt delivery in $dir on $mac");
    406402}
     
    408404sub pb_build2vm {
    409405    my ($vm,$all) = pb_get_vm();
     406
     407    # Send tar files when we do a global generation
     408    pb_build2ssh() if ($all == 1);
    410409}
    411410
     
    460459my @files;
    461460
    462 pb_system("tar xfpz $src $dir >/dev/null","Extracting build files");
     461pb_system("tar xfpz $src $dir","Extracting build files");
    463462opendir(DIR,"$dir") || die "Unable to open directory $dir";
    464463foreach my $f (readdir(DIR)) {
Note: See TracChangeset for help on using the changeset viewer.