Changeset 417

Timestamp:

04/27/08 01:18:10 (5 years ago)

Author:

bruno

Message:

• Reintegrates $pbproj as variable for filter functions (needed for PBPROJ expansion)
• Fix pbinit using perl functions support
• Adds a virtual pbinit action support in pb_env_init

Location:

devel/pb

Files:

• Makefile.PL (modified) (1 diff)
• bin/pb (modified) (4 diffs)
• lib/ProjectBuilder/Env.pm (modified) (3 diffs)
• lib/ProjectBuilder/Filter.pm (modified) (9 diffs)

devel/pb/Makefile.PL

@@ -20 +20 @@
     MAN3PODS      => {  'lib/ProjectBuilder/CMS.pm' => '$(INST_MAN3DIR)/ProjectBuilder::CMS.$(MAN3EXT)',
                         'lib/ProjectBuilder/Filter.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Filter.$(MAN3EXT)',
-                        'lib/ProjectBuilder/Changelog.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Changelog.$(MAN3EXT)', },
+                        'lib/ProjectBuilder/Changelog.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Changelog.$(MAN3EXT)',
+                        'lib/ProjectBuilder/Env.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Env.$(MAN3EXT)', },
 );

devel/pb/bin/pb

@@ -552 +552 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles,values %pkgfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog);
+                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog,$ENV{'PBPROJ'});
                 }
             }
@@ -574 +574 @@
         if (defined $filteredfiles->{$pbpkg}) {
             foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
+                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'});
                 $liste = "$f $liste";
             }
@@ -582 +582 @@
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
+            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'});
             chmod 0755,"$ENV{'PBTMP'}/pbinit";
             pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit");
@@ -824 +824 @@
         }
     }
+    # Adds conf file for availanility of conf elements
+    pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
+
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc";
-        # Adds conf file used for final delivery
-        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
     } elsif ($cmt eq "Script") {
         $src="$src $ENV{'PBDESTDIR'}/pbscript";

devel/pb/lib/ProjectBuilder/Env.pm

@@ -20 +20 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
+use ProjectBuilder::CMS;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -174 +175 @@
 #
 # Removes all directory existing below the delivery dir 
-# as they are temp dir only
+# as they are temp dir only except when called from pbinit
 # Files stay and have to be cleaned up manually if needed
 # those files serves as communication channels between pb phases
 # Removing them prevents a following phase to detect what has been done before
 #
-if (-d $ENV{'PBDESTDIR'}) {
+if ((-d $ENV{'PBDESTDIR'}) && ($action !~ /pbinit/)) {
     opendir(DIR,$ENV{'PBDESTDIR'}) || die "Unable to open directory $ENV{'PBDESTDIR'}: $!";
     foreach my $d (readdir(DIR)) {
@@ -210 +211 @@
 # return values in that case are useless
 #
-if (($action =~ /^cms2/) || ($action =~ /^newver$/)) {
+if (($action =~ /^cms2/) || ($action =~ /^newver$/) || ($action =~ /^pbinit$/)) {
 
     #

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -121 +121 @@
 This function applies all filters to pb build files.
 
-It takes 15 parameters.
+It takes 15 parameters. To be filtered a variable has to be passed to that function.
 
 The first parameter is the file to filter.
@@ -137 +137 @@
 The thirteenth parameter is the packager name.
 The fourteenth parameter is the changelog.
+The fifteenth parameter is the project.
 
 =cut
@@ -157 +158 @@
 my $pbpackager = shift;
 my $chglog = shift || undef;
+my $pbproj = shift;
 
 pb_log(2,"DEBUG: From $f to $destfile\n");
@@ -192 +194 @@
 This function applies all filters to a file in place.
 
-It takes 8 parameters.
+It takes 9 parameters.
 
 The first parameter is the pointer on the hash of filters.
@@ -202 +204 @@
 The seventh parameter is the current date.
 The eighth parameter is the packager name.
+The nineth parameter is the project name.
 
 =cut
@@ -217 +220 @@
 my $pbdate=shift;
 my $pbpackager=shift;
+my $pbproj=shift;
 
 my $cp = "$ENV{'PBTMP'}/".basename($destfile);
 copy($destfile,$cp) || die "Unable to create $cp";
 
-pb_filter_file($cp,$ptr,$destfile,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
+pb_filter_file($cp,$ptr,$destfile,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager,$pbproj);
 unlink $cp;
 }
@@ -229 +233 @@
 This function applies all filters on a file to generate a new filtered one.
 
-It takes 9 parameters.
+It takes 10 parameters. To be filtered a variable has to be passed to that function.
 
 The first parameter is the original file to filter.
@@ -240 +244 @@
 The eighth parameter is the current date.
 The nineth parameter is the packager name.
+The tenth parameter is the project name.
 
 =cut
@@ -257 +262 @@
 my $pbdate=shift;
 my $pbpackager=shift;
+my $pbproj=shift;
 
 pb_log(2,"DEBUG: From $f to $destfile\n");