Change looks correct Daniil and I don't see any other instances where
VERSION_NUMBER_FOUR_POSITIONS is incorrectly used.
Approved.
Dave
On 9/9/2015 2:12 PM, Daniil Titov wrote:
This review request is a part of the work for JEP-223 that adjusts the changes in
RC_FLAGS implemented in the initial patch "JDK-8085822 JEP 223: New Version-String
Scheme (initial integration)" to ensure that the product version string for Windows
DLL/EXEs consists of dot-separated digits WITHOUT trailing zeros.
Bug: https://bugs.openjdk.java.net/browse/JDK-8135083
The changes are in one line only (please see inline diff below, changes in
generated common/autoconf/generated-configure.sh are omitted).
diff -r 35e118e5bcb4 common/autoconf/flags.m4
--- a/common/autoconf/flags.m4 Tue Sep 08 10:24:22 2015 -0700
+++ b/common/autoconf/flags.m4 Wed Sep 09 13:52:54 2015 -0700
@@ -102,7 +102,7 @@
-D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \
-D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
-D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
- -D\"JDK_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \
+ -D\"JDK_VER=\$(VERSION_NUMBER)\" \
-D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
-D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME)
\$(VERSION_MAJOR)\" \
-D\"JDK_FVER=\$(subst
.,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
[1] http://openjdk.java.net/jeps/223
Thanks!
Best regards,
Daniil
