Changeset 106 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 5, 2007, 1:21:18 AM (18 years ago)

Author:

Bruno Cornec

Message:

Lots of various fixes for CVS support with LinuxCOE

File:

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

devel/pb/bin/pb

@@ -29 +29 @@
 use ProjectBuilder::Changelog qw (pb_changelog);
 use ProjectBuilder::Version qw (pb_version_init);
-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);
+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 pb_cms_export pb_cms_log);
 
 my %opts;                   # CLI Options
@@ -117 +117 @@
     pb_build2ssh();
     pb_pkg2ssh();
+} elsif ($action =~ /^clean$/) {
 } else {
     print $LOG "'$action' is not available\n";
@@ -126 +127 @@
     my $ptr = pb_get_pkg();
     @pkgs = @$ptr;
-    pb_cms_init($ENV{'PBPROJ'});
+    my $cms=pb_cms_init($ENV{'PBPROJ'},$pbdate);
 
     my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgver","pkgtag");
@@ -156 +157 @@
         my $dir = $defpkgdir{$pbpkg};
         $dir = $extpkgdir{$pbpkg} if (not defined $dir);
-        pb_system("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null", "Exporting $ENV{'PBROOT'}/$dir");
-
-        # Creates a REVISION file
-        open(R,"> $dest/REVISION") || die "Unable to create $dest/REVISION";
-        print R "$pbrev\n";
-        close(R);
+        pb_cms_export($cms,$pbdate,"$ENV{'PBROOT'}/$dir",$dest);
 
         # Extract cms log history and store it
-        pb_system("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}", "Extracting log info");
+        pb_cms_log($cms,"$ENV{'PBROOT'}/$dir","$dest/$ENV{'PBCMSLOGFILE'}");
 
         my %build;
@@ -402 +398 @@
     }
     $src = join(' ',@src);
-    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src\" 2>/dev/null","Preparing $dir on $mac");
+    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src\"","Preparing $dir on $mac");
     pb_system("scp -p $src $mac:$dir","$cmt delivery in $dir on $mac");
 }
@@ -408 +404 @@
 sub pb_build2vm {
     my ($vm,$all) = pb_get_vm();
+
+    # Send tar files when we do a global generation
+    pb_build2ssh() if ($all == 1);
 }
 
@@ -460 +459 @@
 my @files;
 
-pb_system("tar xfpz $src $dir >/dev/null","Extracting build files");
+pb_system("tar xfpz $src $dir","Extracting build files");
 opendir(DIR,"$dir") || die "Unable to open directory $dir";
 foreach my $f (readdir(DIR)) {