Changeset 500 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Filter.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/Filter.pm (modified) (3 diffs)

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);