< prev index next >

make/autoconf/jdk-version.m4

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2015, 2019, 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 # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2015, 2017, 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 # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 64,119 **** AC_SUBST(LAUNCHER_NAME) AC_SUBST(PRODUCT_NAME) AC_SUBST(PRODUCT_SUFFIX) AC_SUBST(JDK_RC_PLATFORM_NAME) AC_SUBST(HOTSPOT_VM_DISTRO) - - # Set the MACOSX Bundle Name base - AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base], - [Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names. - @<:@not specified@:>@])]) - if test "x$with_macosx_bundle_name_base" = xyes; then - AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value]) - elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then - AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base]) - elif test "x$with_macosx_bundle_name_base" != x; then - # Set MACOSX_BUNDLE_NAME_BASE to the configured value. - MACOSX_BUNDLE_NAME_BASE="$with_macosx_bundle_name_base" - fi AC_SUBST(MACOSX_BUNDLE_NAME_BASE) - - # Set the MACOSX Bundle ID base - AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base], - [Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs. - @<:@not specified@:>@])]) - if test "x$with_macosx_bundle_id_base" = xyes; then - AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value]) - elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then - AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base]) - elif test "x$with_macosx_bundle_id_base" != x; then - # Set MACOSX_BUNDLE_ID_BASE to the configured value. - MACOSX_BUNDLE_ID_BASE="$with_macosx_bundle_id_base" - fi AC_SUBST(MACOSX_BUNDLE_ID_BASE) - # Set the JDK RC name - AC_ARG_WITH(jdk-rc-name, [AS_HELP_STRING([--with-jdk-rc-name], - [Set JDK RC name. This is used for FileDescription and ProductName properties - of MS Windows binaries. @<:@not specified@:>@])]) - if test "x$with_jdk_rc_name" = xyes; then - AC_MSG_ERROR([--with-jdk-rc-name must have a value]) - elif [ ! [[ $with_jdk_rc_name =~ ^[[:print:]]*$ ]] ]; then - AC_MSG_ERROR([--with-jdk-rc-name contains non-printing characters: $with_jdk_rc_name]) - elif test "x$with_jdk_rc_name" != x; then - # Set JDK_RC_NAME to a custom value if '--with-jdk-rc-name' was used and is not empty. - JDK_RC_NAME="$with_jdk_rc_name" - else - # Otherwise calculate from "version-numbers" included above. - JDK_RC_NAME="$PRODUCT_NAME $JDK_RC_PLATFORM_NAME" - fi - AC_SUBST(JDK_RC_NAME) - # The vendor name, if any AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name], [Set vendor name. Among others, used to set the 'java.vendor' and 'java.vm.vendor' system properties. @<:@not specified@:>@])]) if test "x$with_vendor_name" = xyes; then --- 64,76 ----
*** 132,144 **** [Set the 'java.vendor.url' system property @<:@not specified@:>@])]) if test "x$with_vendor_url" = xyes; then AC_MSG_ERROR([--with-vendor-url must have a value]) elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url]) ! elif test "x$with_vendor_url" != x; then ! # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty. ! # Otherwise we will use the value from "version-numbers" included above. VENDOR_URL="$with_vendor_url" fi AC_SUBST(VENDOR_URL) # The vendor bug URL, if any --- 89,99 ---- [Set the 'java.vendor.url' system property @<:@not specified@:>@])]) if test "x$with_vendor_url" = xyes; then AC_MSG_ERROR([--with-vendor-url must have a value]) elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url]) ! else VENDOR_URL="$with_vendor_url" fi AC_SUBST(VENDOR_URL) # The vendor bug URL, if any
*** 146,158 **** [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])]) if test "x$with_vendor_bug_url" = xyes; then AC_MSG_ERROR([--with-vendor-bug-url must have a value]) elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url]) ! elif test "x$with_vendor_bug_url" != x; then ! # Only set VENDOR_URL_BUG if '--with-vendor-bug-url' was used and is not empty. ! # Otherwise we will use the value from "version-numbers" included above. VENDOR_URL_BUG="$with_vendor_bug_url" fi AC_SUBST(VENDOR_URL_BUG) # The vendor VM bug URL, if any --- 101,111 ---- [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])]) if test "x$with_vendor_bug_url" = xyes; then AC_MSG_ERROR([--with-vendor-bug-url must have a value]) elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url]) ! else VENDOR_URL_BUG="$with_vendor_bug_url" fi AC_SUBST(VENDOR_URL_BUG) # The vendor VM bug URL, if any
*** 501,511 **** fi # We could define --with flags for these, if really needed VERSION_CLASSFILE_MAJOR="$DEFAULT_VERSION_CLASSFILE_MAJOR" VERSION_CLASSFILE_MINOR="$DEFAULT_VERSION_CLASSFILE_MINOR" - JDK_SOURCE_TARGET_VERSION="$DEFAULT_JDK_SOURCE_TARGET_VERSION" AC_MSG_CHECKING([for version string]) AC_MSG_RESULT([$VERSION_STRING]) AC_SUBST(VERSION_FEATURE) --- 454,463 ----
*** 525,531 **** AC_SUBST(VERSION_IS_GA) AC_SUBST(VERSION_DATE) AC_SUBST(VENDOR_VERSION_STRING) AC_SUBST(VERSION_CLASSFILE_MAJOR) AC_SUBST(VERSION_CLASSFILE_MINOR) ! AC_SUBST(JDK_SOURCE_TARGET_VERSION) ]) --- 477,483 ---- AC_SUBST(VERSION_IS_GA) AC_SUBST(VERSION_DATE) AC_SUBST(VENDOR_VERSION_STRING) AC_SUBST(VERSION_CLASSFILE_MAJOR) AC_SUBST(VERSION_CLASSFILE_MINOR) ! ])
< prev index next >