Changeset 1097 in ProjectBuilder for devel/pb/lib/ProjectBuilder

Timestamp:

Oct 25, 2010, 12:26:55 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #36 by adding new targets to pb with sbx2 suffix. They replace in feature the previous cms2 targets which now becomes really an extract from the Configuration Management System, where the former are from the exported content aka sandbox.

Location:

devel/pb/lib/ProjectBuilder

Files:

• CMS.pm (modified) (4 diffs)
• Env.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -57 +57 @@
 
 my $pbinit = shift || undef;
+my $param = shift || undef;
 
 my ($pburl) = pb_conf_get("pburl");
@@ -70 +71 @@
     $ENV{'PBPROJDIR'} = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
 }
+# Expand potential env variable in it to allow string replacement
+eval { $ENV{'PBPROJDIR'} =~ s/(\$ENV.+\})/$1/eeg };
+
 
 # Computing the default dir for PBDIR.
@@ -101 +105 @@
     $ENV{'PBCMSLOGFILE'}="flat.log";
 } elsif ($scheme =~ /^svn/) {
-    # svnversion more precise than svn info
-    $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd"version" .)`;
+    # svnversion more precise than svn info if sbx
+    if ($param eq "CMS") {
+        $tmp = `(LANGUAGE=C $vcscmd info $pburl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;
+        $tmp =~ s/\s+//;
+    } else {
+        $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd"version" .)`;
+    }
     chomp($tmp);
     $ENV{'PBREVISION'}=$tmp;
     $ENV{'PBCMSLOGFILE'}="svn.log";
 } elsif ($scheme =~ /^svk/) {
-    $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd info . | grep -E '^Revision:' | cut -d: -f2)`;
+    $tmp = `(cd "$ENV{'PBDIR'}" ; LANGUAGE=C $vcscmd info . | grep -E '^Revision:' | cut -d: -f2)`;
     $tmp =~ s/\s+//;
     chomp($tmp);
@@ -267 +276 @@
     } else {
         # Probably not right, should be checked, but that way I'll notice it :-)
+        pb_log(0,"You're in an untested part of project-builder.org, please report any result upstream\n");
         $tmp1 = $uri;
     }

devel/pb/lib/ProjectBuilder/Env.pm

@@ -286 +286 @@
 return if ($action =~ /^clean$/);
 
-if (($action =~ /^cms2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^web/)) {
+if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^web/)) {
 
     #