Mercurial > jdk8-mips64-public / changeset
changeset
8026864: Deprecate --disable-macosx-runtime-support.
Tue, 22 Oct 2013 12:29:29 +0200
- author
- ihse
- date
- Tue, 22 Oct 2013 12:29:29 +0200
- changeset 863
- 56db38956113
- parent 862
- dffe654ab24c
- child 864
- 9e177e7fc438
8026864: Deprecate --disable-macosx-runtime-support.
Reviewed-by: erikj
1.1 --- a/common/autoconf/basics.m4 Tue Oct 22 11:12:43 2013 +0200 1.2 +++ b/common/autoconf/basics.m4 Tue Oct 22 12:29:29 2013 +0200 1.3 @@ -212,6 +212,18 @@ 1.4 [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])]) 1.5 ]) 1.6 1.7 +# Register a --enable argument but mark it as deprecated 1.8 +# $1: The name of the with argument to deprecate, not including --enable- 1.9 +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -) 1.10 +AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE], 1.11 +[ 1.12 + AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1], 1.13 + [Deprecated. Option is kept for backwards compatibility and is ignored])]) 1.14 + if test "x$enable_$2" != x; then 1.15 + AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.]) 1.16 + fi 1.17 +]) 1.18 + 1.19 AC_DEFUN_ONCE([BASIC_INIT], 1.20 [ 1.21 # Save the original command line. This is passed to us by the wrapper configure script.
2.1 --- a/common/autoconf/generated-configure.sh Tue Oct 22 11:12:43 2013 +0200 2.2 +++ b/common/autoconf/generated-configure.sh Tue Oct 22 12:29:29 2013 +0200 2.3 @@ -1715,9 +1715,9 @@ 2.4 --disable-debug-symbols disable generation of debug symbols [enabled] 2.5 --disable-zip-debug-info 2.6 disable zipping of debug-info files [enabled] 2.7 - --disable-macosx-runtime-support 2.8 - disable the use of MacOSX Java runtime support 2.9 - framework [enabled] 2.10 + --enable-macosx-runtime-support 2.11 + Deprecated. Option is kept for backwards 2.12 + compatibility and is ignored 2.13 --enable-sjavac use sjavac to do fast incremental compiles 2.14 [disabled] 2.15 --disable-precompiled-headers 2.16 @@ -3148,6 +3148,11 @@ 2.17 # $1: The name of the with argument to deprecate, not including --with- 2.18 2.19 2.20 +# Register a --enable argument but mark it as deprecated 2.21 +# $1: The name of the with argument to deprecate, not including --enable- 2.22 +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -) 2.23 + 2.24 + 2.25 2.26 2.27 # Test that variable $1 denoting a program is not empty. If empty, exit with an error. 2.28 @@ -3848,7 +3853,7 @@ 2.29 #CUSTOM_AUTOCONF_INCLUDE 2.30 2.31 # Do not change or remove the following line, it is needed for consistency checks: 2.32 -DATE_WHEN_GENERATED=1382433088 2.33 +DATE_WHEN_GENERATED=1382437436 2.34 2.35 ############################################################################### 2.36 # 2.37 @@ -29920,8 +29925,8 @@ 2.38 FREETYPE2_NOT_NEEDED=yes 2.39 # If the java runtime framework is disabled, then we need X11. 2.40 # This will be adjusted below. 2.41 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5 2.42 -$as_echo "alsa pulse x11" >&6; } 2.43 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11 freetype" >&5 2.44 +$as_echo "alsa pulse x11 freetype" >&6; } 2.45 fi 2.46 2.47 if test "x$OPENJDK_TARGET_OS" = xbsd; then 2.48 @@ -29942,44 +29947,31 @@ 2.49 2.50 ############################################################################### 2.51 # 2.52 - # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM 2.53 - # that uses this API. 2.54 - # 2.55 + # Check for MacOSX support for OpenJDK. 2.56 + # 2.57 + 2.58 + 2.59 # Check whether --enable-macosx-runtime-support was given. 2.60 if test "${enable_macosx_runtime_support+set}" = set; then : 2.61 - enableval=$enable_macosx_runtime_support; MACOSX_RUNTIME_SUPPORT="${enableval}" 2.62 -else 2.63 - MACOSX_RUNTIME_SUPPORT="no" 2.64 -fi 2.65 - 2.66 - 2.67 - USE_MACOSX_RUNTIME_SUPPORT=no 2.68 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit Java runtime support in the OS" >&5 2.69 -$as_echo_n "checking for explicit Java runtime support in the OS... " >&6; } 2.70 + enableval=$enable_macosx_runtime_support; 2.71 +fi 2.72 + 2.73 + if test "x$enable_macosx_runtime_support" != x; then 2.74 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&5 2.75 +$as_echo "$as_me: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&2;} 2.76 + fi 2.77 + 2.78 + 2.79 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5 2.80 +$as_echo_n "checking for Mac OS X Java Framework... " >&6; } 2.81 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then 2.82 - if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then 2.83 - MACOSX_RUNTIME_SUPPORT=yes 2.84 - USE_MACOSX_RUNTIME_SUPPORT=yes 2.85 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, does not need alsa freetype2 pulse and X11" >&5 2.86 -$as_echo "yes, does not need alsa freetype2 pulse and X11" >&6; } 2.87 - else 2.88 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but explicitly disabled." >&5 2.89 -$as_echo "yes, but explicitly disabled." >&6; } 2.90 - fi 2.91 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5 2.92 +$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; } 2.93 else 2.94 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.95 $as_echo "no" >&6; } 2.96 fi 2.97 2.98 - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then 2.99 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on an X11 build on MacOSX?" >&5 2.100 -$as_echo_n "checking what is not needed on an X11 build on MacOSX?... " >&6; } 2.101 - X11_NOT_NEEDED= 2.102 - FREETYPE2_NOT_NEEDED= 2.103 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 2.104 -$as_echo "alsa pulse" >&6; } 2.105 - fi 2.106 - 2.107 2.108 2.109 ###############################################################################
3.1 --- a/common/autoconf/libraries.m4 Tue Oct 22 11:12:43 2013 +0200 3.2 +++ b/common/autoconf/libraries.m4 Tue Oct 22 12:29:29 2013 +0200 3.3 @@ -60,7 +60,7 @@ 3.4 FREETYPE2_NOT_NEEDED=yes 3.5 # If the java runtime framework is disabled, then we need X11. 3.6 # This will be adjusted below. 3.7 - AC_MSG_RESULT([alsa pulse x11]) 3.8 + AC_MSG_RESULT([alsa pulse x11 freetype]) 3.9 fi 3.10 3.11 if test "x$OPENJDK_TARGET_OS" = xbsd; then 3.12 @@ -79,33 +79,17 @@ 3.13 3.14 ############################################################################### 3.15 # 3.16 - # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM 3.17 - # that uses this API. 3.18 + # Check for MacOSX support for OpenJDK. 3.19 # 3.20 - AC_ARG_ENABLE([macosx-runtime-support], [AS_HELP_STRING([--disable-macosx-runtime-support], 3.21 - [disable the use of MacOSX Java runtime support framework @<:@enabled@:>@])], 3.22 - [MACOSX_RUNTIME_SUPPORT="${enableval}"],[MACOSX_RUNTIME_SUPPORT="no"]) 3.23 3.24 - USE_MACOSX_RUNTIME_SUPPORT=no 3.25 - AC_MSG_CHECKING([for explicit Java runtime support in the OS]) 3.26 + BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support) 3.27 + 3.28 + AC_MSG_CHECKING([for Mac OS X Java Framework]) 3.29 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then 3.30 - if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then 3.31 - MACOSX_RUNTIME_SUPPORT=yes 3.32 - USE_MACOSX_RUNTIME_SUPPORT=yes 3.33 - AC_MSG_RESULT([yes, does not need alsa freetype2 pulse and X11]) 3.34 - else 3.35 - AC_MSG_RESULT([yes, but explicitly disabled.]) 3.36 - fi 3.37 + AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework]) 3.38 else 3.39 AC_MSG_RESULT([no]) 3.40 fi 3.41 - 3.42 - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then 3.43 - AC_MSG_CHECKING([what is not needed on an X11 build on MacOSX?]) 3.44 - X11_NOT_NEEDED= 3.45 - FREETYPE2_NOT_NEEDED= 3.46 - AC_MSG_RESULT([alsa pulse]) 3.47 - fi 3.48 ]) 3.49 3.50 AC_DEFUN_ONCE([LIB_SETUP_X11],
