Changeset 418 in ProjectBuilder for projects

Timestamp:

Apr 27, 2008, 1:20:16 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adapt pbinit to new pb 0.9.2 and its external functions for mondorescue
• First attempt to have correct deb build again for pb 0.9.2

Location:

projects/mondorescue/pbconf/branches/2.2.6

Files:

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

projects/mondorescue/pbconf/branches/2.2.6/mindi/pbinit

@@ -3 +3 @@
 # Init script for mondo with Project-Builder
 #
-use ProjectBuilder::CMS qw (pb_cms_export pb_cms_init);
-use ProjectBuilder::Filter qw (pb_get_filters pb_filter_file_inplace);
-
+use ProjectBuilder::CMS;
+use ProjectBuilder::Filter;
+use ProjectBuilder::Env;
 
 my $pbpkg = "PBPKG";
@@ -11 +11 @@
 my $pbtag = "PBTAG";
 my $pbrev = "PBREV";
+my $pbproj = "PBPROJ";
 
 # Export documentation to generate what is needed
 
+# Action needs to be pbinit
+my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($pbproj,undef,"pbinit");
 my ($scheme,$uri) = pb_cms_init(undef);
 
@@ -20 +23 @@
 
 my $ptr = pb_get_filters($pbpkg);
-pb_filter_file_inplace($ptr,"mindi.8",$pbpkg,$pbver,$pbtag,$pbrev,"","");
+pb_filter_file_inplace($ptr,"mindi.8",$pbpkg,$pbver,$pbtag,$pbrev,"","",$pbproj);

projects/mondorescue/pbconf/branches/2.2.6/mondo/pbinit

@@ -5 +5 @@
 
 # Export documentation to generate what is needed
-use ProjectBuilder::Base qw (pb_mkdir_p pb_rm_rf);
-use ProjectBuilder::Filter qw (pb_filter_file pb_get_filters);
-use ProjectBuilder::CMS qw (pb_cms_init pb_cms_export);
+use ProjectBuilder::Base;
+use ProjectBuilder::Filter;
+use ProjectBuilder::CMS;
+use ProjectBuilder::Env;
 use File::Basename;
-
 
 system("./bootstrap");
@@ -20 +20 @@
 my $pbtag = "PBTAG";
 my $pbrev = "PBREV";
+my $pbproj = "PBPROJ";
 
+# Action needs to be pbinit
+my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($pbproj,undef,"pbinit");
 my ($scheme,$uri) = pb_cms_init(undef);
 
@@ -34 +37 @@
 my $ptr = pb_get_filters($pbpkg);
 foreach my $f (<docs/mantmp/*>) {
-    pb_filter_file("$f",$ptr,"docs/man/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
+    pb_filter_file("$f",$ptr,"docs/man/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","",$pbproj);
 }
 foreach my $f (<docs/entmp/*>) {
-    pb_filter_file("$f",$ptr,"docs/en/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
+    pb_filter_file("$f",$ptr,"docs/en/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","",$pbproj);
 }
 pb_rm_rf("docs/entmp");

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

@@ -24 +24 @@
 # PBPKG is replaced by the package name ($pbpkg in code)
 filter PBPKG = $pbpkg
+
+# PBPROJ is replaced by the project name ($pbproj in code)
+filter PBPROJ = $pbproj