提交 07d9eac7 编写于 作者: O ohair

7016976: Documentation for required ant version on JDK7 builds on Solaris 10 and Solaris 11

Reviewed-by: rinaldo
上级 dcf3ad0e
...@@ -208,7 +208,7 @@ ifeq ($(PLATFORM), windows) ...@@ -208,7 +208,7 @@ ifeq ($(PLATFORM), windows)
endif endif
# Generic # Generic
REQUIRED_ANT_VER = 1.6.3 REQUIRED_ANT_VER = 1.7.1
REQUIRED_BOOT_VER = 1.6 REQUIRED_BOOT_VER = 1.6
REQUIRED_FREETYPE_VERSION = 2.3.0 REQUIRED_FREETYPE_VERSION = 2.3.0
REQUIRED_MAKE_VER = 3.81 REQUIRED_MAKE_VER = 3.81
......
...@@ -1259,10 +1259,10 @@ ANT_CHECK :=$(call CheckVersions,$(ANT_VER),$(REQUIRED_ANT_VER)) ...@@ -1259,10 +1259,10 @@ ANT_CHECK :=$(call CheckVersions,$(ANT_VER),$(REQUIRED_ANT_VER))
sane-ant_version: sane-ant_version:
@if [ "$(ANT_CHECK)" != "same" \ @if [ "$(ANT_CHECK)" != "same" \
-a "$(ANT_CHECK)" != "newer" ]; then \ -a "$(ANT_CHECK)" != "newer" ]; then \
$(ECHO) "WARNING: The version of ant being used is older than \n" \ $(ECHO) "ERROR: The version of ant being used is older than \n" \
" the required version of '$(REQUIRED_ANT_VER)'. \n" \ " the required version of '$(REQUIRED_ANT_VER)'. \n" \
" The version of ant found was '$(ANT_VER)'. \n" \ " The version of ant found was '$(ANT_VER)'. \n" \
"" >> $(WARNING_FILE) ; \ "" >> $(ERROR_FILE) ; \
fi fi
###################################################### ######################################################
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册