提交 6d5fddb8 编写于 作者: C coffeys

Merge

...@@ -1400,7 +1400,7 @@ THE SOFTWARE. ...@@ -1400,7 +1400,7 @@ THE SOFTWARE.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
%% This notice is provided with respect to Little CMS 2.4, which may be %% This notice is provided with respect to Little CMS 2.4, which may be
included with OpenJDK 8. included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE --- --- begin of LICENSE ---
......
...@@ -170,7 +170,7 @@ RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) ...@@ -170,7 +170,7 @@ RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
# These variables need to be generated here so that MILESTONE and # These variables need to be generated here so that MILESTONE and
# JDK_BUILD_NUMBER can be overridden on the make command line. # JDK_BUILD_NUMBER can be overridden on the make command line.
ifeq ($(MILESTONE),) ifeq ($(MILESTONE), fcs)
RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE) RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
else else
RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE) RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册