Changeset 72 for trunk/openjdk/jaxp/make/Makefile

Timestamp:

Jul 21, 2010, 8:48:25 PM (15 years ago)

Author:

dmik

Message:

jaxp/jaxws: Adoptes makefiles for OS/2.

File:

• trunk/openjdk/jaxp/make/Makefile (modified) (4 diffs)

trunk/openjdk/jaxp/make/Makefile

@@ -61 +61 @@
   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
 
 # Figure out the platform we are using
@@ -75 +75 @@
   _PLATFORM_KIND = windows
 endif
+ifeq ($(_SYSTEM_UNAME), OS/2)
+  _PLATFORM_KIND = os2
+endif
 
 # Where is /java in case we need it
@@ -80 +83 @@
   _SLASHJAVA = $(ALT_SLASH_JAVA)
 else
-  ifeq ($(_PLATFORM_KIND), windows)
+  ifeq ($(filter-out windows os2, $(_PLATFORM_KIND)),)
     _SLASHJAVA=J:/
   else
@@ -125 +128 @@
 
 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