Changeset 1713 in MondoRescue for branches/2.2.5/pbconf/mondo

Timestamp:

Oct 27, 2007, 8:31:17 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Improve Ubuntu/Debian keyboard detection and support
• pbinit adapted to new pb (0.8.10). Filtering of docs done in it
• Suppress some mondo warnings and errors on USB again

File:

• branches/2.2.5/pbconf/mondo/pbinit (modified) (1 diff)

branches/2.2.5/pbconf/mondo/pbinit

@@ -5 +5 @@
 
 # Export documentation to generate what is needed
-use ProjectBuilder::Base qw (pb_cms_init pb_cms_export pb_mkdir_p);
+use ProjectBuilder::Base qw (pb_cms_init pb_cms_export pb_mkdir_p pb_filter_file);
+use File::Basename;
+
 
 system("./bootstrap");
+pb_mkdir_p("docs/entmp");
+pb_mkdir_p("docs/mantmp");
 pb_mkdir_p("docs/en");
 pb_mkdir_p("docs/man");
+my $pbpkg = "PBPKG";
+my $pbver = "PBVER";
+my $pbtag = "PBTAG";
+my $pbrev = "PBREV";
 
 my $cms = pb_cms_init($ENV{'PBPROJ'},undef);
 
-pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondoarchive.8","docs/man");
-pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorestore.8","docs/man");
+pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondoarchive.8","docs/mantmp");
+pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorestore.8","docs/mantmp");
 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/images","docs/en/images");
 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/fdl.sgml","docs/en");
-pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.sgml","docs/en");
+pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.sgml","docs/entmp");
 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/mondorescue-howto.dsl","docs/en");
 pb_cms_export($cms,undef,"$ENV{'PBROOT'}/mondo-doc/Makefile.howto","docs/en");
 # should call filter_file here
-system("cd docs/en ; ls -lR > /tmp/1 ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");
+
+my $ptr = pb_get_filters($pbpkg);
+foreach my $f (<docs/mantmp/*>) {
+    pb_filter_file("$f",$ptr,"docs/man/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
+}
+foreach my $f (<docs/entmp/*>) {
+    pb_filter_file("$f",$ptr,"docs/en/".basename($f),$pbpkg,$pbver,$pbtag,$pbrev,"","");
+}
+pb_rm_rf("docs/entmp");
+pb_rm_rf("docs/mantmp");
+
+system("cd docs/en ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");