Changeset 1554 in ProjectBuilder for devel/pb/lib

Timestamp:

May 21, 2012, 3:19:04 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: Update documentation, the newproj docs were missing an important argument. Expanded out the newproj documentation. Fixed the cms2build documentation to match the same style as the other documentation. (Eric Anderson)
• CMS.pm/VCS.pm: Tolerate the file: scheme -- it was tolerated in some places but not others. (Eric Anderson)

File:

• devel/pb/lib/ProjectBuilder/CMS.pm (modified) (3 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -92 +92 @@
 #
 my $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp";
-$turl = $pburl->{$ENV{'PBPROJ'}} if (($scheme =~ /^file/) || ($scheme =~ /^(ht|f)tp/));
+$turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
 pb_cms_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);
 
@@ -108 +108 @@
     $ENV{'PBREVISION'}=$tmp;
     $ENV{'PBCMSLOGFILE'}="git.log";
-} elsif (($scheme =~ /^file/) || ($scheme eq "ftp") || ($scheme eq "http")) {
+} elsif (($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
     $ENV{'PBREVISION'}="flat";
     $ENV{'PBCMSLOGFILE'}="flat.log";
@@ -432 +432 @@
         close(CL);
         pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from GIT");
-    } elsif (($scheme =~ /^file/) || ($scheme eq "dir") || ($scheme eq "http") || ($scheme eq "ftp")) {
+    } elsif (($scheme =~ /^(flat)|(ftp)|(http)|(file)|(dir)\b/o) {
         pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
     } elsif ($scheme =~ /^cvs/) {