diff --git a/.hgtags b/.hgtags index 684719db0b2ac8a3f0ea1c0b49ecc4e148769886..3cd8441e11e8f3f74073c4a1b108d6074584f7d5 100644 --- a/.hgtags +++ b/.hgtags @@ -103,3 +103,4 @@ ac311eb325bfc763698219252bf3cee9e091f3af jdk7-b122 8361ef97a0f90086c9048beaf7cea1a37216c4cd jdk7-b126 29e09de1d0b4f84faea114cf10b3ec08b59acc4e jdk7-b127 f08682e23279d6cccbdcafda1eb0647ba4900874 jdk7-b128 +14cd5d54a8d0b9c368d60ea83a066735b9931015 jdk7-b129 diff --git a/make/common/shared/Defs-versions.gmk b/make/common/shared/Defs-versions.gmk index a51cb2b75d578cc6826bb2529d828df497494294..5bfd708485fd5881e4ed07e58a1f363010b6329d 100644 --- a/make/common/shared/Defs-versions.gmk +++ b/make/common/shared/Defs-versions.gmk @@ -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 diff --git a/make/common/shared/Sanity.gmk b/make/common/shared/Sanity.gmk index 0cf3433f9dcfba22c80073b6df276068c86f3caf..6883d9ce7ec99f2e41c7c0e0752a1ad0366ce3a0 100644 --- a/make/common/shared/Sanity.gmk +++ b/make/common/shared/Sanity.gmk @@ -255,10 +255,10 @@ endif MAKE_CHECK :=$(call CheckVersions,$(MAKE_VER),$(REQUIRED_MAKE_VER)) sane-make: @if [ "$(MAKE_CHECK)" != "same" -a "$(MAKE_CHECK)" != "newer" ]; then \ - $(ECHO) "WARNING: The version of make being used is older than \n" \ + $(ECHO) "ERROR: The version of make being used is older than \n" \ " the required version of '$(REQUIRED_MAKE_VER)'. \n" \ " The version of make found was '$(MAKE_VER)'. \n" \ - "" >> $(WARNING_FILE) ; \ + "" >> $(ERROR_FILE) ; \ fi ###################################################### @@ -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 ######################################################