Changeset 500 in ProjectBuilder for devel/pb/lib

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)

Location:

devel/pb/lib/ProjectBuilder

Files:

• CMS.pm (modified) (8 diffs)
• Env.pm (modified) (5 diffs)
• Filter.pm (modified) (3 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.

devel/pb/lib/ProjectBuilder/Env.pm

@@ -477 +477 @@
 #
 # PBREPO is replaced by the root URL to access the repository
-filter PBREPO = \$pbrepo
+filter PBREPO = \$pb->{'repo'}
 
 # PBSRC is replaced by the source package location after the repo
 #filter PBSRC = src/%{name}-%{version}.tar.gz
 
-# PBVER is replaced by the version (\$pbver in code)
-filter PBVER = \$pbver
-
-# PBDATE is replaced by the date (\$pbdate in code)
-filter PBDATE = \$pbdate
+# PBVER is replaced by the version (\$pb->{'ver'} in code)
+filter PBVER = \$pb->{'ver'}
+
+# PBDATE is replaced by the date (\$pb->{'date'} in code)
+filter PBDATE = \$pb->{'date'}
 
 # PBLOG is replaced by the changelog if value is yes
 #filter PBLOG = yes
 
-# PBTAG is replaced by the tag (\$pbtag in code)
-filter PBTAG = \$pbtag
-
-# PBREV is replaced by the revision (\$pbrev in code)
-filter PBREV = \$pbrev
-
-# PBPKG is replaced by the package name (\$pbpkg in code)
-filter PBPKG = \$pbpkg
-
-# PBPACKAGER is replaced by the packager name (\$pbpackager in code)
-filter PBPACKAGER = \$pbpackager
+# PBPATCHSRC is replaced by the patches names if value is yes
+#filter PBPATCHSRC = yes
+
+# PBPATCHCMD is replaced by the patches commands if value is yes
+#filter PBPATCHCMD = yes
+
+# PBTAG is replaced by the tag (\$pb->{'tag'} in code)
+filter PBTAG = \$pb->{'tag'}
+
+# PBREV is replaced by the revision (\$pb->{'rev'} in code)
+filter PBREV = \$pb->{'rev'}
+
+# PBPKG is replaced by the package name (\$pb->{'pkg'} in code)
+filter PBPKG = \$pb->{'pkg'}
+
+# PBPACKAGER is replaced by the packager name (\$pb->{'packager'} in code)
+filter PBPACKAGER = \$pb->{'packager'}
 
 # PBDESC contains the description of the package
@@ -527 +533 @@
 #filter PBDEP =
 
-# PBSUF is replaced by the package suffix (\$pbsuf in code)
-filter PBSUF = \$pbsuf
+# PBSUF is replaced by the package suffix (\$pb->{'suf'} in code)
+filter PBSUF = \$pb->{'suf'}
 
 # PBOBS is replaced by the Obsolete line
@@ -554 +560 @@
 #filter PBDEP =
 
-# PBSUF is replaced by the package suffix (\$pbsuf in code)
+# PBSUF is replaced by the package suffix (\$pbsuf'} in code)
 filter PBSUF = %{dist}
 
@@ -844 +850 @@
 Url:            PBURL
 Source:         PBREPO/PBSRC
+#PBPATCHSRC
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 #Requires:       PBDEP
@@ -855 +862 @@
 %prep
 %setup -q
+#PBPATCHCMD
 
 %build

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -139 +139 @@
 my $destfile=shift;
 my $pb=shift;
-my %pb = %$pb;
 
 pb_log(2,"DEBUG: From $f to $destfile\n");
@@ -149 +148 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        pb_log(2,"DEBUG filter{$s}: $filter{$s}\n");
         my $tmp = $filter{$s};
         next if (not defined $tmp);
+        pb_log(3,"DEBUG filter{$s}: $filter{$s}\n");
         # Expand variables if any single one found
-        pb_log(2,"DEBUG tmp: $tmp\n");
         if ($tmp =~ /\$/) {
+            # Order is important as we need to handle hashes refs before simple vars
+            eval { $tmp =~ s/(\$\w+-\>\{\'\w+\'\})/$1/eeg };
             eval { $tmp =~ s/(\$\w+)/$1/eeg };
             eval { $tmp =~ s/(\$\/)/$1/eeg };
         # special case for ChangeLog only for pb
         } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
-            my $p = $pb{'defpkgdir'}->{$pbpkg};
-            $p = $pb{'extpkgdir'}->{$pbpkg} if (not defined $p);
-            pb_changelog($pb{'dtype'}, $pb{'pkg'}, $pb{'ver'}, $pb{'tag'}, $pb{'suf'}, $p, \*DEST, $tmp, $pb{'chglog'});
+            pb_log(3,"DEBUG filtering PBLOG\n");
+            my $p = $pb->{'defpkgdir'}->{$pb->{'pkg'}};
+            $p = $pb->{'extpkgdir'}->{$pb->{'pkg'}} if (not defined $p);
+            pb_changelog($pb->{'dtype'}, $pb->{'pkg'}, $pb->{'ver'}, $pb->{'tag'}, $pb->{'suf'}, $p, \*DEST, $tmp, $pb->{'chglog'});
             $tmp = "";
         } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {
+            pb_log(3,"DEBUG filtering PBPATCHSRC\n");
             my $i = 0;
-            foreach my $p (sort @$pb{'patches'}) {
-                print DEST "Patch$i: $p\n";
+            foreach my $p (split(/,/,$pb->{'patches'}->{$pb->{'tuple'}})) {
+                print DEST "Patch$i:         ".basename($p).".gz\n";
+                $i++;
             }
             $tmp = "";
         } elsif (($s =~ /^PBPATCHCMD$/) && ($line =~ /^PBPATCHCMD$/)) {
+            pb_log(3,"DEBUG filtering PBPATCHCMD\n");
             my $i = 0;
-            foreach my $p (sort @$pb{'patches'}) {
-                print DEST "%patch$i\n";
+            foreach my $p (split(/,/,$pb->{'patches'}->{$pb->{'tuple'}})) {
+                print DEST "%patch$i -p1\n";
+                $i++;
             }
             print DEST "\n";
@@ -204 +209 @@
 my $destfile=shift;
 my $pb=shift;
-my %pb = %$pb;
 
 my $cp = "$ENV{'PBTMP'}/".basename($destfile);
-copy($destfile,$cp) || die "Unable to create $cp";
+copy($destfile,$cp) || die "Unable to copy $destfile to $cp";
 
 pb_filter_file($cp,$ptr,$destfile,$pb);