common/autoconf/generated-configure.sh

rev 2540 : 8065215: Print warning summary at end of configure
Reviewed-by: erikj, tbell
rev 2541 : 8079891: Store configure log in $BUILD/configure.log
Reviewed-by: erikj

*** 3495,3504 ****
--- 3495,3507 ----
  # not be the case in cygwin in certain conditions.
  
  
  
  
+ # Code to run after AC_OUTPUT
+ 
+ 
  #
  # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
*** 4394,4404 ****
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1619439528
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
--- 4397,4407 ----
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1619439948
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
*** 54108,54122 ****
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
  
  
- # Try to move the config.log file to the output directory.
- if test -e ./config.log; then
-   $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
- fi
  
  # Make the compare script executable
  $CHMOD +x $OUTPUT_ROOT/compare.sh
  
  # Finally output some useful information to the user
--- 54111,54140 ----
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
  
+ # After AC_OUTPUT, we need to do final work
+ 
+ 
+   # Rotate our log file (configure.log)
+   if test -e "$OUTPUT_ROOT/configure.log.old"; then
+     $RM -f "$OUTPUT_ROOT/configure.log.old"
+   fi
+   if test -e "$OUTPUT_ROOT/configure.log"; then
+     $MV -f "$OUTPUT_ROOT/configure.log" "$OUTPUT_ROOT/configure.log.old" 2> /dev/null
+   fi
+ 
+   # Move configure.log from current directory to the build output root
+   if test -e ./configure.log; then
+     echo found it
+     $MV -f ./configure.log "$OUTPUT_ROOT/configure.log" 2> /dev/null
+   fi
+ 
+   # Make the compare script executable
+   $CHMOD +x $OUTPUT_ROOT/compare.sh
  
  
  # Make the compare script executable
  $CHMOD +x $OUTPUT_ROOT/compare.sh
  
  # Finally output some useful information to the user
*** 54193,54208 ****
      printf "consider using a supported version unless you know what you are doing.\n"
      printf "\n"
    fi
  
  
! if test -e "$OUTPUT_ROOT/config.log"; then
!   $GREP '^configure:.*: WARNING:' "$OUTPUT_ROOT/config.log" > /dev/null 2>&1
    if test $? -eq 0; then
      printf "The following warnings were produced. Repeated here for convenience:\n"
      # We must quote sed expression (using []) to stop m4 from eating the [].
!     $GREP '^configure:.*: WARNING:' "$OUTPUT_ROOT/config.log" | $SED -e  's/^configure:[0-9]*: //'
      printf "\n"
    fi
! fi
! 
  
--- 54211,54230 ----
      printf "consider using a supported version unless you know what you are doing.\n"
      printf "\n"
    fi
  
  
!   # Locate config.log.
!   if test -e "./config.log"; then
!     CONFIG_LOG_PATH="."
!   fi
! 
!   if test -e "$CONFIG_LOG_PATH/config.log"; then
!     $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" > /dev/null 2>&1
      if test $? -eq 0; then
        printf "The following warnings were produced. Repeated here for convenience:\n"
        # We must quote sed expression (using []) to stop m4 from eating the [].
!       $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" | $SED -e  's/^configure:[0-9]*: //'
        printf "\n"
      fi
!   fi