Changeset 169 in ProjectBuilder for devel/pb/lib

Timestamp:

Oct 2, 2007, 12:14:05 AM (17 years ago)

Author:

Bruno Cornec

Message:

Support global filter gfiles (taken before package specific ones)

File:

• devel/pb/lib/ProjectBuilder/Base.pm (modified) (2 diffs)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -367 +367 @@
 my @ffiles;
 my ($ffile0, $ffile1, $ffile2, $ffile3);
+my ($mfile0, $mfile1, $mfile2, $mfile3);
 my $pbpkg = shift || die "No package specified";
 my $dtype = shift || die "No dtype specified";
@@ -374 +375 @@
 my $ptr; # returned value pointer on the hash of filters
 my %ptr;
+
+# Global filter files first, then package specificities
+if (-d "$ENV{'PBCONF'}/pbfilter") {
+    $mfile0 = "$ENV{'PBCONF'}/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dtype.pbf");
+    $mfile1 = "$ENV{'PBCONF'}/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dfam.pbf");
+    $mfile2 = "$ENV{'PBCONF'}/pbfilter/$ddir.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$ddir.pbf");
+    $mfile3 = "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf");
+
+    push @ffiles,$mfile0 if (defined $mfile0);
+    push @ffiles,$mfile1 if (defined $mfile1);
+    push @ffiles,$mfile2 if (defined $mfile2);
+    push @ffiles,$mfile3 if (defined $mfile3);
+}
 
 if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {