Changeset 115 in ProjectBuilder

Timestamp:

Sep 6, 2007, 8:58:25 PM (18 years ago)

Author:

Bruno Cornec

Message:

Fix still more CVS problems + add mre ENV var for pbinit to be able to use them.

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -136 +136 @@
     my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgver","pkgtag");
     foreach my $pbpkg (@pkgs) {
+        $ENV{'PBPKG'} = $pbpkg;
         if ((defined $pkgv) && (defined $pkgv->{$pbpkg})) {
             $pbver = $pkgv->{$pbpkg};
+            $ENV{'PBVER'} = $pbver;
         } else {
             $pbver = $ENV{'PBVER'};
@@ -143 +145 @@
         if ((defined $pkgt) && (defined $pkgt->{$pbpkg})) {
             $pbtag = $pkgt->{$pbpkg};
+            $ENV{'PBTAG'} = $pbtag;
         } else {
             $pbtag = $ENV{'PBTAG'};

devel/pb/lib/ProjectBuilder/Base.pm

@@ -308 +308 @@
 my $destdir = shift;
 my $tmp;
+my $tmp1;
 
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
@@ -319 +320 @@
     my $dir=dirname($destdir);
     my $base=basename($destdir);
-    # Doesn't work if called from outside with a full path name to a file/dir to export
-    $tmp=basename($source);
+    if (-d $source) {
+        $tmp1 = $source;
+        $tmp1 =~ s|$ENV{'PBROOT'}/||;
+    } else {
+        $tmp1 = dirname($source);
+        $tmp1 =~ s|$ENV{'PBROOT'}/||;
+        $tmp1 = $tmp1."/".basename($source);
+    }
     # CVS needs a relative path !
-    pb_system("cd $dir ; cvs export -D \"$pbdate\" -d $base $tmp","Exporting $source from CVS to $destdir");
+    pb_system("cd $dir ; cvs export -D \"$pbdate\" -d $base $tmp1","Exporting $source from CVS to $destdir");
 } else {
     die "cms $cms->{$ENV{'PBPROJ'}} unknown";