Changeset 452 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Env.pm
- Timestamp:
- May 27, 2008, 1:46:52 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/lib/ProjectBuilder/Env.pm
r430 r452 168 168 169 169 pb_log(2,"PBDEFDIR: $ENV{'PBDEFDIR'}\n"); 170 171 # Put under CMS the PBPROJ dir 172 if (defined $pbinit) { 173 if (! -d "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") { 174 pb_mkdir_p("$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") || die "Unable to recursively create $ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}"; 175 } 176 pb_cms_add($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}"); 177 } 178 170 179 # 171 180 # Set delivery directory … … 212 221 # return values in that case are useless 213 222 # 214 if (($action =~ /^cms2/) || ($action =~ /^newver$/) || ($action =~ / ^pbinit$/)) {223 if (($action =~ /^cms2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/)) { 215 224 216 225 # … … 240 249 } 241 250 closedir(DIR); 242 die "No directory found under $ENV{'PBCONFDIR'}" if (not defined $ENV{'PBROOTDIR'});243 251 pb_log(1,"WARNING: no pbroot defined, using $ENV{'PBROOTDIR'}\n"); 244 252 pb_log(1," Please use -r release if you want to use another release\n"); 253 die "No directory found under $ENV{'PBCONFDIR'}" if (not defined $ENV{'PBROOTDIR'}); 245 254 } else { 246 255 my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc","pbroot"); … … 318 327 } else { 319 328 if (defined $pbinit) { 320 my $ptr = pb_get_pkg(); 321 my @pkgs = @$ptr; 329 my @pkgs = @ARGV; 322 330 @pkgs = ("pkg1") if (not @pkgs); 323 331 … … 837 845 pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/pbfilter") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pbfilter"; 838 846 839 pb_log(0,"\nDo not to forget to commit the pbconf directory in your CMS if needed\n");840 847 } 848 pb_cms_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'}); 849 pb_cms_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$pbinit); 841 850 } else { 842 851 die "Unable to open $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";
Note:
See TracChangeset
for help on using the changeset viewer.