Wed, 26 Nov 2014 08:21:17 -0800
Merge
1.1 --- a/.hgtags Wed Nov 26 08:12:01 2014 -0800 1.2 +++ b/.hgtags Wed Nov 26 08:21:17 2014 -0800 1.3 @@ -344,6 +344,9 @@ 1.4 97de4d73edf1435c9b87d765d2ad91bb16c8d913 jdk8u31-b05 1.5 f1b61760d01de6ad8d360227ac6c2122765680a2 jdk8u31-b06 1.6 e9cbffb6c1119f3ef39c68db53c36c5e544c0d3c jdk8u31-b07 1.7 +4cec543118e7720d6105f25b60742d25a458cab7 jdk8u31-b08 1.8 +ea4b31ec437d74c62b844bd8b35f0bc3a27915b4 jdk8u31-b09 1.9 +01a98532348477a84b6e3c322fdd12dfed28d96d jdk8u31-b10 1.10 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00 1.11 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01 1.12 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
2.1 --- a/common/autoconf/jdk-options.m4 Wed Nov 26 08:12:01 2014 -0800 2.2 +++ b/common/autoconf/jdk-options.m4 Wed Nov 26 08:21:17 2014 -0800 2.3 @@ -510,7 +510,15 @@ 2.4 AC_SUBST(MACOSX_BUNDLE_NAME_BASE) 2.5 AC_SUBST(MACOSX_BUNDLE_ID_BASE) 2.6 2.7 - COPYRIGHT_YEAR=`date +'%Y'` 2.8 + AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year], 2.9 + [Set copyright year value for build @<:@current year@:>@])]) 2.10 + if test "x$with_copyright_year" = xyes; then 2.11 + AC_MSG_ERROR([Copyright year must have a value]) 2.12 + elif test "x$with_copyright_year" != x; then 2.13 + COPYRIGHT_YEAR="$with_copyright_year" 2.14 + else 2.15 + COPYRIGHT_YEAR=`date +'%Y'` 2.16 + fi 2.17 AC_SUBST(COPYRIGHT_YEAR) 2.18 2.19 if test "x$JDK_UPDATE_VERSION" != x; then