changeset 3438:14cd5d54a8d0 jdk7-b129

Merge
author ohair
date Tue, 08 Feb 2011 20:00:05 -0800
parents 3f77dae85c85 (current diff) 001dcfd0be4b (diff)
children 326aac19a89f 4f84cda2a7d5 9478964f9425
files make/common/shared/Sanity.gmk
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs-versions.gmk	Tue Feb 08 13:06:20 2011 -0800
+++ b/make/common/shared/Defs-versions.gmk	Tue Feb 08 20:00:05 2011 -0800
@@ -208,7 +208,7 @@
 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
--- a/make/common/shared/Sanity.gmk	Tue Feb 08 13:06:20 2011 -0800
+++ b/make/common/shared/Sanity.gmk	Tue Feb 08 20:00:05 2011 -0800
@@ -1259,10 +1259,10 @@
 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
 
 ######################################################