Changeset 2022 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Env.pm

Timestamp:

Dec 6, 2015, 3:46:51 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Improve git support where pbconf is upstream in the main directory of a simple project

File:

• devel/pb-modules/lib/ProjectBuilder/Env.pm (modified) (2 diffs)

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

@@ -309 +309 @@
     #
     pb_vcs_compliant("pbconfdir",'PBCONFDIR',"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
+    my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbconf{$ENV{'PBPROJ'}});
 
     # Check where is our PBROOTDIR (release tag name can't be guessed the first time)
@@ -327 +328 @@
         # transform in full path if relative
         $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}/$ENV{'PBROOTDIR'}" if ($ENV{'PBROOTDIR'} !~ /^\//);
+        # If git, then versions are in branch not in dirs.
+        $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}" if ($scheme =~ /^git/);
         pb_mkdir_p($ENV{'PBROOTDIR'}) if (defined $pbinit);
         die "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});