epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Ignore any RULES value in the RELEASE files.

Browse Source
This commit is contained in:
Andrew Johnson
2009-06-24 19:27:33 +00:00
parent c1c8c914db
commit 1590358de4
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/convertRelease.pl
View File

@@ -104,7 +104,7 @@ EOF
# List the module names defined in RELEASE* files
#
sub releaseTops {
my @includes = grep !/^(TOP|TEMPLATE_TOP)$/, @apps;
my @includes = grep !m/^ (TOP | TEMPLATE_TOP) $/x, @apps;
print join(' ', @includes), "\n";
}
@@ -120,7 +120,7 @@ sub dllPath {
}
sub binDirs {
my @includes = grep !/^TEMPLATE_TOP$/, @apps;
my @includes = grep !m/^ (RULES | TEMPLATE_TOP) $/x, @apps;
my @path;
foreach my $app (@includes) {
my $path = $macros{$app} . "/bin/$arch";
@@ -136,7 +136,7 @@ sub binDirs {
#
sub cdCommands {
die "Architecture not set (use -a option)" unless ($arch);
my @includes = grep !/^TEMPLATE_TOP$/, @apps;
my @includes = grep !m/^(RULES | TEMPLATE_TOP)$/x, @apps;
unlink($outfile);
open(OUT,">$outfile") or die "$! creating $outfile";
@@ -168,7 +168,7 @@ sub cdCommands {
#
sub envPaths {
die "Architecture not set (use -a option)" unless ($arch);
my @includes = grep !/^TEMPLATE_TOP$/, @apps;
my @includes = grep !m/^ (RULES | TEMPLATE_TOP) $/x, @apps;
unlink($outfile);
open(OUT,">$outfile") or die "$! creating $outfile";
@@ -192,6 +192,7 @@ sub envPaths {
#
sub checkRelease {
my $status = 0;
delete $macros{RULES};
delete $macros{TOP};
delete $macros{TEMPLATE_TOP};
@@ -208,9 +209,9 @@ sub checkRelease {
abs_path($macros{$parent}) ne abs_path($ppath)) {
print "\n" unless ($status);
print "Definition of $parent conflicts with $app support.\n";
print "In this application configure/RELEASE defines\n";
print "In this application a RELEASE file defines\n";
print "\t$parent = $macros{$parent}\n";
print "but $app at $path has\n";
print "but $app at $path defines\n";
print "\t$parent = $ppath\n";
$status = 1;
}