From 23a5df08bb24106720d0e81ff00ca99108d224ee Mon Sep 17 00:00:00 2001 From: erikj Date: Wed, 19 Nov 2014 14:00:44 -0800 Subject: [PATCH] 8065183: Add --with-copyright-year option to configure Reviewed-by: tbell, ihse --- common/autoconf/generated-configure.sh | 18 ++++++++++++++++-- common/autoconf/jdk-options.m4 | 10 +++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 0e456fa..19ca736 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -1024,6 +1024,7 @@ with_milestone with_update_version with_user_release_suffix with_build_number +with_copyright_year with_boot_jdk with_boot_jdk_jvmargs with_add_source_root @@ -1774,6 +1775,7 @@ Optional Packages: 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 @@ -3868,7 +3870,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1410971760 +DATE_WHEN_GENERATED=1416326200 ############################################################################### # @@ -11280,7 +11282,19 @@ fi - 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 --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 00c2003..194b99f 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -510,7 +510,15 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], 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 -- GitLab