Changeset 112

Timestamp:

09/06/07 20:13:48 (6 years ago)

Author:

bruno

Message:

SImplification on hash management

Location:

devel/pb

Files:

• bin/pb (modified) (9 diffs)
• lib/ProjectBuilder/Base.pm (modified) (5 diffs)

devel/pb/bin/pb

@@ -39 +39 @@
 my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
 my $pbdate = strftime("%Y-%m-%d", @date);
+my $pbdatecvs = strftime("%Y-%m-%d %H:%M:%S", @date);
 my $debug = 0;
 my $LOG = \*STDOUT;
@@ -91 +92 @@
     = pb_env_init();
 }
-my %pbrc = %$pbrc;
-my %filteredfiles = %$filteredfiles;
-my %defpkgdir = %$defpkgdir;
-my %extpkgdir = %$extpkgdir;
 
 print $LOG "Project: $ENV{'PBPROJ'}\n" if ($debug >= 0);
@@ -133 +130 @@
 sub pb_cms2build {
 
-    my $ptr = pb_get_pkg(\%defpkgdir,\%extpkgdir);
+    my $ptr = pb_get_pkg($defpkgdir,$extpkgdir);
     @pkgs = @$ptr;
-    my $cms=pb_cms_init($ENV{'PBPROJ'},$pbdate);
+    my $cms=pb_cms_init($ENV{'PBPROJ'});
 
     my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgver","pkgtag");
@@ -151 +148 @@
 
         $pbrev = $ENV{'PBREVISION'};
-        print $LOG "\n" if ($debug >= 0);
-        print $LOG "Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n" if ($debug >= 0);
+        print $LOG "\n";
+        print $LOG "Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n";
         die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
         # Clean up dest if necessary. The export will recreate it
@@ -165 +162 @@
         my $dir = $defpkgdir{$pbpkg};
         $dir = $extpkgdir{$pbpkg} if (not defined $dir);
-        pb_cms_export($cms,$pbdate,"$ENV{'PBROOT'}/$dir",$dest);
+        print "dir: $dir\n";
+        pb_cms_export($cms,$pbdatecvs,"$ENV{'PBROOT'}/$dir",$dest);
 
         # Extract cms log history and store it
@@ -232 +230 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,\%defpkgdir,\%extpkgdir);
+                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir);
                 }
                 if (defined $filteredfiles{$pbpkg}) {
@@ -293 +291 @@
 
     # Get list of packages to build
-    my $ptr = pb_get_pkg(\%defpkgdir,\%extpkgdir);
+    my $ptr = pb_get_pkg($defpkgdir,$extpkgdir);
     @pkgs = @$ptr;
 
@@ -366 +364 @@
 
     # Get list of packages to build
-    my $ptr = pb_get_pkg(\%defpkgdir,\%extpkgdir);
+    my $ptr = pb_get_pkg($defpkgdir,$extpkgdir);
     @pkgs = @$ptr;
 
@@ -448 +446 @@
 my $extpkgdir = shift;
 
-my %defpkgdir = %$defpkgdir;
-my %extpkgdir = %$extpkgdir;
-
 # Get packages list
 if (not defined $ARGV[0]) {
-    @pkgs = keys %defpkgdir;
+    @pkgs = keys %$defpkgdir;
 } elsif ($ARGV[0] =~ /^all$/) {
-    @pkgs = keys %defpkgdir;
-    push(@pkgs, keys %extpkgdir);
+    @pkgs = keys %$defpkgdir;
+    push(@pkgs, keys %$extpkgdir);
 } else {
     @pkgs = @ARGV;

devel/pb/lib/ProjectBuilder/Base.pm

@@ -277 +277 @@
 my ($cms) = pb_conf_get("cms");
 # This one is optional
-my ($cvsroot) = pb_conf_read($ENV{'PBETC'},"cvsroot");
+my ($cvsroot,$cvsrsh) = pb_conf_read($ENV{'PBETC'},"cvsroot","cvsrsh");
 
 if ($cms->{$proj} eq "svn") {
@@ -295 +295 @@
     #
     $ENV{'CVSROOT'} = $cvsroot->{$proj} if (defined $cvsroot->{$proj});
+    $ENV{'CVSRSH'} = $cvsrsh->{$proj} if (defined $cvsrsh->{$proj});
 } else {
     die "cms $cms->{$proj} unknown";
@@ -314 +315 @@
         $tmp = $destdir."/".basename($source);
     }
-    pb_system("svn export $source $tmp","Exporting $source from SVN");
+    pb_system("svn export $source $tmp","Exporting $source fr\"om SVN to $tmp");
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
     my $dir=dirname($destdir);
@@ -321 +322 @@
     $tmp=basename($source);
     # CVS needs a relative path !
-    pb_system("cd $dir ; cvs export -D $pbdate -d $base $tmp","Exporting $source from CVS");
+    pb_system("cd $dir ; cvs export -D \"$pbdate\" -d $base $tmp","Exporting $source from CVS to $destdir");
 } else {
     die "cms $cms->{$ENV{'PBPROJ'}} unknown";
@@ -333 +334 @@
 
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
-    pb_system("svn log $pkgdir > $destfile","Extracting log info from SVN");
+    pb_system("svn log -v $pkgdir > $destfile","Extracting log info from SVN");
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
     my $tmp=basename($pkgdir);