Changeset 499 in ProjectBuilder

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.

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -454 +454 @@
     my @pkgs = @$pkg;
     my %pkgs;
+    my %pb;             # Structure to store conf info
 
     my ($scheme, $uri) = pb_cms_init($pbinit);
@@ -520 +521 @@
         my @pt;
         my $tmpl = "";
+        my @patches = ();
 
         @pt = pb_conf_get_if("vmlist","velist");
@@ -532 +534 @@
             $tmpl .= $pt[1]->{$ENV{'PBPROJ'}} 
         }
+
+        # Setup %pb structure to allow filtering later on on files using that structure
+        $pb{'tag'} = $pbtag;
+        $pb{'rev'} = $pbrev;
+        $pb{'pkg'} = $pbpkg;
+        $pb{'ver'} = $pbver;
+        $pb{'date'} = $pbdate;
+        $pb{'defpkgdir'} = $defpkgdir;
+        $pb{'extpkgdir'} = $extpkgdir;
+        $pb{'chglog'} = $chglog;
+        $pb{'packager'} = $ENV{'PBPACKAGER'};
+        $pb{'proj'} = $ENV{'PBPROJ'};
+        $pb{'repo'} = $ENV{'PBREPO'};
+
         foreach my $d (split(/,/,$tmpl)) {
             my ($name,$ver,$arch) = split(/-/,$d);
             chomp($arch);
-            my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver);
-            pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf)."\n");
+            my ($ddir, $dver, $dfam);
+            ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}) = pb_distro_init($name,$ver);
+            pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
             pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
 
@@ -548 +565 @@
             $build{"$ddir-$dver"} = "yes";
 
-            if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$dtype") {
-                pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$dtype",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pb{'dtype'}") {
+                pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pb{'dtype'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
             } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$dfam") {
                 pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$dfam",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
@@ -563 +580 @@
 
             # Get all filters to apply
-            my $ptr = pb_get_filters($pbpkg, $dtype, $dfam, $ddir, $dver);
+            my $ptr = pb_get_filters($pbpkg, $pb{'dtype'}, $dfam, $ddir, $dver);
 
             # Prepare patches for this distro
-            my @patches;
-
             foreach my $p (sort(<$ENV{'PBROOTDIR'}/$pbpkg/pbpatch/*>)) {
                 push @patches,$p if ($p =~ /\.all$/);
-                push @patches,$p if ($p =~ /\.$dtype$/);
+                push @patches,$p if ($p =~ /\.$pb{'dtype'}$/);
                 push @patches,$p if ($p =~ /\.$dfam$/);
                 push @patches,$p if ($p =~ /\.$ddir$/);
                 push @patches,$p if ($p =~ /\.$ddir-$dver$/);
             }
+            $pb{'patches'} = \@patches;
 
             # Apply now all the filters on all the files concerned
@@ -580 +596 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles,values %pkgfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog,$ENV{'PBPROJ'},$ENV{'PBREPO'});
+                    pb_filter_file("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),\%pb);
                 }
             }
@@ -602 +618 @@
         if (defined $filteredfiles->{$pbpkg}) {
             foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'},$ENV{'PBREPO'});
+                pb_filter_file_inplace($ptr,"$dest/$f",\%pb);
                 $liste = "$f $liste";
             }
         }
         pb_log(2,"Files ".$liste."have been filtered\n");
+
+        # Filter potential patches
+        pb_mkdir_p("$dest/pbconf/pbpatch");
+        foreach my $p (sort(@patches)) {
+            my $pp = basename($p);
+            pb_filter_file($p,$ptr,"$dest/pbconf/pbpatch/$pp",\%pb);
+            pb_system("gzip -9 $dest/pbconf/pbpatch/$pp");
+        }
 
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'},$ENV{'PBREPO'});
+            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",\%pb);
             chmod 0755,"$ENV{'PBTMP'}/pbinit";
             pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit","verbose");
-        }
-
-        # Filter potential patches
-        foreach my $p (sort(<$ENV{'PBROOTDIR'}/$pbpkg/pbpatch/*>)) {
-            pb_mkdir_p("$dest/pbconf/pbpatch");
-            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbpatch/$p",$ptr,"$dest/pbconf/pbpatch/$p",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'},$ENV{'PBREPO'});
         }
 
@@ -694 +712 @@
             symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             # We need to first extract the spec file
-            my @specfile;
-            @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
+            my @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
 
             # We need to handle potential patches to upstream sources
+            my @patchfiles = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/pbpatch/","$ENV{'PBBUILDDIR'}/SOURCES");
 
             pb_log(2,"specfile: ".Dumper(\@specfile)."\n");

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