1.1 --- a/common/autoconf/jdk-options.m4 Fri Jan 18 11:31:33 2013 -0800
1.2 +++ b/common/autoconf/jdk-options.m4 Mon Jan 28 14:23:20 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -235,7 +235,7 @@
1.11 # from configure, but only server is valid anyway. Fix this
1.12 # when hotspot makefiles are rewritten.
1.13 if test "x$MACOSX_UNIVERSAL" = xtrue; then
1.14 - HOTSPOT_TARGET=universal_product
1.15 + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
1.16 fi
1.17
1.18 #####
1.19 @@ -247,46 +247,50 @@
1.20 AC_SUBST(BUILD_VARIANT_RELEASE)
1.21 ])
1.22
1.23 -AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
1.24 -[
1.25
1.26 ###############################################################################
1.27 #
1.28 # Should we build only OpenJDK even if closed sources are present?
1.29 #
1.30 -AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
1.31 - [supress building closed source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
1.32 +AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
1.33 +[
1.34 + AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
1.35 + [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
1.36
1.37 -AC_MSG_CHECKING([for presence of closed sources])
1.38 -if test -d "$SRC_ROOT/jdk/src/closed"; then
1.39 + AC_MSG_CHECKING([for presence of closed sources])
1.40 + if test -d "$SRC_ROOT/jdk/src/closed"; then
1.41 CLOSED_SOURCE_PRESENT=yes
1.42 -else
1.43 + else
1.44 CLOSED_SOURCE_PRESENT=no
1.45 -fi
1.46 -AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
1.47 + fi
1.48 + AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
1.49
1.50 -AC_MSG_CHECKING([if closed source is supressed (openjdk-only)])
1.51 -SUPRESS_CLOSED_SOURCE="$enable_openjdk_only"
1.52 -AC_MSG_RESULT([$SUPRESS_CLOSED_SOURCE])
1.53 + AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)])
1.54 + SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
1.55 + AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE])
1.56
1.57 -if test "x$CLOSED_SOURCE_PRESENT" = xno; then
1.58 - OPENJDK=true
1.59 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
1.60 - AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
1.61 + if test "x$CLOSED_SOURCE_PRESENT" = xno; then
1.62 + OPENJDK=true
1.63 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
1.64 + AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
1.65 + fi
1.66 + else
1.67 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
1.68 + OPENJDK=true
1.69 + else
1.70 + OPENJDK=false
1.71 + fi
1.72 fi
1.73 -else
1.74 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
1.75 - OPENJDK=true
1.76 - else
1.77 - OPENJDK=false
1.78 +
1.79 + if test "x$OPENJDK" = "xtrue"; then
1.80 + SET_OPENJDK="OPENJDK=true"
1.81 fi
1.82 -fi
1.83
1.84 -if test "x$OPENJDK" = "xtrue"; then
1.85 - SET_OPENJDK="OPENJDK=true"
1.86 -fi
1.87 + AC_SUBST(SET_OPENJDK)
1.88 +])
1.89
1.90 -AC_SUBST(SET_OPENJDK)
1.91 +AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
1.92 +[
1.93
1.94 ###############################################################################
1.95 #
1.96 @@ -369,13 +373,51 @@
1.97 AC_SUBST(COMPRESS_JARS)
1.98 ])
1.99
1.100 +###############################################################################
1.101 +#
1.102 +# Setup version numbers
1.103 +#
1.104 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
1.105 [
1.106 # Source the version numbers
1.107 -. $AUTOCONF_DIR/version.numbers
1.108 -if test "x$OPENJDK" = "xfalse"; then
1.109 - . $AUTOCONF_DIR/closed.version.numbers
1.110 +. $AUTOCONF_DIR/version-numbers
1.111 +
1.112 +# Get the settings from parameters
1.113 +AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
1.114 + [Set milestone value for build @<:@internal@:>@])])
1.115 +if test "x$with_milestone" = xyes; then
1.116 + AC_MSG_ERROR([Milestone must have a value])
1.117 +elif test "x$with_milestone" != x; then
1.118 + MILESTONE="$with_milestone"
1.119 +else
1.120 + MILESTONE=internal
1.121 fi
1.122 +
1.123 +AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
1.124 + [Set build number value for build @<:@b00@:>@])])
1.125 +if test "x$with_build_number" = xyes; then
1.126 + AC_MSG_ERROR([Build number must have a value])
1.127 +elif test "x$with_build_number" != x; then
1.128 + JDK_BUILD_NUMBER="$with_build_number"
1.129 +fi
1.130 +if test "x$JDK_BUILD_NUMBER" = x; then
1.131 + JDK_BUILD_NUMBER=b00
1.132 +fi
1.133 +
1.134 +AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
1.135 + [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
1.136 +if test "x$with_user_release_suffix" = xyes; then
1.137 + AC_MSG_ERROR([Release suffix must have a value])
1.138 +elif test "x$with_user_release_suffix" != x; then
1.139 + USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.140 +else
1.141 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.142 + # Avoid [:alnum:] since it depends on the locale.
1.143 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.144 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.145 +fi
1.146 +AC_SUBST(USER_RELEASE_SUFFIX)
1.147 +
1.148 # Now set the JDK version, milestone, build number etc.
1.149 AC_SUBST(JDK_MAJOR_VERSION)
1.150 AC_SUBST(JDK_MINOR_VERSION)
1.151 @@ -394,34 +436,13 @@
1.152 COPYRIGHT_YEAR=`date +'%Y'`
1.153 AC_SUBST(COPYRIGHT_YEAR)
1.154
1.155 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
1.156 -AC_SUBST(RUNTIME_NAME)
1.157 -
1.158 if test "x$JDK_UPDATE_VERSION" != x; then
1.159 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.160 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.161 else
1.162 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.163 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.164 fi
1.165 AC_SUBST(JDK_VERSION)
1.166
1.167 -if test "x$MILESTONE" != x; then
1.168 - RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}"
1.169 -else
1.170 - RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}"
1.171 -fi
1.172 -AC_SUBST(RELEASE)
1.173 -
1.174 -if test "x$JDK_BUILD_NUMBER" != x; then
1.175 - FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}"
1.176 -else
1.177 - JDK_BUILD_NUMBER=b00
1.178 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.179 - # Avoid [:alnum:] since it depends on the locale.
1.180 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.181 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.182 - FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
1.183 -fi
1.184 -AC_SUBST(FULL_VERSION)
1.185 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.186 AC_SUBST(COOKED_BUILD_NUMBER)
1.187 ])
1.188 @@ -434,7 +455,7 @@
1.189 # The name of the Service Agent jar.
1.190 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
1.191 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.192 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.193 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.194 fi
1.195 AC_SUBST(SALIB_NAME)
1.196
