ChangeLogTag:Wed Mar 28 11:55:39 2001 Steve Huston <shuston@riverace.com>

2 files changed, 41 insertions, 1 deletions

diff --git a/bin/auto_compile b/bin/auto_compile
index e17b67e253d..eea6cec93cb 100755
--- a/bin/auto_compile
+++ b/bin/auto_compile
@@ -423,8 +423,11 @@ foreach $i (@BUILD_LIST) {
 
     local $current_dir = $i;
     local $last_error = "";
+    local $this_error = 0;
+    local $this_warning = 0;
     while (<MAKE>) {
         chop;
+        $this_error = $this_warning = 0;
         if ($^O eq 'hpux'
             && m/^Warning:[ \t]+[0-9]+ future errors were detected/) {
             next;
@@ -438,6 +441,13 @@ foreach $i (@BUILD_LIST) {
         }
         if (m/error:/i || m/error /i
             || m/^make(\[[0-9]+\])?: \*\*\*/) {
+            $this_error = 1;
+        }
+        if ($^O eq 'aix'
+            && m/\d+-\d+ \([SI]\)/) {
+            $this_error = 1;
+        }
+        if ($this_error) {
             if ($last_error ne $current_dir
                 || STATUS eq "COMPILATION WARNING") {
               $STATUS = "COMPILATION ERROR";
@@ -448,6 +458,17 @@ foreach $i (@BUILD_LIST) {
         if (m/warning:/i
 	    || m/warning /i
 	    || m/Info: /i) {
+            $this_warning = 1;
+            if ($^O eq 'aix'
+                && m/^ld: \d+-\d+ WARNING: Duplicate symbol: .*ACE.*/) {
+                $this_warning = 0;
+            }
+        }
+        if ($^O eq 'aix'
+            && m/\d+-\d+ \(W\)/) {
+            $this_warning = 1;
+        }
+        if ($this_warning) {
           if ($last_error ne $current_dir) {
             if ($STATUS eq "OK") {
               $STATUS = "COMPILATION WARNING";
diff --git a/bin/make_pretty.pl b/bin/make_pretty.pl
index fdc6b87763f..8335fb505de 100755
--- a/bin/make_pretty.pl
+++ b/bin/make_pretty.pl
@@ -113,11 +113,19 @@ sub is_warning ()
     # Look for any warnings we should ignore
     return 3 if (/^LINK : warning LNK4089:/);
 
+    # For some reason, there's a false license warning
+    return 3 if (/\(W\).*Compilation will proceed shortly./);
+
+    # AIX reports a bazillion multiple defines when doing templates.
+    return 3 if ($^O eq 'aix'
+                 && m/^ld: \d+-\d+ WARNING: Duplicate symbol:/);
+
     # Look for lines that also should be color coded, but not counted
     # as warnings.
     return 2 if (/see declaration of/);
 
     # Look for warnings
+
     return 1 if ((/warning/i && !/ warning\(s\)/)
                  || /info: /i
                  || /^make.*\*\*\*/);
@@ -127,9 +135,12 @@ sub is_warning ()
         || /^.*\.inl: /
         || /^.*\.cpp: /
         || /^.*\.java: /) {
-      return 1;
+      return 1 if ($^O ne 'aix');
     }
 
+    # IBM's compilers don't say the word "warning" - check for their code
+    return 1 if ($^O eq 'aix' && m/\d+-\d+ \(W\)/);
+
     # didn't find anything
     return 0;
 }
@@ -143,6 +154,11 @@ sub is_error ()
 {
     # Look for any errors we should ignore
 
+    # AIX reports a bazillion multiple defines when doing templates; some
+    # have the word 'error' in the symbol name - ignore those.
+    return 0 if ($^O eq 'aix'
+                 && m/^ld: \d+-\d+ WARNING: Duplicate symbol:/);
+
     # Look for lines that also should be color coded, but not counted
     # as errors.
     return 2 if (/Types pointed to are unrelated/
@@ -164,6 +180,9 @@ sub is_error ()
                  || /^Fatal\:/
                  || /: fatal:/);
 
+    # Again, IBM's compilers speak in code langauge
+    return 1 if ($^O eq 'aix' && m/\d+-\d+ \([SI]\)/);
+
     # didn't find anything
     return 0;
 }