ChangeLogTag:Thu Sep 7 12:07:14 2000 Ossama Othman <ossama@uci.edu>

4 files changed, 69 insertions, 34 deletions

diff --git a/bin/autoconf_compile b/bin/autoconf_compile
index 0f09fe8b33f..0163dfb6487 100755
--- a/bin/autoconf_compile
+++ b/bin/autoconf_compile
@@ -112,7 +112,7 @@ $REVISION='$Revision$ ';
 
 $disable_file = $LOGDIR . '/.disable';
 $histfile = $LOGDIR . '/history';
-$LOGBASE = POSIX::strftime("%b%d_%Y.log", localtime);
+$LOGBASE = POSIX::strftime("%b%d_%Y.txt", localtime);
 $LOGFILE = $LOGDIR . '/' . $LOGBASE;
 $HOST = `hostname`;
 chop $HOST;
@@ -243,6 +243,8 @@ if ($dont_update == 0) {
   print LOG "$CMD: starting checkout at ", $date, "\n";
   open(CVS, "cvs -q checkout -P $MODULE 2>&1 |")
     || mydie "cannot start checkout of $MODULE";
+#  open(CVS, "cvsup -g -L 2 -P m ace-supfile 2>&1 |")
+#    || mydie "cannot start checkout";
 
   $conflicts = 0;
   while (<CVS>) {
@@ -350,10 +352,10 @@ if ($pre_clean) {
 $MAKEFLAGS .= "";
 foreach $i (@BUILD_LIST) {
     $date = localtime;
-    print LOG "$CMD: ==================================================\n";
+    print LOG "$CMD: =============================================\n";
     print LOG "$CMD: make for $i started at ", $date, "\n";
     open(MAKE, "make -k $MAKEFLAGS -C $i 2>&1 |")
-	|| mydie "cannot start make for $i";
+        || mydie "cannot start make for $i";
 
     local $current_dir = $i;
     local $last_error = "";
@@ -365,35 +367,35 @@ foreach $i (@BUILD_LIST) {
         }
         print LOG $_, "\n";
 
-	if (m/^make(\[[0-9]+\])?: Entering directory /) {
-	    s/^make(\[[0-9]+\])?: Entering directory //;
-	    $current_dir = $_;
-	}
-	if (m/error:/i || m/error /i
-	    || m/^make(\[[0-9]+\])?: \*\*\*/) {
-	    if ($last_error ne $current_dir
-		|| STATUS eq "COMPILATION WARNING") {
-	      $STATUS = "COMPILATION ERROR";
-	      push @failures, "Error while compiling in $current_dir \n";
-	      $last_error = $current_dir;
-	    }
-	}
-	if (m/warning:/i || m/warning /i) {
-	  if ($last_error ne $current_dir) {
-	    if ($STATUS eq "OK") {
-	      $STATUS = "COMPILATION WARNING";
-	    }
-	    push @failures, "Warning while compiling in $current_dir\n";
-	    $last_error = $current_dir;
-	  }
-	}
+        if (m/^make(\[[0-9]+\])?: Entering directory /) {
+            s/^make(\[[0-9]+\])?: Entering directory //;
+            $current_dir = $_;
+        }
+        if (m/error:/i || m/error /i
+            || m/^make(\[[0-9]+\])?: \*\*\*/) {
+            if ($last_error ne $current_dir
+                || STATUS eq "COMPILATION WARNING") {
+              $STATUS = "COMPILATION ERROR";
+              push @failures, "Error while compiling in $current_dir \n";
+              $last_error = $current_dir;
+            }
+        }
+        if (m/warning:/i || m/warning /i) {
+          if ($last_error ne $current_dir) {
+            if ($STATUS eq "OK") {
+              $STATUS = "COMPILATION WARNING";
+            }
+            push @failures, "Warning while compiling in $current_dir\n";
+            $last_error = $current_dir;
+          }
+        }
     }
     if (close(MAKE) == 0) {
-	push @failures, "errors while running make in $i";
+        push @failures, "errors while running make in $i";
     }
     $date = localtime;
     print LOG "$CMD: make for $i finished at ", $date, "\n";
-    print LOG "$CMD: ==================================================\n\n";
+    print LOG "$CMD: =============================================\n\n";
 }
 
 if ($dont_run == 0) {
@@ -419,11 +421,42 @@ if ($dont_run == 0) {
     $run_error = 0;
     open(CHECK, "make -k $MAKEFLAGS -C $subdir check 2>&1 |");
 
+    local $current_dir = $i;
+    local $last_error = "";
     while (<CHECK>) {
-	print LOG $_;
+        chop;
+        if ($^O eq 'hpux'
+            && m/^Warning:[ \t]+[0-9]+ future errors were detected/) {
+            next;
+        }
+        print LOG $_, "\n";
+
+        if (m/^make(\[[0-9]+\])?: Entering directory /) {
+            s/^make(\[[0-9]+\])?: Entering directory //;
+            $current_dir = $_;
+        }
+        if (m/error:/i || m/error /i
+            || m/^make(\[[0-9]+\])?: \*\*\*/) {
+            if ($last_error ne $current_dir
+                || STATUS eq "COMPILATION WARNING") {
+              $STATUS = "COMPILATION ERROR";
+              push @failures, "Error while compiling in $current_dir \n";
+              $last_error = $current_dir;
+            }
+        }
+        if (m/warning:/i || m/warning /i) {
+          if ($last_error ne $current_dir) {
+            if ($STATUS eq "OK") {
+              $STATUS = "COMPILATION WARNING";
+            }
+            push @failures, "Warning while compiling in $current_dir\n";
+            $last_error = $current_dir;
+          }
+        }
 	if (m/Error/
 	    || m/ERROR/
 	    || m/FAILED/
+	    || m/failed/
 	    || m/FAIL/
 	    || m/EXCEPTION/
 	    || m/pure virtual /i) {
@@ -433,11 +466,12 @@ if ($dont_run == 0) {
 	  $run_error = 1;
 	}
     }
+
     if (close(CHECK) == 0) {
       if ($STATUS eq "OK") {
 	$STATUS = "RUNTIME ERROR";
       }
-      push @failures, "Error when closing pipe for in $i";
+      push @failures, "Error when closing pipe in $i";
       next;
     }
     $date = localtime;
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 0fb7b8999a8..fa5a6e11faf 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -9,7 +9,7 @@ dnl       general enough for general use.
 dnl 
 dnl -------------------------------------------------------------------------
 
-dnl  Copyright (C) 1998, 1999  Ossama Othman
+dnl  Copyright (C) 1998, 1999, 2000  Ossama Othman
 dnl
 dnl  All Rights Reserved
 dnl
diff --git a/m4/platform.m4 b/m4/platform.m4
index df60421b200..8d97cbb55cf 100644
--- a/m4/platform.m4
+++ b/m4/platform.m4
@@ -32,7 +32,7 @@ dnl things going with the auto{conf,make}/libtool integration into the
 dnl ACE source tree.
 
 dnl Platform specific flags
-case "$target" in
+case "$host" in
   *aix3*)
     AC_DEFINE(AIX)
     AC_DEFINE(ACE_DEFAULT_BASE_ADDR, ((char *) 0x80000000))
@@ -129,7 +129,7 @@ dnl FIXME: "FSU" isn't a platform!  We need to move this somewhere.
     AC_DEFINE(ACE_TIMER_SKEW, (1000 * 10))
     ACE_CPPFLAGS="$ACE_CPPFLAGS -D_SGI_MP_SOURCE -D_MODERN_C_"
 
-    case "$target" in
+    case "$host" in
       *irix6.2*)
         dnl Recent versions of IRIX do not appear to require this macro.
         if test "$ace_user_enable_threads" = yes; then
@@ -285,6 +285,7 @@ dnl Check for _POSIX_C_SOURCE macro
     AC_DEFINE(ACE_USE_RCSID, 0)
     ;;
   *cygwin32*)
+    AC_DEFINE(CYGWIN32)
     ;;
   *win32*)
     AC_DEFINE(ACE_WIN32)
@@ -302,7 +303,7 @@ dnl    AC_DEFINE(ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL)
                                                        # filename
     ACE_CPPFLAGS="$ACE_CPPFLAGS -D_POSIX_PATH_MAX=256" # Num. bytes in
                                                        # pathname (excl. NULL)
-    case "$target" in
+    case "$host" in
 changequote(, )dnl
       i[3456]86*)
 changequote([, ])dnl
diff --git a/m4/threads.m4 b/m4/threads.m4
index 40f1968721c..e652000a96c 100644
--- a/m4/threads.m4
+++ b/m4/threads.m4
@@ -101,7 +101,7 @@ dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
    [
     dnl Add thread preprocessor flags, if any.
     ace_save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $ACE_THR_CPPFLAGS"
+    CPPFLAGS="$ACE_THR_CPPFLAGS $CPPFLAGS" dnl User's CPPFLAGS go last
 
     AC_EGREP_CPP(ACE_PTHREAD_MACROS,
       [