Changeset 2258 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Env.pm
- Timestamp:
- Aug 30, 2017, 5:07:39 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Env.pm
r2257 r2258 235 235 * * * | | | * * 236 236 tag dev pbconf ... pbbuild pbdelivery PBCONFDIR dev tag 237 | | |PBDESTDIR |238 --- ------ pbrcPBBUILDDIR -------237 | | | PBDESTDIR | 238 --- ------ pbrc.yml PBBUILDDIR ------- 239 239 | | | | | 240 240 1.1 dev tag 1.0 1.1 PBDIR … … 246 246 ---------------------------------- 247 247 | | | | 248 pkg1 pbproj1. pbpbfilter pbcl248 pkg1 pbproj1.yml pbfilter pbcl 249 249 | 250 250 ----------------- … … 362 362 # 363 363 if (not defined $ENV{'PBROOTDIR'}) { 364 if (! -f ("$ENV{'PBDESTDIR'}/pbrc ")) {364 if (! -f ("$ENV{'PBDESTDIR'}/pbrc.yml")) { 365 365 $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}"; 366 366 pb_log(1,"WARNING: no pbroot defined, using $ENV{'PBROOTDIR'}\n"); … … 368 368 die "No directory found under $ENV{'PBCONFDIR'}" if (not defined $ENV{'PBROOTDIR'}); 369 369 } else { 370 my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc ","pbroot");370 my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc.yml","pbroot"); 371 371 # That's always the environment variable that will be used 372 die "Please remove inconsistent $ENV{'PBDESTDIR'}/pbrc " if ((not defined $pbroot) || (not defined $pbroot->{$ENV{'PBPROJ'}}));372 die "Please remove inconsistent $ENV{'PBDESTDIR'}/pbrc.yml" if ((not defined $pbroot) || (not defined $pbroot->{$ENV{'PBPROJ'}})); 373 373 $ENV{'PBROOTDIR'} = $pbroot->{$ENV{'PBPROJ'}}; 374 374 } … … 384 384 385 385 # Adds that conf file to the list to consider 386 pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");386 pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"); 387 387 388 388 return if ($action =~ /^(newver|getconf|setupve)$/); … … 394 394 my %supfiles = (); 395 395 396 if ((-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb") and (not defined $pbinit)) {396 if ((-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") and (not defined $pbinit)) { 397 397 398 398 # List of pkg to build by default (mandatory) … … 422 422 $ENV{'PBPROJVER'}=$pkgv->{$ENV{'PBPROJ'}}; 423 423 } else { 424 die "No projver found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb";424 die "No projver found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"; 425 425 } 426 426 } 427 die "Invalid version name $ENV{'PBPROJVER'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb" if (($ENV{'PBPROJVER'} !~ /[0-9.]+/) && (defined $version) && ($ENV{'PBPROJVER'} =~ /$version{$ENV{'PBPROJ'}}/));427 die "Invalid version name $ENV{'PBPROJVER'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml" if (($ENV{'PBPROJVER'} !~ /[0-9.]+/) && (defined $version) && ($ENV{'PBPROJVER'} =~ /$version{$ENV{'PBPROJ'}}/)); 428 428 429 429 if (not defined $ENV{'PBPROJTAG'}) { … … 431 431 $ENV{'PBPROJTAG'}=$pkgt->{$ENV{'PBPROJ'}}; 432 432 } else { 433 die "No projtag found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb";433 die "No projtag found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"; 434 434 } 435 435 } 436 die "Invalid tag name $ENV{'PBPROJTAG'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb" if ($ENV{'PBPROJTAG'} !~ /[0-9.]+/);436 die "Invalid tag name $ENV{'PBPROJTAG'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml" if ($ENV{'PBPROJTAG'} !~ /[0-9.]+/); 437 437 438 438 … … 441 441 $ENV{'PBPACKAGER'}=$pbpackager->{$ENV{'PBPROJ'}}; 442 442 } else { 443 die "No pbpackager found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb";443 die "No pbpackager found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"; 444 444 } 445 445 } … … 449 449 @pkgs = ("pkg1") if (not @pkgs); 450 450 451 open(CONF,"> $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb") || die "Unable to create $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";451 open(CONF,"> $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") || die "Unable to create $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"; 452 452 print CONF << "EOF"; 453 453 --- … … 1347 1347 pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$pbconfpath",$msg); 1348 1348 } else { 1349 pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}. pbin it\n");1349 pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.yml in it\n"); 1350 1350 pb_log(0," Please use -r release in order to be able to initialize your environment correctly\n"); 1351 die "Unable to open $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}. pb";1351 die "Unable to open $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"; 1352 1352 } 1353 1353 } … … 1359 1359 } else { 1360 1360 # Setup the variables from what has been stored at the end of cms2build 1361 my ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc ","pbroot");1361 my ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","pbroot"); 1362 1362 $ENV{'PBROOTDIR'} = $var->{$ENV{'PBPROJ'}}; 1363 1363 1364 ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc ","projver");1364 ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","projver"); 1365 1365 $ENV{'PBPROJVER'} = $var->{$ENV{'PBPROJ'}}; 1366 1366 1367 ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc ","projtag");1367 ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","projtag"); 1368 1368 $ENV{'PBPROJTAG'} = $var->{$ENV{'PBPROJ'}}; 1369 1369 1370 ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc ","pbpackager");1370 ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","pbpackager"); 1371 1371 $ENV{'PBPACKAGER'} = $var->{$ENV{'PBPROJ'}}; 1372 1372
Note:
See TracChangeset
for help on using the changeset viewer.