changeset 543:ec301c0956be

6746430: Fix problems with getting 'ant -version' and the required setting of 'ANT_HOME' Reviewed-by: tbell
author ohair
date Wed, 10 Sep 2008 10:16:54 -0700
parents 395eb8a7846b
children 41bcf49eb3a1
files make/common/shared/Defs.gmk make/common/shared/Sanity.gmk
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs.gmk	Wed Sep 10 09:48:41 2008 -0700
+++ b/make/common/shared/Defs.gmk	Wed Sep 10 10:16:54 2008 -0700
@@ -540,9 +540,11 @@
   endif
 endif
 
-# Utilities ant and findbugs
-ifeq ($(ANT_HOME),)
-  ANT_HOME := $(call DirExists,/usr/share/ant,$(JDK_DEVTOOLS_DIR)/share/ant/latest,)
+# Utilities ant
+ifeq ($(PLATFORM), windows)
+  ifeq ($(ANT_HOME),)
+    ANT_HOME := $(call DirExists,$(JDK_DEVTOOLS_DIR)/share/ant/latest,,)
+  endif
 endif
 ifeq ($(ANT_HOME),)
   ANT = ant
--- a/make/common/shared/Sanity.gmk	Wed Sep 10 09:48:41 2008 -0700
+++ b/make/common/shared/Sanity.gmk	Wed Sep 10 10:16:54 2008 -0700
@@ -107,11 +107,7 @@
 BOOT_VER   :=$(call GetVersion,"$(_BOOT_VER)")
 
 REQUIRED_ANT_VER := 1.6.3
-ifeq ($(ANT_HOME),)
-  _ANT_VER:=$(shell JAVACMD="$(BOOTDIR)/bin/java" $(ANT) -version 2>&1 )
-else
-  _ANT_VER:=$(shell JAVACMD="$(BOOTDIR)/bin/java" ANT_HOME="$(ANT_HOME)" $(ANT) -version 2>&1 )
-endif
+_ANT_VER:=$(shell $(ANT) -version 2>&1 )
 ANT_VER:=$(call GetVersion,"$(_ANT_VER)")
 
 ifdef ALT_BINDIR