Changeset 2305 in ProjectBuilder for devel/pb-modules

Timestamp:

Sep 6, 2017, 7:36:28 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix newproj for git

handle the case now in the vcs_compliant function

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Env.pm (modified) (2 diffs)
• VCS.pm (modified) (1 diff)

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

@@ -260 +260 @@
 
 my $pbconfpath = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
-
-# Put under CMS the PBPROJ dir
-if ($action =~ /^newproj$/) {
-    if (! -d "$pbconfpath") {
-        # TODO: There is also the need to do 
-        # svn import svn://repo "$pbconfpath
-        # in case it doesn't exist there
-        pb_mkdir_p("$pbconfpath");
-    }
-    pb_vcs_add($pbconf{$ENV{'PBPROJ'}},"$pbconfpath");
-}
 
 #
@@ -1311 +1300 @@
             }
             pb_vcs_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
-            my $msg = "updated to ".basename("$pbconfpath");
-            $msg = "Project $ENV{'PBPROJ'} creation" if (defined $pbinit);
-            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$pbconfpath",$msg);
+            my $msg = "Project $ENV{'PBPROJ'} creation";
+            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBCONFDIR'}",$msg);
         } else {
             pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.yml in it\n");

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

@@ -694 +694 @@
     pb_log(1,"pb_vcs_compliant useless\n");
     return;
-} elsif (defined $pbinit) {
-    pb_mkdir_p("$ENV{$envar}");
-} elsif (! -d "$ENV{$envar}") {
+} elsif ((defined $pbinit) || (! -d "$ENV{$envar}")) {
+    my $exportdir = $ENV{$envar};
     # 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
-    if ((basename($uri) ne basename($ENV{$envar})) && ($scheme !~ /^git/)) {
-        $uri .= "/".basename($ENV{$envar})
+    if ((basename($uri) ne basename($exportdir)) && ($scheme !~ /git/)) {
+        $uri .= "/".basename($exportdir);
+    }
+    if ((defined $pbinit) && ($scheme =~ /git/)) {
+        # If initializing remove the potential pbconf part if we treat pbconfdir
+        $exportdir =~ s|pbconf[/]*||;
     }
     pb_log(1,"Checking out $uri\n");
     # Create structure and remove end dir before exporting
-    pb_mkdir_p("$ENV{$envar}");
-    pb_rm_rf($ENV{$envar});
-    pb_vcs_checkout($scheme,$uri,$ENV{$envar});
+    pb_mkdir_p("$exportdir");
+    pb_rm_rf($exportdir);
+    pb_vcs_checkout($scheme,$uri,$exportdir);
+    if ((defined $pbinit) && ($scheme =~ /git/)) {
+        # And now created the potentially missin gpbconf dir
+        pb_mkdir_p("$exportdir/pbconf");
+    }
 } else {
     pb_log(1,"$uri found locally, checking content\n");