Changeset 2425 in ProjectBuilder

Timestamp:

Sep 1, 2019, 2:51:25 AM (5 years ago)

Author:

Bruno Cornec

Message:

Fix directory structure creation in VCS and name by default package as project name

File:

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

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

@@ -396 +396 @@
         if (defined $pbinit) {
             my @pkgs = @ARGV;
-            @pkgs = ("pkg1") if (not @pkgs);
+            @pkgs = ("$ENV{'PBPROJ'}") if (not @pkgs);
     
+            # Case where the parent dir of PBROOTDIR isn't managed yet in VCS
+            pb_mkdir_p(dirname("$ENV{'PBROOTDIR'}"));
+            pb_vcs_add_if_not_in($pbconf{$ENV{'PBPROJ'}},dirname("$ENV{'PBROOTDIR'}"));
+            pb_mkdir_p("$ENV{'PBROOTDIR'}");
+            pb_vcs_add_if_not_in($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBROOTDIR'}");
+            my $msg = "Project $ENV{'PBPROJ'} structure creation";
+            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBROOTDIR'}",$msg);
             open(CONF,"> $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") || die "Unable to create $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml";
             print CONF << "EOF";
@@ -548 +555 @@
 #
 # Additional repository to add at build time
-#  addrepo:
+#  addbuildrepo:
 #    centos-5-x86_64: http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/centos/5/pb.repo
 #    centos-4-x86_64: http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el4.rf.x86_64.rpm,ftp://ftp.project-builder.org/centos/4/pb.repo
@@ -1295 +1302 @@
             }
             pb_vcs_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
-            my $msg = "Project $ENV{'PBPROJ'} creation";
+            $msg = "Project $ENV{'PBPROJ'} creation";
             pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBCONFDIR'}",$msg);
         } else {