From 1590358de434eebb8424191bc2c7b92d2d9aac16 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 24 Jun 2009 19:27:33 +0000
Subject: [PATCH] Ignore any RULES value in the RELEASE files.

---
 src/tools/convertRelease.pl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/tools/convertRelease.pl b/src/tools/convertRelease.pl
index 9f6a94fcf..b9774bd3a 100755
--- a/src/tools/convertRelease.pl
+++ b/src/tools/convertRelease.pl
@@ -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;
             }