Changeset 106 in ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

Lots of various fixes for CVS support with LinuxCOE

Location:

devel/pb

Files:

• bin/pb (modified) (7 diffs)
• lib/ProjectBuilder/Base.pm (modified) (4 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)) {

devel/pb/lib/ProjectBuilder/Base.pm

@@ -98 +98 @@
     %filteredfiles = ();
     %filteredfiles = %$filteredfiles if (defined $filteredfiles);
+    #
+    # Get global Version/Tag
+    #
+
+    if (not defined $ENV{'PBVER'}) {
+        if ((defined $pkgv) && (defined $pkgv->{$proj})) {
+            $ENV{'PBVER'}=$pkgv->{$proj};
+        } else {
+            die "No projver found in $ENV{'PBCONF'}/$proj.pb";
+        }
+    }
+    die "Invalid version name $ENV{'PBVER'} in $ENV{'PBCONF'}/$proj.pb" if (($ENV{'PBVER'} !~ /[0-9.]+/) && (not exists $version{$ENV{'PBVER'}}));
+    
+    if (not defined $ENV{'PBTAG'}) {
+        if ((defined $pkgt) && (defined $pkgt->{$proj})) {
+            $ENV{'PBTAG'}=$pkgt->{$proj};
+        } else {
+            die "No projtag found in $ENV{'PBCONF'}/$proj.pb";
+        }
+    }
+    die "Invalid tag name $ENV{'PBTAG'} in $ENV{'PBCONF'}/$proj.pb" if ($ENV{'PBTAG'} !~ /[0-9.]+/);
 } else {
     die "Unable to open $ENV{'PBCONF'}/$proj.pb";
 }
-
-#
-# Get global Version/Tag
-#
-
-if (not defined $ENV{'PBVER'}) {
-    if ((defined $pkgv) && (defined $pkgv->{$proj})) {
-        $ENV{'PBVER'}=$pkgv->{$proj};
-    } else {
-        die "No projver found in $ENV{'PBCONF'}/$proj.pb";
-    }
-}
-die "Invalid version name $ENV{'PBVER'} in $ENV{'PBCONF'}/$proj.pb" if (($ENV{'PBVER'} !~ /[0-9.]+/) && (not exists $version{$ENV{'PBVER'}}));
-
-if (not defined $ENV{'PBTAG'}) {
-    if ((defined $pkgt) && (defined $pkgt->{$proj})) {
-        $ENV{'PBTAG'}=$pkgt->{$proj};
-    } else {
-        die "No projtag found in $ENV{'PBCONF'}/$proj.pb";
-    }
-}
-die "Invalid tag name $ENV{'PBTAG'} in $ENV{'PBCONF'}/$proj.pb" if ($ENV{'PBTAG'} !~ /[0-9.]+/);
 
 #
@@ -183 +182 @@
 
 print $LOG "$cmt... ";
-system("$cmd");
+system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
 if ($? == -1) {
-    print $LOG "failed to execute: $!\n" if ($debug >= 0);
+    print $LOG "failed to execute ($cmd) : $!\n" if ($debug >= 0);
+    pb_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($? & 127) {
-    printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
-} else {
+    printf $LOG "child ($cmd) died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+    pb_display_file("$ENV{'PBTMP'}/system.log");
+} elsif ($? == 0) {
     print $LOG "OK\n" if ($debug >= 0);
-}
+} else {
+    printf "child ($cmd) exited with value %d\n", $? >> 8;
+    pb_display_file("$ENV{'PBTMP'}/system.log");
+}
+}
+
+sub pb_display_file {
+
+my $file=shift;
+
+open(FILE,"$file") || die "Unable to open $file";
+while (<FILE>) {
+    print $LOG;
+}
+close(FILE);
 }
 
@@ -260 +275 @@
     $ENV{'PBCMSLOG'}="svn log";
     $ENV{'PBCMSLOGFILE'}="svn.log";
-    $ENV{'PBCMSEXP'}="svn export";
 } elsif ($cms->{$proj} eq "cvs") {
-    $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; cvs rannotate  -f . 2>&1 | awk '{print \$1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
-    chomp($ENV{'PBREVISION'});
+    # Way too slow
+    #$ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; cvs rannotate  -f . 2>&1 | awk '{print \$1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
+    #chomp($ENV{'PBREVISION'});
+    $ENV{'PBREVISION'}="CVS";
     $ENV{'PBCMSLOG'}="cvs log";
     $ENV{'PBCMSLOGFILE'}="cvs.log";
-    $ENV{'PBCMSEXP'}="cvs export";
     #
     # Export content if needed
@@ -274 +289 @@
     die "cms $cms->{$proj} unknown";
 }
-}
+return($cms);
+}
+
+sub pb_cms_export {
+my $cms = shift;
+my $pbdate = shift || undef;
+my $pkgdir = shift;
+my $destdir = shift;
+
+if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+    pb_system("svn export $pkgdir $destdir","Exporting $pkgdir from SVN");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+    my $dir=dirname($destdir);
+    my $base=basename($destdir);
+    my $tmp=basename($pkgdir);
+    # CVS needs a relative path !
+    pb_system("cd $dir ; cvs export -D $pbdate -d $base $tmp","Exporting $pkgdir from CVS");
+} else {
+    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+}
+}
+
+sub pb_cms_log {
+my $cms = shift;
+my $pkgdir = shift;
+my $destfile = shift;
+
+if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+    pb_system("svn log $pkgdir > $destfile","Extracting log info from SVN");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+    my $tmp=basename($pkgdir);
+    # CVS needs a relative path !
+    pb_system("cvs log $tmp > $destfile","Extracting log info from CVS");
+} else {
+    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+}
+}
+    
+
 
 # Get all filters to apply