Changeset 500 in ProjectBuilder for devel/pb/lib/ProjectBuilder/CMS.pm

Timestamp:

Aug 3, 2008, 1:20:30 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Working patch support added to pb (tested with buffer)
• Filtering functions now handle also pointer on hashes (such as the new pb hash)
• Filtering functions support new macro for patch support (PBPATCHSRC and PBPATCHCMD)
• Env.pm now generates correct templates for patch support and uses the new pb hash
• pb_cms_export extended to support ​file:// URI, and also supports an undef second param (no local export available)
• In pb, hashes now include also the arch (for better patch support)
• pb supports local CMS based patches, as well as external references (not tested yet)
• New pb_get_arch function provided
• New parameters for pb_system (mayfail and quiet)

File:

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

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -16 +16 @@
 use English;
 use File::Basename;
+use File::Copy;
 use POSIX qw(strftime);
 use lib qw (lib);
@@ -109 +110 @@
 This function exports a CMS content to a directory.
 The first parameter is the URL of the CMS content.
-The second parameter is the directory in which it is locally exposed (result of a checkout).
+The second parameter is the directory in which it is locally exposed (result of a checkout). If undef, then use the original CMS content.
 The third parameter is the directory where we want to deliver it (result of export).
 
@@ -127 +128 @@
 
 if ($scheme =~ /^svn/) {
-    if (-d $source) {
-        $tmp = $destdir;
-    } else {
-        $tmp = "$destdir/".basename($source);
-    }
-    pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
+    if (defined $source) {
+        if (-d $source) {
+            $tmp = $destdir;
+        } else {
+            $tmp = "$destdir/".basename($source);
+        }
+        pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
+    } else {
+        pb_system("svn export $uri $destdir","Exporting $uri from SVN to $destdir");
+    }
 } elsif ($scheme eq "dir") {
     pb_system("cp -a $path $destdir","Copying $uri from DIR to $destdir");
@@ -152 +157 @@
     pb_mkdir_p($destdir);
 
-    # Check whether the file is well formed 
-    # (containing already a directory with the project-version name)
-    my ($pbwf) = pb_conf_get_if("pbwf");
-    if ((defined $pbwf) && (defined $pbwf->{$ENV{'PBPROJ'}})) {
-        $destdir = dirname($destdir);
+    if (defined $source) {
+        # Check whether the file is well formed 
+        # (containing already a directory with the project-version name)
+        my ($pbwf) = pb_conf_get_if("pbwf");
+        if ((defined $pbwf) && (defined $pbwf->{$ENV{'PBPROJ'}})) {
+            $destdir = dirname($destdir);
+        }
     }
 
@@ -174 +181 @@
         # zip
         pb_system("cd $destdir ; unzip $path","Extracting $path in $destdir");
+    } else {
+        # simple file: copy it (patch e.g.)
+        copy($path,$destdir);
     }
 } elsif ($scheme =~ /^cvs/) {
@@ -179 +189 @@
     my $dir=dirname($destdir);
     my $base=basename($destdir);
-    # CVS also needs a modules name not a dir
-    #if (-d $source) {
+    if (defined $source) {
+        # CVS also needs a modules name not a dir
         $tmp1 = basename($source);
-        #} else {
-        #$tmp1 = dirname($source);
-        #$tmp1 = basename($tmp1);
-        #}
+    } else {
+        # Probably not right, should be checked, but that way I'll notice it :-)
+        $tmp1 = $uri;
+    }
     my $optcvs = "";
 
@@ -304 +314 @@
 } elsif ($scheme =~ /^cvs/) {
     pb_system("cvs co $url $destination","Checking out $url to $destination ");
+} elsif ($scheme =~ /^file/) {
+    pb_cms_export($url,undef,$destination);
 } else {
     die "cms $scheme unknown";
@@ -417 +429 @@
 }
 
-=item B<pb_cms_isdiff>
+=item B<pb_cms_getpkg>
 
 This function returns the list of packages we are working on in a CMS action.