Mercurial > hg > release > icedtea8-forest-3.0
changeset 1392:635ba0c81b89 jdk8u45-b01
Merge
| author | asaha |
|---|---|
| date | Fri, 12 Dec 2014 14:27:06 -0800 |
| parents | 4d7cb7c9be8c (current diff) 0c73f30dde2c (diff) |
| children | 5b4bcd8fb45c |
| files | .hgtags |
| diffstat | 2 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Dec 01 11:27:20 2014 -0800 +++ b/.hgtags Fri Dec 12 14:27:06 2014 -0800 @@ -364,4 +364,6 @@ df659b8b0bc82214358e2f0ef340612011d5ed3b jdk8u40-b14 60d2bf063f7d8baa4e0954b6400aa6d30f9064f9 jdk8u40-b15 64790e9792f88fadd9d25eaf4dcba7e6e96664de jdk8u40-b16 +e1c506c8e1db7356d120dd7d22b2c50276b6bcee jdk8u40-b17 +83d1d42c3df409c87ef7cb0126343a009857ca71 jdk8u40-b18 ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
--- a/common/autoconf/generated-configure.sh Mon Dec 01 11:27:20 2014 -0800 +++ b/common/autoconf/generated-configure.sh Fri Dec 12 14:27:06 2014 -0800 @@ -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