Wed, 03 Dec 2014 10:03:38 -0800
Merge
common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
common/autoconf/jdk-options.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Wed Nov 26 08:21:17 2014 -0800 1.2 +++ b/common/autoconf/generated-configure.sh Wed Dec 03 10:03:38 2014 -0800 1.3 @@ -1026,6 +1026,7 @@ 1.4 with_update_version 1.5 with_user_release_suffix 1.6 with_build_number 1.7 +with_copyright_year 1.8 with_boot_jdk 1.9 with_boot_jdk_jvmargs 1.10 with_add_source_root 1.11 @@ -1776,6 +1777,7 @@ 1.12 Add a custom string to the version string if build 1.13 number isn't set.[username_builddateb00] 1.14 --with-build-number Set build number value for build [b00] 1.15 + --with-copyright-year Set copyright year value for build [current year] 1.16 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] 1.17 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all 1.18 invocations of the Boot JDK, overriding the default 1.19 @@ -3870,7 +3872,7 @@ 1.20 #CUSTOM_AUTOCONF_INCLUDE 1.21 1.22 # Do not change or remove the following line, it is needed for consistency checks: 1.23 -DATE_WHEN_GENERATED=1413192141 1.24 +DATE_WHEN_GENERATED=1416326200 1.25 1.26 ############################################################################### 1.27 # 1.28 @@ -11282,7 +11284,19 @@ 1.29 1.30 1.31 1.32 - COPYRIGHT_YEAR=`date +'%Y'` 1.33 + 1.34 +# Check whether --with-copyright-year was given. 1.35 +if test "${with_copyright_year+set}" = set; then : 1.36 + withval=$with_copyright_year; 1.37 +fi 1.38 + 1.39 + if test "x$with_copyright_year" = xyes; then 1.40 + as_fn_error $? "Copyright year must have a value" "$LINENO" 5 1.41 + elif test "x$with_copyright_year" != x; then 1.42 + COPYRIGHT_YEAR="$with_copyright_year" 1.43 + else 1.44 + COPYRIGHT_YEAR=`date +'%Y'` 1.45 + fi 1.46 1.47 1.48 if test "x$JDK_UPDATE_VERSION" != x; then