Changeset 2260 in ProjectBuilder

Timestamp:

Aug 30, 2017, 5:07:41 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix pbroot handling for git+svn (test was wrong)

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (3 diffs)
• pb/lib/ProjectBuilder/Filter.pm (modified) (1 diff)

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

@@ -377 +377 @@
         $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}/$ENV{'PBROOTDIR'}" if ($ENV{'PBROOTDIR'} !~ /^\//);
         # If git, then versions are in branch not in dirs, except for git+svn
-        $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}" if (($scheme =~ /^git/) && ($scheme =~ /svn/));
+        $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}" if (($scheme =~ /^git/) && ($scheme !~ /svn/));
         pb_mkdir_p($ENV{'PBROOTDIR'}) if (defined $pbinit);
         die "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});
@@ -384 +384 @@
 
     # Adds that conf file to the list to consider
-    pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
+    if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") {
+        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
+    } elsif (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") {
+        pb_conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
+        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
+    }
 
     return if ($action =~ /^(newver|getconf|setupve)$/);
@@ -435 +440 @@
         }
         die "Invalid tag name $ENV{'PBPROJTAG'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml" if ($ENV{'PBPROJTAG'} !~ /[0-9.]+/);
-    
-    
+
         if (not defined $ENV{'PBPACKAGER'}) {
             if ((defined $pbpackager) && (defined $pbpackager->{$ENV{'PBPROJ'}})) {

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -95 +95 @@
         my $fyml = $f;
         $fyml =~ s/\.pbf/.yml/;
-        pb_update_conf_v0($f,$fyml);
+        pb_conf_update_v0($f,$fyml);
         my ($pburl) = pb_conf_get("pburl");
         my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});