Changeset 554 in ProjectBuilder

Timestamp:

Sep 23, 2008, 12:39:56 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adapt pbinit to upcoming pb 0.9.4
• Adapt mondorescue.pb to new website delivery syntax

Location:

projects/mondorescue/pbconf/branches/2.2.7

Files:

• mindi/pbinit (modified) (2 diffs)
• mondo/pbinit (modified) (1 diff)
• mondorescue.pb (modified) (2 diffs)

projects/mondorescue/pbconf/branches/2.2.7/mindi/pbinit

@@ -7 +7 @@
 use ProjectBuilder::Env;
 
-my $pbpkg = "PBPKG";
-my $pbver = "PBVER";
-my $pbtag = "PBTAG";
-my $pbrev = "PBREV";
-my $pbproj = "PBPROJ";
-my $pbrepo = "PBREPO";
+my %pb;
+$pb{'pkg'} = "PBPKG";
+$pb{'ver'} = "PBVER";
+$pb{'tag'} = "PBTAG";
+$pb{'rev'} = "PBREV";
+$pb{'proj'} = "PBPROJ";
+$pb{'date'} = "PBDATE";
+$pb{'repo'} = "PBREPO";
 
 # Export documentation to generate what is needed
 
 # Action needs to be pbinit
-my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($pbproj,undef,"pbinit");
+my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($pb{'proj'},undef,"pbinit");
 my ($scheme,$uri) = pb_cms_init(undef);
 
@@ -23 +25 @@
 # should call filter_file here
 
-my $ptr = pb_get_filters($pbpkg);
-pb_filter_file_inplace($ptr,"mindi.8",$pbpkg,$pbver,$pbtag,$pbrev,"","",$pbproj,$pbrepo);
+my $ptr = pb_get_filters($pb{'pkg'});
+pb_filter_file_inplace($ptr,"mindi.8",\%pb);

projects/mondorescue/pbconf/branches/2.2.7/mondo/pbinit

@@ -12 +12 @@
 
 system("./bootstrap");
-pb_mkdir_p("docs/entmp");
-pb_mkdir_p("docs/mantmp");
 pb_mkdir_p("docs/en");
 pb_mkdir_p("docs/man");
-my $pb->{'pkg'} = "PBPKG";
-my $pb->{'ver'} = "PBVER";
-my $pb->{'tag'} = "PBTAG";
-my $pb->{'rev'} = "PBREV";
-my $pb->{'proj'} = "PBPROJ";
-my $pb->{'repo'} = "PBREPO";
+my %pb;
+$pb{'pkg'} = "PBPKG";
+$pb{'ver'} = "PBVER";
+$pb{'tag'} = "PBTAG";
+$pb{'rev'} = "PBREV";
+$pb{'proj'} = "PBPROJ";
+$pb{'date'} = "PBDATE";
+$pb{'repo'} = "PBREPO";
 
 # Action needs to be pbinit
-my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($pb->{'proj'},undef,"pbinit");
+my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($pb{'proj'},undef,"pbinit");
 my ($scheme,$uri) = pb_cms_init(undef);
 
-pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/mondoarchive.8","docs/mantmp");
-pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/mondorestore.8","docs/mantmp");
+pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/mondoarchive.8","docs/man");
+pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/mondorestore.8","docs/man");
 pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/images","docs/en/images");
 pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/fdl.sgml","docs/en");
-pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/mondorescue-howto.sgml","docs/entmp");
+pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/mondorescue-howto.sgml","docs/en");
 pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/mondorescue-howto.dsl","docs/en");
 pb_cms_export($uri,"$ENV{'PBDIR'}/mondo-doc/Makefile.howto","docs/en");
 # should call filter_file here
 
-my $ptr = pb_get_filters($pb->{'pkg'});
-foreach my $f (<docs/mantmp/*>) {
-    pb_filter_file("$f",$ptr,"docs/man/".basename($f),\%pb);
+my $ptr = pb_get_filters($pb{'pkg'});
+foreach my $f ((<docs/man/*.8>)(<docs/en/*.sgml>)) {
+    pb_filter_file_inplace($ptr,$f,\%pb);
 }
-foreach my $f (<docs/entmp/*>) {
-    pb_filter_file("$f",$ptr,"docs/en/".basename($f),\%pb);
-}
-pb_rm_rf("docs/entmp");
-pb_rm_rf("docs/mantmp");
 
 system("cd docs/en ; make -f Makefile.howto mondorescue-howto.pdf mondorescue-howto.html");

projects/mondorescue/pbconf/branches/2.2.7/mondorescue.pb

@@ -47 +47 @@
 extpkgdir mondo-rescue = mondo
 
+# Website management and delivery
+webdir mondorescue = website
+websshhost mondorescue = www.mondorescue.org
+websshlogin mondorescue = bruno
+websshdir mondorescue = /mondo/www/html/mondo
+websshport mondorescue = 22
+
 # Hash of valid version names
 version mondorescue = devel,stable
@@ -56 +63 @@
 filteredfiles mindi = rootfs/sbin/init,mindi,install.sh
 filteredfiles mindi-busybox = Makefile
-filteredfiles mondo-website = top.shtml
+filteredfiles website = top.shtml