# HG changeset patch # User erikj # Date 1416326484 -3600 # Node ID c3bb27bf9f60c037700d5c8e1bce2426d03c0ed9 # Parent 60d2bf063f7d8baa4e0954b6400aa6d30f9064f9 8065183: Add --with-copyright-year option to configure Reviewed-by: ihse, tbell diff -r 60d2bf063f7d -r c3bb27bf9f60 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Wed Nov 12 13:47:18 2014 -0800 +++ b/common/autoconf/generated-configure.sh Tue Nov 18 17:01:24 2014 +0100 @@ -1026,6 +1026,7 @@ with_update_version with_user_release_suffix with_build_number +with_copyright_year with_boot_jdk with_boot_jdk_jvmargs with_add_source_root @@ -1776,6 +1777,7 @@ Add a custom string to the version string if build number isn't set.[username_builddateb00] --with-build-number Set build number value for build [b00] + --with-copyright-year Set copyright year value for build [current year] --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] --with-boot-jdk-jvmargs specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default @@ -3870,7 +3872,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1413192141 +DATE_WHEN_GENERATED=1416326200 ############################################################################### # @@ -11282,7 +11284,19 @@ - COPYRIGHT_YEAR=`date +'%Y'` + +# Check whether --with-copyright-year was given. +if test "${with_copyright_year+set}" = set; then : + withval=$with_copyright_year; +fi + + if test "x$with_copyright_year" = xyes; then + as_fn_error $? "Copyright year must have a value" "$LINENO" 5 + elif test "x$with_copyright_year" != x; then + COPYRIGHT_YEAR="$with_copyright_year" + else + COPYRIGHT_YEAR=`date +'%Y'` + fi if test "x$JDK_UPDATE_VERSION" != x; then diff -r 60d2bf063f7d -r c3bb27bf9f60 common/autoconf/jdk-options.m4 --- a/common/autoconf/jdk-options.m4 Wed Nov 12 13:47:18 2014 -0800 +++ b/common/autoconf/jdk-options.m4 Tue Nov 18 17:01:24 2014 +0100 @@ -510,7 +510,15 @@ AC_SUBST(MACOSX_BUNDLE_NAME_BASE) AC_SUBST(MACOSX_BUNDLE_ID_BASE) - COPYRIGHT_YEAR=`date +'%Y'` + AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year], + [Set copyright year value for build @<:@current year@:>@])]) + if test "x$with_copyright_year" = xyes; then + AC_MSG_ERROR([Copyright year must have a value]) + elif test "x$with_copyright_year" != x; then + COPYRIGHT_YEAR="$with_copyright_year" + else + COPYRIGHT_YEAR=`date +'%Y'` + fi AC_SUBST(COPYRIGHT_YEAR) if test "x$JDK_UPDATE_VERSION" != x; then