Changeset 415 in ProjectBuilder

Timestamp:

Apr 26, 2008, 2:45:36 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds support for a build system conf file under $vmpath/.pbrc or $vepath/.pbrc
• Fix .pm modes

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (5 diffs)
• pb/bin/pb (modified) (8 diffs)
• pb/lib/ProjectBuilder/CMS.pm (modified) (1 prop)
• pb/lib/ProjectBuilder/Changelog.pm (modified) (1 prop)
• pb/lib/ProjectBuilder/Filter.pm (modified) (1 prop)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -60 +60 @@
 sub pb_conf_init {
 
+pb_log(2,"DEBUG: pb_conf_init with ".Dumper(@_)."\n");
 @pbconffiles = @_;
 }
@@ -71 +72 @@
 sub pb_conf_add {
 
-my $f = shift;
-
-push(@pbconffiles,"$f");
+pb_log(2,"DEBUG: pb_conf_add with ".Dumper(@_)."\n");
+push(@pbconffiles,@_);
 }
 
@@ -220 +220 @@
 my $p2;
 
-pb_log(2,"DEBUG: pb_conf_get param1: ".Dumper(@ptr1)."\n");
-pb_log(2,"DEBUG: pb_conf_get param2: ".Dumper(@ptr2)."\n");
+pb_log(2,"DEBUG: pb_conf_get $conffile: ".Dumper(@ptr1)."\n");
+pb_log(2,"DEBUG: pb_conf_get input: ".Dumper(@ptr2)."\n");
 
 foreach my $i (0..$#param) {
@@ -229 +229 @@
     # in order to mask what could be defined already in ptr2
     if (not defined $p2) {
+        # exit if no p1 either
+        last if ((not defined $p1) || (not defined $ENV{'PBPROJ'}));
         # No ref in p2 so use p1
         $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if ((not defined $p1->{$ENV{'PBPROJ'}}) && (defined $p1->{'default'}));
@@ -261 +263 @@
     $ptr1[$i] = $p1;
 }
-pb_log(2,"DEBUG: pb_conf_get param ptr1: ".Dumper(@ptr1)."\n");
+pb_log(2,"DEBUG: pb_conf_get output: ".Dumper(@ptr1)."\n");
 return(\@ptr1);
 }

devel/pb/bin/pb

@@ -768 +768 @@
     my $dir = "sshdir";
     my $port = "sshport";
-    my $tmout = "sshtmout";
-    my $path = "sshpath";
     my $conf = "sshconf";
     my $rebuild = "sshrebuild";
+    my $tmout = "vmtmout";
+    my $path = "vmpath";
     if (($cmt eq "vm") || ($cmt eq "Script")) {
         $login = "vmlogin";
@@ -825 +825 @@
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc";
+        # Adds conf file used for final delivery
+        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
     } elsif ($cmt eq "Script") {
         $src="$src $ENV{'PBDESTDIR'}/pbscript";
@@ -850 +852 @@
     pb_log(0,"Sources handled ($cmt): $src\n");
     pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf))."\n");
-    my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf) = pb_conf_get($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf);
+    my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath) = pb_conf_get($host,$login,$dir,$port,$tmout,$path);
+    my ($vrebuild,$veconf) = pb_conf_get_if($rebuild,$conf);
     pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n");
     # Not mandatory
@@ -1001 +1004 @@
         die "-i iso parameter needed" if (((not defined $iso) || ($iso eq "")) && ($create != 0));
 
-        my ($ptr,$vmopt,$vmport,$vmpath,$vmtmout,$vmsize) = pb_conf_get("vmtype","vmopt","vmport","vmpath","vmtmout","vmsize");
+        my ($ptr,$vmopt,$vmpath,$vmport,$vmtmout,$vmsize) = pb_conf_get("vmtype","vmopt","vmpath","vmport","vmtmout","vmsize");
 
         my $vmtype = $ptr->{$ENV{'PBPROJ'}};
@@ -1067 +1070 @@
     } else {
         # Get VE context
-        my ($ptr,$vepath,$vetmout,$verebuild,$veconf) = pb_conf_get("vetype","vepath","vetmout","verebuild","veconf");
+        my ($ptr,$vetmout,$vepath,$verebuild,$veconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
@@ -1171 +1174 @@
     my ($scheme2,$uri) = pb_cms_init($pbinit);
 
-    my ($pbconf) = pb_conf_read("$ENV{'PBETC'}","pbconfurl");
+    my ($pbconf) = pb_conf_get("pbconfurl");
     $uri = $pbconf->{$ENV{'PBPROJ'}};
     my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
@@ -1668 +1671 @@
 # and use its content
 #
-my ($pbconf) = pb_conf_read("$ENV{'PBETC'}","pbconfurl");
+my ($pbconf) = pb_conf_get("pbconfurl");
 pb_log(2,"DEBUG pbconfurl: ".Dumper($pbconf)."\n");
 
@@ -1691 +1694 @@
     die "Please create a pbconfurl reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n";
 }
+
+# Adds a potential conf file now as it's more 
+# important than the project conf file
+my ($vmpath,$vepath) = pb_conf_get("vmpath","vepath");
+pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc");
+pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc");
 
 #