Changeset 107 in ProjectBuilder

Timestamp:

Sep 5, 2007, 11:34:22 PM (18 years ago)

Author:

Bruno Cornec

Message:

Change intereface of pb_env_init to allow Base.pm to be completely standalone.
Needded to be called from pbinit in projects, such as mondo

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• lib/ProjectBuilder/Base.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -23 +23 @@
 use vars qw (%defpkgdir %extpkgdir %filteredfiles %pbrc $debug $LOG);
 
-$debug = 0;                 # Debug level
-$LOG = *STDOUT;             # Where to log
 use lib qw (lib);
 use ProjectBuilder::Distribution qw (pb_distro_init);
@@ -83 +81 @@
 # Handles project name if any
 if (defined $opts{'p'}) {
-    $ENV{'PBPROJ'} = pb_env_init($opts{'p'});
+    ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $defpkgdir, $extpkgdir) 
+    = pb_env_init($opts{'p'});
 } else {
-    $ENV{'PBPROJ'} = pb_env_init();
+    ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $defpkgdir, $extpkgdir) 
+    = pb_env_init();
 }
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -21 +21 @@
 my $ver;
 my $tag;
+
+# For the moment not dynamic
+my $debug = 0;                  # Debug level
+my $LOG = *STDOUT;              # Where to log
 
 #
@@ -158 +162 @@
 
 umask 0022;
-return($proj);
+return($proj,$debug,$LOG,\%pbrc, \%filteredfiles, \%defpkgdir, \%extpkgdir);
 }