Changeset 1442

Timestamp:

03/27/12 14:44:37 (15 months ago)

Author:

bruno

Message:

• Addes extdir to the filtering system as now mandatory in pb.

Location:

projects/mondorescue/pbconf/branches/3.0

Files:

• mindi/pbinit (modified) (1 diff)
• mondo/pbinit (modified) (3 diffs)
• pbfilter/all.pbf (modified) (1 diff)
• website/pbinit (modified) (1 diff)

projects/mondorescue/pbconf/branches/3.0/mindi/pbinit

@@ -15 +15 @@
 $pb{'date'} = "PBDATE";
 $pb{'repo'} = "PBREPO";
+$pb{'extdir'} = "PBEXTDIR";
 
 # Export documentation to generate what is needed

projects/mondorescue/pbconf/branches/3.0/mondo/pbinit

@@ -10 +10 @@
 use ProjectBuilder::Env;
 use File::Basename;
+use Data::Dumper;
 
 pb_system("./bootstrap","Bootstraping MondoRescue","verbose");
@@ -15 +16 @@
 pb_mkdir_p("docs/man");
 my %pb;
-$pb{'pkg'} = "PBPKG";
-$pb{'ver'} = "PBVER";
 $pb{'tag'} = "PBTAG";
 $pb{'rev'} = "PBREV";
+$pb{'ver'} = "PBVER";
+$pb{'pkg'} = "PBPKG";
 $pb{'proj'} = "PBPROJ";
 $pb{'date'} = "PBDATE";
 $pb{'repo'} = "PBREPO";
+$pb{'extdir'} = "PBEXTDIR";
 
 # Action needs to be pbinit
@@ -38 +40 @@
 my $ptr = pb_get_filters($pb{'pkg'});
 foreach my $f ((<docs/man/*.8>),(<docs/en/*.sgml>)) {
+    #print "LOG: filtering $f\n";
+    #print Dumper(%pb);
+    #print Dumper($ptr);
     pb_filter_file_inplace($ptr,$f,\%pb);
 }

projects/mondorescue/pbconf/branches/3.0/pbfilter/all.pbf

@@ -16 +16 @@
 filter PBDATE = $pb->{'date'}
 
+# PBEXTDIR is replaced by the date ($pb->{'extdir'} in code)
+filter PBEXTDIR = $pb->{'extdir'}
+
 # PBLOG is replaced by the changelog if value is yes
 filter PBLOG = yes

projects/mondorescue/pbconf/branches/3.0/website/pbinit

@@ -20 +20 @@
 $pb{'date'} = "PBDATE";
 $pb{'repo'} = "PBREPO";
+$pb{'extdir'} = "PBEXTDIR";
 
 # Action needs to be pbinit