Ignore:
Timestamp:
Oct 19, 2007, 1:32:43 AM (12 years ago)
Author:
bruno
Message:
  • backport some spec fixes from 0.8.5
  • Fix enhancement #4
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/lib/ProjectBuilder/Base.pm

    r227 r231  
    459459
    460460my @ffiles;
    461 my ($ffile0, $ffile1, $ffile2, $ffile3);
    462 my ($mfile0, $mfile1, $mfile2, $mfile3);
     461my ($ffiles00, $ffile0, $ffile1, $ffile2, $ffile3);
     462my ($mfiles00, $mfile0, $mfile1, $mfile2, $mfile3);
    463463my $pbpkg = shift || die "No package specified";
    464464my $dtype = shift || die "No dtype specified";
     
    471471# Global filter files first, then package specificities
    472472if (-d "$ENV{'PBCONF'}/pbfilter") {
     473    $mfile00 = "$ENV{'PBCONF'}/pbfilter/all.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/all.pbf");
    473474    $mfile0 = "$ENV{'PBCONF'}/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dtype.pbf");
    474475    $mfile1 = "$ENV{'PBCONF'}/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dfam.pbf");
     
    476477    $mfile3 = "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf");
    477478
     479    push @ffiles,$mfile00 if (defined $mfile00);
    478480    push @ffiles,$mfile0 if (defined $mfile0);
    479481    push @ffiles,$mfile1 if (defined $mfile1);
     
    483485
    484486if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {
     487    $ffile00 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/all.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/all.pbf");
    485488    $ffile0 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dtype.pbf");
    486489    $ffile1 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dfam.pbf");
     
    488491    $ffile3 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir-$dver.pbf");
    489492
     493    push @ffiles,$ffile00 if (defined $ffile00);
    490494    push @ffiles,$ffile0 if (defined $ffile0);
    491495    push @ffiles,$ffile1 if (defined $ffile1);
Note: See TracChangeset for help on using the changeset viewer.