Changeset 2022 in ProjectBuilder

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

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (4 diffs)
• pb/lib/ProjectBuilder/CMS.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'});

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

@@ -447 +447 @@
 } elsif ($scheme =~ /^((hg)|(git))/o) {
     foreach my $d (@dir) {
-        pb_system("(cd $d && $vcscmd pull)", "Updating $d ");
+        pb_system("(cd $d && $vcscmd fetch)", "Updating $d ");
     }
 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
@@ -545 +545 @@
 my $l = undef;
 
-if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
+if ($scheme =~ /^((svn)|(cvs)|(svk)|(git))/o) {
     open(PIPE,"$vcscmd diff $dir |") || confess "Unable to get $vcscmd diff from $dir";
     $l = 0;
@@ -685 +685 @@
     # Either we have a version in the uri, and it should be the same
     # as the one in the envar. Or we should add the version to the uri
-    # # But not if it's git as it manages version branches internally
+    # But not if it's git as it manages version branches internally
     if ((basename($uri) ne basename($ENV{$envar})) && ($scheme !~ /^git/)) {
         $uri .= "/".basename($ENV{$envar})
@@ -704 +704 @@
         # remove schema from `git+file:` and `git+dir:` urls
         # TODO: handle query-parameters
-        $uri =~ s/^git\+(file|dir)://;
+        $uri =~ s/^git\+(file|dir|ssh):[\/]*//;
         # Expand potential env variable in it -- this is required due to the consistency check
         $uri =~ s/(\$ENV.+\})/$1/eeg;

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);