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

Timestamp:

Mar 30, 2008, 1:42:39 AM (16 years ago)

Author:

Bruno Cornec

Message:

linuxcoe version cvs now builds. Rest to see tags for cvs

File:

• devel/pb/lib/ProjectBuilder/Base.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -1120 +1120 @@
     my $base=basename($destdir);
     # CVS also needs a modules name not a dir
-    if (-d $source) {
-        $tmp1 = $source;
-        $tmp1 =~ s|$ENV{'PBROOTDIR'}/||;
-        $tmp1 =~ s|$ENV{'PBDIR'}/||;
+    #if (-d $source) {
+        $tmp1 = basename($source);
+        #} else {
+        #$tmp1 = dirname($source);
+        #$tmp1 = basename($tmp1);
+        #}
+    my $optcvs = "";
+
+    # If we're working on the CVS itself
+    my $cvstag = basename($ENV{'PBROOTDIR'});
+    my $cvsopt = "";
+    if ($cvstag eq "cvs") {
+        my $pbdate = strftime("%Y-%m-%d %H:%M:%S", @date);
+        $cvsopt = "-D \"$pbdate\"";
     } else {
-        $tmp1 = dirname($source);
-        $tmp1 =~ s|$ENV{'PBROOTDIR'}/||;
-        $tmp1 =~ s|$ENV{'PBDIR'}/||;
-        $tmp1 = $tmp1."/".basename($source);
-    }
-    my $pbdate = strftime("%Y-%m-%d %H:%M:%S", @date);
-    pb_system("cd $dir ; cvs -d $account\@$host:$path export -D \"$pbdate\" -d $base $tmp1","Exporting $source from CVS to $destdir");
+        # we're working on a tag which should be the last part of PBROOTDIR
+        $cvsopt = "-r $cvstag";
+    }
+    pb_system("cd $dir ; cvs -d $account\@$host:$path export $cvsopt -d $base $tmp1","Exporting $tmp1 from $source under CVS to $destdir");
 } else {
     die "cms $scheme unknown";