Changeset 105 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm

Timestamp:

Sep 4, 2007, 10:14:02 AM (17 years ago)

Author:

Bruno Cornec

Message:

Preparing work on VM

File:

• devel/pb/lib/ProjectBuilder/Base.pm (modified) (3 diffs)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -82 +82 @@
     # Valid version names (optional)
     # List of files to filter (optional)
-    my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles");
+    my ($defpkgdir, $extpkgdir, $version, $filteredfiles, $pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles","projver","projtag");
     print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1);
@@ -103 +103 @@
 
 #
-# Set temp directory
-#
-if (not defined $ENV{'TMPDIR'}) {
-    $ENV{'TMPDIR'}="/tmp";
-}
-$ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
-
-#
 # Get global Version/Tag
 #
-my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","projver","projtag");
 
 if (not defined $ENV{'PBVER'}) {
@@ -132 +123 @@
 }
 die "Invalid tag name $ENV{'PBTAG'} in $ENV{'PBCONF'}/$proj.pb" if ($ENV{'PBTAG'} !~ /[0-9.]+/);
+
+#
+# Set temp directory
+#
+if (not defined $ENV{'TMPDIR'}) {
+    $ENV{'TMPDIR'}="/tmp";
+}
+$ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
 
 #