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

Timestamp:

Apr 7, 2008, 11:07:33 PM (16 years ago)

Author:

Bruno Cornec

Message:

Preliminary tests for the new newvm action (test only)

File:

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

devel/pb/lib/ProjectBuilder/Base.pm

@@ -181 +181 @@
 
 #
-# The following part is only useful when in cms2build
+# The following part is only useful when in cms2something of newver
 # In VMs/VEs we want to skip that by providing good env vars.
 # return values in that case are useless
 #
-if ($action =~ /^cms2/) {
+if (($action =~ /^cms2/) || ($action =~ /^newver$/)) {
 
     #
@@ -228 +228 @@
         die "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});
     }
+
+    return  if ($action =~ /^newver$/);
 
     my %version = ();
@@ -1341 +1343 @@
 sub pb_cms_isdiff {
 my $scheme = shift;
+my $dir =shift;
 
 if ($scheme =~ /^svn/) {
-    open(PIPE,"svn diff $ENV{'PBROOTDIR'} |") || die "Unable to get svn diff from $ENV{'PBROOTDIR'}";
+    open(PIPE,"svn diff $dir |") || die "Unable to get svn diff from $dir";
     my $l = 0;
     while (<PIPE>) {
@@ -1351 +1354 @@
 } elsif ($scheme eq "flat") {
 } elsif ($scheme =~ /^cvs/) {
+    open(PIPE,"cvs diff $dir |") || die "Unable to get svn diff from $dir";
+    my $l = 0;
+    while (<PIPE>) {
+        # Skipping normal messages
+        next if (/^cvs diff:/);
+        $l++;
+    }
+    return($l);
 } else {
     die "cms $scheme unknown";