Changeset 452 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Env.pm

Timestamp:

May 27, 2008, 1:46:52 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Make newproj action work again
• Add pb_cms_add function
• Change interface of pb_cms_checkin (third param)

File:

• devel/pb/lib/ProjectBuilder/Env.pm (modified) (5 diffs)

devel/pb/lib/ProjectBuilder/Env.pm

@@ -168 +168 @@
 
 pb_log(2,"PBDEFDIR: $ENV{'PBDEFDIR'}\n");
+
+# Put under CMS the PBPROJ dir
+if (defined $pbinit) {
+    if (! -d "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") {
+        pb_mkdir_p("$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") || die "Unable to recursively create $ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
+    }
+    pb_cms_add($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}");
+}
+
 #
 # Set delivery directory
@@ -212 +221 @@
 # return values in that case are useless
 #
-if (($action =~ /^cms2/) || ($action =~ /^newver$/) || ($action =~ /^pbinit$/)) {
+if (($action =~ /^cms2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/)) {
 
     #
@@ -240 +249 @@
             }
             closedir(DIR);
-            die "No directory found under $ENV{'PBCONFDIR'}" if (not defined $ENV{'PBROOTDIR'});
             pb_log(1,"WARNING: no pbroot defined, using $ENV{'PBROOTDIR'}\n");
             pb_log(1,"         Please use -r release if you want to use another release\n");
+            die "No directory found under $ENV{'PBCONFDIR'}" if (not defined $ENV{'PBROOTDIR'});
         } else {
             my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc","pbroot");
@@ -318 +327 @@
     } else {
         if (defined $pbinit) {
-            my $ptr = pb_get_pkg();
-            my @pkgs = @$ptr;
+            my @pkgs = @ARGV;
             @pkgs = ("pkg1") if (not @pkgs);
     
@@ -837 +845 @@
                 pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/pbfilter") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pbfilter";
     
-                pb_log(0,"\nDo not to forget to commit the pbconf directory in your CMS if needed\n");
             }
+            pb_cms_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
+            pb_cms_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$pbinit);
         } else {
             die "Unable to open $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";