Changeset 310 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm

Timestamp:

Feb 7, 2008, 7:59:40 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fixes for CVS support: remove CVSROOT
• prepare chroot support
• fix for debian build in case a debian dir/link already exists in the project
• only call qemu tools if using qemu as a VM :-)

File:

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

devel/pb/lib/ProjectBuilder/Base.pm

@@ -809 +809 @@
     # Export content if needed
     #
-    my ($cvsroot,$cvsrsh) = pb_conf_get("cvsroot","cvsrsh");
-    $ENV{'CVSROOT'} = $cvsroot->{$proj} if (defined $cvsroot->{$proj});
+    my ($cvsrsh) = pb_conf_get("cvsrsh");
     $ENV{'CVS_RSH'} = $cvsrsh->{$proj} if (defined $cvsrsh->{$proj});
 } else {
@@ -852 +851 @@
     }
     # CVS needs a relative path !
-    pb_system("cd $dir ; cvs export -D \"$pbdate\" -d $base $tmp1","Exporting $source from CVS to $destdir");
+    my ($cvsroot) = pb_conf_get("cvsroot");
+    pb_system("cd $dir ; cvs -d $cvsroot->{$ENV{'PBPROJ'}} export -D \"$pbdate\" -d $base $tmp1","Exporting $source from CVS to $destdir");
 } else {
     die "cms $cms->{$ENV{'PBPROJ'}} unknown";