archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Kelly O'Hair 2011-02-08 20:00:05 -08:00
commit c0f41e745d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jdk/make/common/shared/Defs-versions.gmk
View file

@ -208,7 +208,7 @@ ifeq ($(PLATFORM), windows)
endif
# Generic
REQUIRED_ANT_VER = 1.6.3
REQUIRED_ANT_VER = 1.7.1
REQUIRED_BOOT_VER = 1.6
REQUIRED_FREETYPE_VERSION = 2.3.0
REQUIRED_MAKE_VER = 3.81

4
jdk/make/common/shared/Sanity.gmk
View file

@ -1259,10 +1259,10 @@ ANT_CHECK :=$(call CheckVersions,$(ANT_VER),$(REQUIRED_ANT_VER))
sane-ant_version:
@if [ "$(ANT_CHECK)" != "same" \
-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 version of ant found was '$(ANT_VER)'. \n" \
"" >> $(WARNING_FILE) ; \
"" >> $(ERROR_FILE) ; \
fi
######################################################