OpenJDK / jdk9 / jdk9
changeset 971:3e7caedda189
8034979: Configuration help messages don't consider --no-create
Reviewed-by: erikj
| author | mduigou |
|---|---|
| date | Mon, 17 Feb 2014 10:48:48 -0800 |
| parents | 26ce5b43f3de |
| children | da8485821067 |
| files | common/autoconf/generated-configure.sh common/autoconf/help.m4 |
| diffstat | 2 files changed, 41 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Thu Feb 13 23:30:08 2014 +0100 +++ b/common/autoconf/generated-configure.sh Mon Feb 17 10:48:48 2014 -0800 @@ -4080,7 +4080,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1392330495 +DATE_WHEN_GENERATED=1392662653 ############################################################################### # @@ -49908,8 +49908,19 @@ printf "\n" printf "====================================================\n" - printf "A new configuration has been successfully created in\n" - printf "$OUTPUT_ROOT\n" + if test "x$no_create" != "xyes"; then + if test "x$IS_RECONFIGURE" != "xyes"; then + printf "A new configuration has been successfully created in\n %s\n" "$OUTPUT_ROOT" + else + printf "The existing configuration has been successfully updated in\n %s\n" "$OUTPUT_ROOT" + fi + else + if test "x$IS_RECONFIGURE" != "xyes"; then + printf "A configuration has been successfully checked but not created\n" + else + printf "The existing configuration has been successfully checked in\n %s\n" "$OUTPUT_ROOT" + fi + fi if test "x$CONFIGURE_COMMAND_LINE" != x; then printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n" else @@ -49963,10 +49974,16 @@ printf "\n" fi - if test "x$IS_RECONFIGURE" = "xyes"; then + if test "x$IS_RECONFIGURE" = "xyes" && test "x$no_create" != "xyes"; then printf "WARNING: The result of this configuration has overridden an older\n" printf "configuration. You *should* run 'make clean' to make sure you get a\n" printf "proper build. Failure to do so might result in strange build problems.\n" printf "\n" fi + if test "x$IS_RECONFIGURE" != "xyes" && test "x$no_create" = "xyes"; then + printf "WARNING: The result of this configuration was not saved.\n" + printf "You should run without '--no-create | -n' to create the configuration.\n" + printf "\n" + fi +
--- a/common/autoconf/help.m4 Thu Feb 13 23:30:08 2014 +0100 +++ b/common/autoconf/help.m4 Mon Feb 17 10:48:48 2014 -0800 @@ -157,8 +157,19 @@ printf "\n" printf "====================================================\n" - printf "A new configuration has been successfully created in\n" - printf "$OUTPUT_ROOT\n" + if test "x$no_create" != "xyes"; then + if test "x$IS_RECONFIGURE" != "xyes"; then + printf "A new configuration has been successfully created in\n %s\n" "$OUTPUT_ROOT" + else + printf "The existing configuration has been successfully updated in\n %s\n" "$OUTPUT_ROOT" + fi + else + if test "x$IS_RECONFIGURE" != "xyes"; then + printf "A configuration has been successfully checked but not created\n" + else + printf "The existing configuration has been successfully checked in\n %s\n" "$OUTPUT_ROOT" + fi + fi if test "x$CONFIGURE_COMMAND_LINE" != x; then printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n" else @@ -212,10 +223,16 @@ printf "\n" fi - if test "x$IS_RECONFIGURE" = "xyes"; then + if test "x$IS_RECONFIGURE" = "xyes" && test "x$no_create" != "xyes"; then printf "WARNING: The result of this configuration has overridden an older\n" printf "configuration. You *should* run 'make clean' to make sure you get a\n" printf "proper build. Failure to do so might result in strange build problems.\n" printf "\n" fi + + if test "x$IS_RECONFIGURE" != "xyes" && test "x$no_create" = "xyes"; then + printf "WARNING: The result of this configuration was not saved.\n" + printf "You should run without '--no-create | -n' to create the configuration.\n" + printf "\n" + fi ])