Changeset 18 for trunk/openjdk/jdk/make

Timestamp:

Jun 9, 2010, 5:23:43 PM (15 years ago)

Author:

dmik

Message:

make: Use platform specific extensions when searching for ant in $ANT_HOME/bin.

File:

• trunk/openjdk/jdk/make/common/shared/Defs-utils.gmk (modified) (1 diff)

trunk/openjdk/jdk/make/common/shared/Defs-utils.gmk

@@ -70 +70 @@
 # Ant
 ifdef ANT_HOME
-  ANT = $(ANT_HOME)/bin/ant
+  ifeq ($(PLATFORM), windows)
+    ANT = $(subst \,/,$(ANT_HOME))/bin/ant.bat
+  else
+  ifeq ($(PLATFORM), os2)
+    ANT = $(subst \,/,$(ANT_HOME))/bin/ant.cmd
+  else
+    ANT = $(ANT_HOME)/bin/ant
+  endif
+  endif
   ifneq ($(shell test -x $(ANT); echo $$?), 0)
-    $(error "$(ANT) not found; please update ANT_HOME")
+    $(error $(ANT) not found -- please update ANT_HOME)
   endif
 else
   ANT = ant
   ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
-    $(error "\"ant\" not found; please set ANT_HOME or put \"ant\" on your PATH")
+    $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
   endif
 endif