Changeset 2022 in ProjectBuilder for devel/pb

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/lib/ProjectBuilder/CMS.pm (modified) (2 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -88 +88 @@
 my $tmp = $ENV{'PBROOTDIR'};
 $tmp =~ s|^$ENV{'PBCONFDIR'}/||;
+# If no subdir, then replace again
+$tmp =~ s|^$ENV{'PBCONFDIR'}||;
 
 #
@@ -94 +96 @@
 my $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp";
 $turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(file)|(git)\b/o);
-# gut svn is like svn
+# git svn is like svn
 $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp"  if ($scheme =~ /^git\+svn/o);
 pb_vcs_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);