Changeset 2214 in ProjectBuilder

Timestamp:

Mar 14, 2017, 2:54:00 AM (7 years ago)

Author:

Bruno Cornec

Message:

Revert most of rev [2204]

There was an error on the directory considered for PBPRJDIR and PBDEFDIR/PBPROJ.
Back to normal now, as well as the case of pbinit files which was also broken

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (8 diffs)
• pbtest/bin/pbtest (modified) (1 diff)

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

@@ -171 +171 @@
 # That's always the environment variable that will be used
 $ENV{'PBPROJ'} = $proj;
-pb_log(2,"PBPROJ: $ENV{'PBPROJ'}\n");
+pb_log(1,"PBPROJ: $ENV{'PBPROJ'}\n");
 
 if (not defined ($pbconf{$ENV{'PBPROJ'}})) {
@@ -203 +203 @@
   ---------------------------------------------                ----------
   *      *        *       |        |          |                *        *
- tag    dev    pbconf    ...    bpbuild  pbdelivery PBCONFDIR dev      tag                  
+ tag    dev    pbconf    ...    pbbuild  pbdelivery PBCONFDIR dev      tag                  
   |               |                           |     PBDESTDIR           |
   ---          ------                        pbrc   PBBUILDDIR       -------
@@ -244 +244 @@
 # Expand potential env variable in it
 $ENV{PBDEFDIR} = pb_path_expand($ENV{PBDEFDIR});
-pb_log(2,"PBDEFDIR: $ENV{'PBDEFDIR'}\n");
+pb_log(1,"PBDEFDIR: $ENV{'PBDEFDIR'}\n");
 
 # Need to do that earlier as it's used potentialy in pb_vcs_add
@@ -264 +264 @@
 $ENV{PBPROJDIR} = pb_path_expand($ENV{PBPROJDIR});
 
+my $pbconfpath = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
+
 # Put under CMS the PBPROJ dir
 if ($action =~ /^newproj$/) {
-    if (! -d "$ENV{'PBPROJDIR'}") {
+    if (! -d "$pbconfpath") {
         # TODO: There is also the need to do 
-        # svn import svn://repo "$ENV{'PBPROJDIR'}
+        # svn import svn://repo "$pbconfpath
         # in case it doesn't exist there
-        pb_mkdir_p("$ENV{'PBPROJDIR'}");
+        pb_mkdir_p("$pbconfpath");
     }
-    pb_vcs_add($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBPROJDIR'}");
+    pb_vcs_add($pbconf{$ENV{'PBPROJ'}},"$pbconfpath");
 }
 
@@ -278 +280 @@
 # Set delivery directory
 #
-$ENV{'PBDESTDIR'}="$ENV{'PBPROJDIR'}/pbdelivery";
-
-pb_log(2,"PBDESTDIR: $ENV{'PBDESTDIR'}\n");
+$ENV{'PBDESTDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbdelivery";
+
+pb_log(1,"PBDESTDIR: $ENV{'PBDESTDIR'}\n");
 #
 # Removes all directory existing below the delivery dir 
-# as they are temp dir only except when called from newproj
+# as they are temp dir only except when called from a pbinit script
 # 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'}) && (not defined $pbinit)) {
+if ((-d $ENV{'PBDESTDIR'}) && ($action !~ /pbinit/)) {
     opendir(DIR,$ENV{'PBDESTDIR'}) || die "Unable to open directory $ENV{'PBDESTDIR'}: $!";
     foreach my $d (readdir(DIR)) {
@@ -304 +306 @@
 # Set build directory
 #
-$ENV{'PBBUILDDIR'}="$ENV{'PBPROJDIR'}/pbbuild";
+$ENV{'PBBUILDDIR'}="$pbconfpath/pbbuild";
 if (! -d "$ENV{'PBBUILDDIR'}") {
     pb_mkdir_p($ENV{'PBBUILDDIR'});
 }
 
-pb_log(2,"PBBUILDDIR: $ENV{'PBBUILDDIR'}\n");
+pb_log(1,"PBBUILDDIR: $ENV{'PBBUILDDIR'}\n");
 
 return if ($action =~ /^clean$/);
@@ -318 +320 @@
 #
 
-if ($action =~ /^(cms2|sbx2|newver|newproj|announce|checkssh|cleanssh|getconf|setupve)/) {
+if ($action =~ /^(cms2|sbx2|newver|newproj|pbinit|announce|checkssh|cleanssh|getconf|setupve)/) {
 
     #
     # Check pbconf cms compliance
     #
-    pb_vcs_compliant("pbconfdir",'PBCONFDIR',"$ENV{'PBPROJDIR'}/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
+    pb_vcs_compliant("pbconfdir",'PBCONFDIR',"$pbconfpath/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
     my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbconf{$ENV{'PBPROJ'}});
 
@@ -1246 +1248 @@
             }
             pb_vcs_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
-            my $msg = "updated to ".basename("$ENV{'PBPROJDIR'}");
+            my $msg = "updated to ".basename("$pbconfpath");
             $msg = "Project $ENV{'PBPROJ'} creation" if (defined $pbinit);
-            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBPROJDIR'}",$msg);
+            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$pbconfpath",$msg);
         } else {
             pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.pb in it\n");

devel/pbtest/bin/pbtest

@@ -377 +377 @@
 
 # test also with MondoRescue
-#sudopbtest b -p mondorescue -r branches/3.3 cms2pkg
+sudopbtest "pb -p mondorescue -r branches/3.3 cms2pkg"
+# and python-redfish
+sudopbtest "pb -p python-redfish sbx2pkg"
 
 # cleanup