1.1 --- a/common/autoconf/jdk-options.m4 Wed Oct 24 13:11:42 2012 -0700
1.2 +++ b/common/autoconf/jdk-options.m4 Fri Oct 26 14:29:57 2012 -0700
1.3 @@ -64,7 +64,7 @@
1.4 # ie normal interpreter and C1, only the serial GC, kernel jvmti etc
1.5 # zero: no machine code interpreter, no compiler
1.6 # zeroshark: zero interpreter and shark/llvm compiler backend
1.7 -AC_MSG_CHECKING([which variants of the JVM that should be built])
1.8 +AC_MSG_CHECKING([which variants of the JVM to build])
1.9 AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
1.10 [JVM variants (separated by commas) to build (server, client, kernel, zero, zeroshark) @<:@server@:>@])])
1.11
1.12 @@ -241,48 +241,47 @@
1.13 # Should we build only OpenJDK even if closed sources are present?
1.14 #
1.15 AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
1.16 - [build OpenJDK regardless of the presence of closed repositories @<:@disabled@:>@])],,)
1.17 + [supress building closed source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
1.18
1.19 -if test "x$enable_openjdk_only" = "xyes"; then
1.20 +AC_MSG_CHECKING([for presence of closed sources])
1.21 +if test -d "$SRC_ROOT/jdk/src/closed"; then
1.22 + CLOSED_SOURCE_PRESENT=yes
1.23 +else
1.24 + CLOSED_SOURCE_PRESENT=no
1.25 +fi
1.26 +AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
1.27 +
1.28 +AC_MSG_CHECKING([if closed source is supressed (openjdk-only)])
1.29 +SUPRESS_CLOSED_SOURCE="$enable_openjdk_only"
1.30 +AC_MSG_RESULT([$SUPRESS_CLOSED_SOURCE])
1.31 +
1.32 +if test "x$CLOSED_SOURCE_PRESENT" = xno; then
1.33 + OPENJDK=true
1.34 + if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
1.35 + AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
1.36 + fi
1.37 +else
1.38 + if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
1.39 OPENJDK=true
1.40 -elif test "x$enable_openjdk_only" = "xno"; then
1.41 + else
1.42 OPENJDK=false
1.43 -elif test -d "$SRC_ROOT/jdk/src/closed"; then
1.44 - OPENJDK=false
1.45 -else
1.46 - OPENJDK=true
1.47 + fi
1.48 fi
1.49
1.50 if test "x$OPENJDK" = "xtrue"; then
1.51 - SET_OPENJDK=OPENJDK=true
1.52 + SET_OPENJDK="OPENJDK=true"
1.53 fi
1.54
1.55 AC_SUBST(SET_OPENJDK)
1.56
1.57 ###############################################################################
1.58 #
1.59 -# JIGSAW or not. The JIGSAW variable is used during the intermediate
1.60 -# stage when we are building both the old style JDK and the new style modularized JDK.
1.61 -# When the modularized JDK is finalized, this option will go away.
1.62 -#
1.63 -AC_ARG_ENABLE([jigsaw], [AS_HELP_STRING([--enable-jigsaw],
1.64 - [build Jigsaw images (not yet available) @<:@disabled@:>@])],,)
1.65 -
1.66 -if test "x$enable_jigsaw" = "xyes"; then
1.67 - JIGSAW=true
1.68 -else
1.69 - JIGSAW=false
1.70 -fi
1.71 -AC_SUBST(JIGSAW)
1.72 -
1.73 -###############################################################################
1.74 -#
1.75 # Should we build a JDK/JVM with headful support (ie a graphical ui)?
1.76 # We always build headless support.
1.77 #
1.78 AC_MSG_CHECKING([headful support])
1.79 AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
1.80 - [build headful support (graphical UI support) @<:@enabled@:>@])],
1.81 + [disable building headful support (graphical UI support) @<:@enabled@:>@])],
1.82 [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
1.83
1.84 SUPPORT_HEADLESS=yes
1.85 @@ -305,25 +304,9 @@
1.86 AC_SUBST(SUPPORT_HEADFUL)
1.87 AC_SUBST(BUILD_HEADLESS)
1.88
1.89 -###############################################################################
1.90 -#
1.91 -# Should we compile nimbus swing L&F? We can probably remove this option
1.92 -# since nimbus is officially part of javax now.
1.93 -#
1.94 -AC_MSG_CHECKING([whether to build nimbus L&F])
1.95 -AC_ARG_ENABLE([nimbus], [AS_HELP_STRING([--disable-nimbus],
1.96 - [disable Nimbus L&F @<:@enabled@:>@])],
1.97 - [ENABLE_NIMBUS="${enableval}"], [ENABLE_NIMBUS='yes'])
1.98 -AC_MSG_RESULT([$ENABLE_NIMBUS])
1.99 -DISABLE_NIMBUS=
1.100 -if test "x$ENABLE_NIMBUS" = xno; then
1.101 - DISABLE_NIMBUS=true
1.102 -fi
1.103 -AC_SUBST(DISABLE_NIMBUS)
1.104 -
1.105 # Control wether Hotspot runs Queens test after build.
1.106 AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
1.107 - [enable running of Queens test after Hotspot build (not yet available) @<:@disabled@:>@])],,
1.108 + [run the Queens test after Hotspot build @<:@disabled@:>@])],,
1.109 [enable_hotspot_test_in_build=no])
1.110 if test "x$enable_hotspot_test_in_build" = "xyes"; then
1.111 TEST_IN_BUILD=true
1.112 @@ -356,38 +339,6 @@
1.113 COMPRESS_JARS=false
1.114
1.115 AC_SUBST(COMPRESS_JARS)
1.116 -
1.117 -###############################################################################
1.118 -#
1.119 -# Should we compile JFR
1.120 -# default no, except for on closed-jdk
1.121 -#
1.122 -ENABLE_JFR=no
1.123 -
1.124 -# Is the JFR source present
1.125 -
1.126 -#
1.127 -# For closed default is yes
1.128 -#
1.129 -if test "x${OPENJDK}" != "xtrue"; then
1.130 - ENABLE_JFR=yes
1.131 -fi
1.132 -
1.133 -AC_MSG_CHECKING([whether to build jfr])
1.134 -AC_ARG_ENABLE([jfr], [AS_HELP_STRING([--enable-jfr],
1.135 - [enable jfr (default is no)])]
1.136 - [ENABLE_JFR="${enableval}"])
1.137 -AC_MSG_RESULT([${ENABLE_JFR}])
1.138 -
1.139 -if test "x$ENABLE_JFR" = "xyes"; then
1.140 - ENABLE_JFR=true
1.141 -elif test "x$ENABLE_JFR" = "xno"; then
1.142 - ENABLE_JFR=false
1.143 -else
1.144 - AC_MSG_ERROR([Invalid argument to --enable-jfr])
1.145 -fi
1.146 -
1.147 -AC_SUBST(ENABLE_JFR)
1.148 ])
1.149
1.150 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
1.151 @@ -409,6 +360,8 @@
1.152 AC_SUBST(PRODUCT_SUFFIX)
1.153 AC_SUBST(JDK_RC_PLATFORM_NAME)
1.154 AC_SUBST(COMPANY_NAME)
1.155 +AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
1.156 +AC_SUBST(MACOSX_BUNDLE_ID_BASE)
1.157
1.158 COPYRIGHT_YEAR=`date +'%Y'`
1.159 AC_SUBST(COPYRIGHT_YEAR)
1.160 @@ -437,7 +390,7 @@
1.161 BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.162 # Avoid [:alnum:] since it depends on the locale.
1.163 CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.164 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvqxyz'`
1.165 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.166 FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
1.167 fi
1.168 AC_SUBST(FULL_VERSION)
1.169 @@ -473,7 +426,7 @@
1.170 fi
1.171
1.172 AC_ARG_ENABLE([debug-symbols],
1.173 - [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols (@<:@enabled@:>@)])],
1.174 + [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])],
1.175 [ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols}],
1.176 )
1.177
1.178 @@ -487,7 +440,7 @@
1.179
1.180 if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then
1.181 # Default is on if objcopy is found, otherwise off
1.182 - if test "x$OBJCOPY" != x; then
1.183 + if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.184 ENABLE_DEBUG_SYMBOLS=yes
1.185 else
1.186 ENABLE_DEBUG_SYMBOLS=no
1.187 @@ -502,7 +455,7 @@
1.188 ZIP_DEBUGINFO_FILES=yes
1.189
1.190 AC_ARG_ENABLE([zip-debug-info],
1.191 - [AS_HELP_STRING([--disable-zip-debug-info],[don't zip debug-info files (@<:@enabled@:@)])],
1.192 + [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
1.193 [ZIP_DEBUGINFO_FILES=${enable_zip_debug_info}],
1.194 )
1.195
1.196 @@ -528,5 +481,5 @@
1.197 # for a degree of customization of the build targets and the rules/recipes
1.198 # to create them
1.199 AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir],
1.200 - [directory containing custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
1.201 + [use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
1.202 AC_SUBST(CUSTOM_MAKE_DIR)
