Changeset 18

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.

Location:

trunk/openjdk

Files:

• jdk/make/common/shared/Defs-utils.gmk (modified) (1 diff)
• langtools/make/Makefile (modified) (4 diffs)

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

trunk/openjdk/langtools/make/Makefile

@@ -49 +49 @@
 else
 DEV_NULL = /dev/null
-endif 
+endif
 endif
 
@@ -76 +76 @@
 ifdef JDK_VERSION
   ANT_OPTIONS += -Djdk.version=$(JDK_VERSION)
-endif 
+endif
 
 ifdef FULL_VERSION
   ANT_OPTIONS += -Dfull.version='$(FULL_VERSION)' # will contain spaces
-endif 
+endif
 
 ifdef MILESTONE
@@ -116 +116 @@
   ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
 else
-  ifdef JAVAC_TARGET_ARG 
+  ifdef JAVAC_TARGET_ARG
     ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
   endif
-endif 
+endif
 
 ifdef SOURCE_LANGUAGE_VERSION
   ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
 else
-  ifdef JAVAC_SOURCE_ARG 
+  ifdef JAVAC_SOURCE_ARG
     ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
   endif
-endif 
+endif
 
 ifdef ALT_BOOTDIR
@@ -152 +152 @@
 
 ifdef ANT_HOME
-  ANT = $(ANT_HOME)/bin/ant
-  ifneq ($(shell test -x $(ANT) && echo OK), OK)
+  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)
   endif
 else
   ANT = ant
-  ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
+  ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
     $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
   endif