Changeset 417 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Env.pm

Timestamp:

Apr 27, 2008, 1:18:10 AM (16 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

File:

• devel/pb/lib/ProjectBuilder/Env.pm (modified) (3 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$/)) {
 
     #