Merge

7ab38264 · asaha · b72da6c4 · 8ef6c605 · 7ab38264 · 7ab38264
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

.hgtags .hgtags +1 -0

common/autoconf/spec.gmk.in common/autoconf/spec.gmk.in +1 -1

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -247,6 +247,7 @@ cd3825b2983045784d6fc6d1729c799b08215752 jdk8-b120
 ff1478785e43718146ffbce97e007f39c3bcaa32 jdk8-b123
 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124
 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125
+9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126
 c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01
 6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02
 794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03

--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -170,7 +170,7 @@ RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
 # These variables need to be generated here so that MILESTONE and
 # JDK_BUILD_NUMBER can be overridden on the make command line.
-ifeq ($(MILESTONE),)
+ifeq ($(MILESTONE), fcs)
  RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
 else
  RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)