6746430: Fix problems with getting 'ant -version' and the required setting of 'ANT_HOME'

Reviewed-by: tbell

6746430: Fix problems with getting 'ant -version' and the required setting of 'ANT_HOME'
Reviewed-by: tbell
2c16877c · ohair · 9bb1219c · 2c16877c · 2c16877c
隐藏空白更改
内联并排

Showing with 6 addition and 8 deletion

make/common/shared/Defs.gmk make/common/shared/Defs.gmk +5 -3

make/common/shared/Sanity.gmk make/common/shared/Sanity.gmk +1 -5

未找到文件。
--- a/make/common/shared/Defs.gmk
+++ b/make/common/shared/Defs.gmk
@@ -540,9 +540,11 @@ JDK_CUPS_HEADERS_PATH=$(JDK_DEVTOOLS_DIR)/share/cups/include
  endif
 endif
-# Utilities ant and findbugs
+# Utilities ant
-ifeq ($(ANT_HOME),)
+ifeq ($(PLATFORM), windows)
-  ANT_HOME := $(call DirExists,/usr/share/ant,$(JDK_DEVTOOLS_DIR)/share/ant/latest,)
+  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
+++ b/make/common/shared/Sanity.gmk
@@ -107,11 +107,7 @@ UNZIP_VER  :=$(call GetVersion,"$(_UNZIP_VER)")
 BOOT_VER   :=$(call GetVersion,"$(_BOOT_VER)")
 REQUIRED_ANT_VER := 1.6.3
-ifeq ($(ANT_HOME),)
+_ANT_VER:=$(shell $(ANT) -version 2>&1 )
-  _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:=$(call GetVersion,"$(_ANT_VER)")
 ifdef ALT_BINDIR