Changeset 17 in ProjectBuilder for devel/pb/lib

Timestamp:

Jul 30, 2007, 8:03:52 PM (17 years ago)

Author:

Bruno Cornec

Message:

Still in dev. phase - lots of changes - near the end for cms2build

Location:

devel/pb/lib

Files:

• changelog.pm (added)
• common.pm (modified) (2 diffs)
• pb.pm (modified) (4 diffs)

devel/pb/lib/common.pm

@@ -15 +15 @@
 use File::Path;
 use File::Temp qw /tempdir/;
-use vars qw (%defpkgdir %extpkgdir %version);
+use vars qw (%defpkgdir %extpkgdir %version %param);
 use Data::Dumper;
 
@@ -43 +43 @@
 # Check content
 #
-die "PBROOT doesn't exist in $ENV{'PBETC'}/$proj.pb" if (not (defined $ENV{'PBROOT'}));
+if (not defined $param{"pbroot"}) {
+    die "param pbroot doesn't exist in $ENV{'PBETC'}/$proj.pb";
+} else {
+    $ENV{'PBROOT'} = $param{"pbroot"}; 
+}
+if (defined $param{"cvsroot"}) {
+    $ENV{'CVSROOT'} = $param{"cvsroot"}; 
+}
+
 die "defpkgdir doesn't exist in $ENV{'PBETC'}/$proj.pb" if (not (defined %defpkgdir));
 

devel/pb/lib/pb.pm

@@ -11 +11 @@
 @ISA = qw(Exporter);
 # global vars are here
-@EXPORT_OK = qw(%defpkgdir %extpkgdir %version @filteredfiles &pb_init);
+@EXPORT_OK = qw(%defpkgdir %extpkgdir %version %param %filteredfiles &pb_init);
 use vars @EXPORT_OK;
-use AppConfig qw(ARGCOUNT_ONE ARGCOUNT_HASH ARGCOUNT_LIST EXPAND_ALL);
+use AppConfig qw(ARGCOUNT_HASH);
 
 sub pb_init {
@@ -24 +24 @@
                             CREATE => 1,
                             DEBUG => 0,
+                            GLOBAL => {
+                                # Each conf item is a hash
+                                ARGCOUNT => AppConfig::ARGCOUNT_HASH
+                            }
                         });
-$config->define("pbroot" => { ARGCOUNT => ARGCOUNT_ONE, EXPAND => EXPAND_ALL });
-$config->define("cvsroot" => { ARGCOUNT => ARGCOUNT_ONE });
-$config->define("defpkgdir" => { ARGCOUNT => ARGCOUNT_HASH });
-$config->define("extpkgdir" => { ARGCOUNT => ARGCOUNT_HASH });
-$config->define("version" => { ARGCOUNT => ARGCOUNT_HASH });
-$config->define("filteredfiles" => { ARGCOUNT => ARGCOUNT_LIST });
-
 $config->file($conffile);
 
@@ -37 +34 @@
 # needs at least 2 levels of dir as in the upper 
 # other dirs will be created and used
-$ENV{'PBROOT'} = $config->get("pbroot") || die "Unable to find pbroot in $conffile";
-
-# If CVS, gives the way to login
-$ENV{'CVSROOT'} = $config->get("cvsroot");
+$ptr = $config->get("param");
+%param = %$ptr;
 
 # List of pkg to build by default
@@ -56 +51 @@
 # List of files to filter
 $ptr = $config->get("filteredfiles");
-@filteredfiles = @$ptr;
+%filteredfiles = %$ptr;
 
 }