Merge jdk7-b129
authorohair
Tue, 08 Feb 2011 20:00:05 -0800
changeset 347114cd5d54a8d0
parent 3470 3f77dae85c85
parent 3468 001dcfd0be4b
child 3472 326aac19a89f
child 3545 4f84cda2a7d5
child 3548 9478964f9425
Merge
make/common/shared/Sanity.gmk
     1.1 --- a/make/common/shared/Defs-versions.gmk	Tue Feb 08 13:06:20 2011 -0800
     1.2 +++ b/make/common/shared/Defs-versions.gmk	Tue Feb 08 20:00:05 2011 -0800
     1.3 @@ -208,7 +208,7 @@
     1.4  endif
     1.5  
     1.6  # Generic
     1.7 -REQUIRED_ANT_VER          = 1.6.3
     1.8 +REQUIRED_ANT_VER          = 1.7.1
     1.9  REQUIRED_BOOT_VER         = 1.6
    1.10  REQUIRED_FREETYPE_VERSION = 2.3.0
    1.11  REQUIRED_MAKE_VER         = 3.81
     2.1 --- a/make/common/shared/Sanity.gmk	Tue Feb 08 13:06:20 2011 -0800
     2.2 +++ b/make/common/shared/Sanity.gmk	Tue Feb 08 20:00:05 2011 -0800
     2.3 @@ -1259,10 +1259,10 @@
     2.4  sane-ant_version:
     2.5  	@if [ "$(ANT_CHECK)" != "same" \
     2.6  	      -a "$(ANT_CHECK)" != "newer" ]; then \
     2.7 -	  $(ECHO) "WARNING: The version of ant being used is older than \n" \
     2.8 +	  $(ECHO) "ERROR: The version of ant being used is older than \n" \
     2.9  	    "      the required version of '$(REQUIRED_ANT_VER)'. \n" \
    2.10  	    "      The version of ant found was '$(ANT_VER)'. \n" \
    2.11 -	    "" >> $(WARNING_FILE) ; \
    2.12 +	    "" >> $(ERROR_FILE) ; \
    2.13  	fi
    2.14  
    2.15  ######################################################