Changeset 417 in ProjectBuilder for devel/pb/lib

Timestamp:

Apr 27, 2008, 1:18:10 AM (18 years ago)

Author:

Bruno Cornec

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/lib/ProjectBuilder

Files:

• Env.pm (modified) (3 diffs)
• Filter.pm (modified) (9 diffs)

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");