Changeset 499 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Filter.pm

Timestamp:

Jul 30, 2008, 5:58:00 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Modification of filter interface: use a single pb hash which contains the tag that will be handled during the filtering. Allow for easiest interface of functions, removal of a redundant function and evolution by simple addition of tags in pb.
• Attempt to code patch management. Not tested yet.

File:

• devel/pb/lib/ProjectBuilder/Filter.pm (modified) (5 diffs)

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -119 +119 @@
 }
 
-=item B<pb_filter_file_pb>
-
-This function applies all filters to pb build files.
-
-It takes 15 parameters. To be filtered a variable has to be passed to that function.
+=item B<pb_filter_file>
+
+This function applies all filters to files.
+
+It takes 4 parameters.
 
 The first parameter is the file to filter.
 The second parameter is the pointer on the hash of filters.
 The third parameter is the destination file after filtering.
-The fourth parameter is the distribution type.
-The fifth parameter is the suffix of the distribution.
-The sixth parameter is the package name.
-The seventh parameter is the version of the package.
-The eighth parameter is the tag of the package.
-The nineth parameter is the revision of the package.
-The tenth parameter is the current date.
-The eleventh parameter is the list of required packages.
-The twelveth parameter is the list of optional packages.
-The thirteenth parameter is the packager name.
-The fourteenth parameter is the changelog.
-The fifteenth parameter is the project.
-The sixteenth parameter is the repo.
-
-=cut
-
-sub pb_filter_file_pb {
+The fourth parameter is the pointer on the hash of variables to filter (tag, ver, ...)
+
+=cut
+
+sub pb_filter_file {
 
 my $f=shift;
@@ -150 +138 @@
 my %filter=%$ptr;
 my $destfile=shift;
-my $dtype=shift;
-my $pbsuf=shift;
-my $pbpkg=shift;
-my $pbver=shift;
-my $pbtag=shift;
-my $pbrev=shift;
-my $pbdate=shift;
-my $defpkgdir = shift;
-my $extpkgdir = shift;
-my $pbpackager = shift;
-my $chglog = shift || undef;
-my $pbproj = shift;
-my $pbrepo = shift;
+my $pb=shift;
+my %pb = %$pb;
 
 pb_log(2,"DEBUG: From $f to $destfile\n");
@@ -182 +159 @@
         # special case for ChangeLog only for pb
         } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
-            my $p = $defpkgdir->{$pbpkg};
-            $p = $extpkgdir->{$pbpkg} if (not defined $p);
-            pb_changelog($dtype, $pbpkg, $pbver, $pbtag, $pbsuf, $p, \*DEST, $tmp, $chglog);
+            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'});
+            $tmp = "";
+        } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {
+            my $i = 0;
+            foreach my $p (sort @$pb{'patches'}) {
+                print DEST "Patch$i: $p\n";
+            }
+            $tmp = "";
+        } elsif (($s =~ /^PBPATCHCMD$/) && ($line =~ /^PBPATCHCMD$/)) {
+            my $i = 0;
+            foreach my $p (sort @$pb{'patches'}) {
+                print DEST "%patch$i\n";
+            }
+            print DEST "\n";
             $tmp = "";
         }
@@ -199 +189 @@
 This function applies all filters to a file in place.
 
-It takes 9 parameters.
+It takes 3 parameters.
 
 The first parameter is the pointer on the hash of filters.
 The second parameter is the destination file after filtering.
-The third parameter is the package name.
-The fourth parameter is the version of the package.
-The fifth parameter is the tag of the package.
-The sixth parameter is the revision of the package.
-The seventh parameter is the current date.
-The eighth parameter is the packager name.
-The nineth parameter is the project name.
-The tenth parameter is the repo.
+The third parameter is the pointer on the hash of variables to filter (tag, ver, ...)
 
 =cut
@@ -220 +203 @@
 my %filter=%$ptr;
 my $destfile=shift;
-my $pbpkg=shift;
-my $pbver=shift;
-my $pbtag=shift;
-my $pbrev=shift;
-my $pbdate=shift;
-my $pbpackager=shift;
-my $pbproj=shift;
-my $pbrepo = shift;
+my $pb=shift;
+my %pb = %$pb;
 
 my $cp = "$ENV{'PBTMP'}/".basename($destfile);
 copy($destfile,$cp) || die "Unable to create $cp";
 
-pb_filter_file($cp,$ptr,$destfile,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager,$pbproj,$pbrepo);
+pb_filter_file($cp,$ptr,$destfile,$pb);
 unlink $cp;
 }
 
-=item B<pb_filter_file>
-
-This function applies all filters on a file to generate a new filtered one.
-
-It takes 10 parameters. To be filtered a variable has to be passed to that function.
-
-The first parameter is the original file to filter.
-The second parameter is the pointer on the hash of filters.
-The third parameter is the destination file after filtering.
-The fourth parameter is the package name.
-The fifth parameter is the version of the package.
-The sixth parameter is the tag of the package.
-The seventh parameter is the revision of the package.
-The eighth parameter is the current date.
-The nineth parameter is the packager name.
-The tenth parameter is the project name.
-The eleventh parameter is the repo.
-
-=cut
-
-
-# Function which applies filter on files (external call)
-sub pb_filter_file {
-
-my $f=shift;
-my $ptr=shift;
-my %filter=%$ptr;
-my $destfile=shift;
-my $pbpkg=shift;
-my $pbver=shift;
-my $pbtag=shift;
-my $pbrev=shift;
-my $pbdate=shift;
-my $pbpackager=shift;
-my $pbproj=shift;
-my $pbrepo = shift;
-
-pb_log(2,"DEBUG: From $f to $destfile\n");
-pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
-open(DEST,"> $destfile") || die "Unable to create $destfile";
-open(FILE,"$f") || die "Unable to open $f: $!";
-while (<FILE>) {
-    my $line = $_;
-    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);
-        # Expand variables if any single one found
-        if ($tmp =~ /\$/) {
-            eval { $tmp =~ s/(\$\w+)/$1/eeg };
-            eval { $tmp =~ s/(\$\/)/$1/eeg };
-        }
-        $line =~ s|$s|$tmp|g;
-    }
-    print DEST $line;
-}
-close(FILE);
-close(DEST);
-}
 
 =back