Changeset 15 in ProjectBuilder

Timestamp:

Jul 30, 2007, 2:47:27 PM (18 years ago)

Author:

Bruno Cornec

Message:

Begin to deal with filters

Location:

devel

Files:

• pb/AUTHORS (added)
• pb/COPYING (added)
• pb/ChangeLog (added)
• pb/INSTALL (added)
• pb/README (added)
• pb/bin/pb.pl (modified) (2 diffs)
• pb/etc (deleted)
• pb/lib/pb.pm (modified) (3 diffs)
• pbconf/pb.pb (copied) (copied from devel/pb/etc/pb.pb ) (1 diff)
• pbconf/projectbuilder/pbfilter (added)
• pbconf/projectbuilder/rpm/pb.spec (modified) (1 diff)

devel/pb/bin/pb.pl

@@ -19 +19 @@
 
 use lib qw (lib etc);
-use vars qw (%defpkgdir %extpkgdir %version);
+use vars qw (%defpkgdir %extpkgdir %version @filteredfiles);
 use common qw (env_init);
-use pb qw (defpkgdir extpkgdir version pb_init);
+use pb qw (defpkgdir extpkgdir version filteredfiles pb_init);
 use distro qw (distro_init);
 use cms;
@@ -167 +167 @@
             }
 
+            # Get all filters to apply
+            # They're cumulative from less specific to most specific
+            # suffix is .pbf
+            if (-d "$ENV{'PBCONF'}/$p/pbfilter") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$p/pbfilter" || die "Unable to open dir $ENV{'PBCONF'}/$p/pbfilter: $!");
+                foreach my $f (readdir(BDIR)) {
+                    if (-f "$ENV{'PBCONF'}/$p/pbfilter/$dtype.pbf") {
+
+                @bfiles = grep { ! /^\./ && -f "$ENV{'PBCONF'}/$p/$dtype/$_" } readdir(BDIR);
+                closedir(BDIR);
+            }
+
         }
         close(D);

devel/pb/lib/pb.pm

@@ -11 +11 @@
 @ISA = qw(Exporter);
 # global vars are here
-@EXPORT_OK = qw(%defpkgdir %extpkgdir %version &pb_init);
+@EXPORT_OK = qw(%defpkgdir %extpkgdir %version @filteredfiles &pb_init);
 use vars @EXPORT_OK;
 use AppConfig qw(ARGCOUNT_ONE ARGCOUNT_HASH ARGCOUNT_LIST EXPAND_ALL);
@@ -30 +30 @@
 $config->define("extpkgdir" => { ARGCOUNT => ARGCOUNT_HASH });
 $config->define("version" => { ARGCOUNT => ARGCOUNT_HASH });
+$config->define("filteredfiles" => { ARGCOUNT => ARGCOUNT_LIST });
 
 $config->file($conffile);
@@ -53 +54 @@
 %version = %$ptr;
 
+# List of files to filter
+$ptr = $config->get("filteredfiles");
+@filteredfiles = @$ptr;
+
 }
 1;

devel/pbconf/pb.pb

@@ -23 +23 @@
 version devel
 version stable
+
+# List of files on which to apply filters
+filteredfiles none

devel/pbconf/projectbuilder/rpm/pb.spec

@@ -7 +7 @@
 
 Name:       pb
-Version:    VVV
-Release:    RRR
+Version:    PBVER
+Release:    PBREV
 License:    GPL
-Group:      GRP
+Group:      PBGRP
 Url:        http://www.mondorescue.org
-Source:     SSS
+Source:     PBSRC
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires: