Changeset 72


Ignore:
Timestamp:
Jul 21, 2010, 8:48:25 PM (15 years ago)
Author:
dmik
Message:

jaxp/jaxws: Adoptes makefiles for OS/2.

Location:
trunk/openjdk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jaxp/make/Makefile

    r2 r72  
    6161  ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
    6262else
    63   ifdef JAVAC_SOURCE_ARG 
     63  ifdef JAVAC_SOURCE_ARG
    6464    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
    6565  endif
    66 endif 
     66endif
    6767
    6868# Figure out the platform we are using
    … …  
    7575  _PLATFORM_KIND = windows
    7676endif
     77ifeq ($(_SYSTEM_UNAME), OS/2)
     78  _PLATFORM_KIND = os2
     79endif
    7780
    7881# Where is /java in case we need it
    … …  
    8083  _SLASHJAVA = $(ALT_SLASH_JAVA)
    8184else
    82   ifeq ($(_PLATFORM_KIND), windows)
     85  ifeq ($(filter-out windows os2, $(_PLATFORM_KIND)),)
    8386    _SLASHJAVA=J:/
    8487  else
    … …  
    125128
    126129ifdef ANT_HOME
    127   ANT = $(ANT_HOME)/bin/ant
     130  ifeq ($(PLATFORM), windows)
     131    ANT = $(subst \,/,$(ANT_HOME))/bin/ant.bat
     132  else
     133  ifeq ($(PLATFORM), os2)
     134    ANT = $(subst \,/,$(ANT_HOME))/bin/ant.cmd
     135  else
     136    ANT = $(ANT_HOME)/bin/ant
     137  endif
     138  endif
    128139  ifneq ($(shell test -x $(ANT); echo $$?), 0)
    129     $(error "$(ANT) not found; please update ANT_HOME")
     140    $(error $(ANT) not found -- please update ANT_HOME)
    130141  endif
    131142else
    132143  ANT = ant
    133144  ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
    134     $(error "\"ant\" not found; please set ANT_HOME or put \"ant\" on your PATH")
     145    $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
    135146  endif
    136147endif

  • trunk/openjdk/jaxws/make/Makefile

    r2 r72  
    6161  ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
    6262else
    63   ifdef JAVAC_SOURCE_ARG 
     63  ifdef JAVAC_SOURCE_ARG
    6464    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
    6565  endif
    66 endif 
     66endif
    6767
    6868# Figure out the platform we are using
    … …  
    7575  _PLATFORM_KIND = windows
    7676endif
     77ifeq ($(_SYSTEM_UNAME), OS/2)
     78  _PLATFORM_KIND = os2
     79endif
    7780
    7881# Where is /java in case we need it
    … …  
    8083  _SLASHJAVA = $(ALT_SLASH_JAVA)
    8184else
    82   ifeq ($(_PLATFORM_KIND), windows)
     85  ifeq ($(filter-out windows os2, $(_PLATFORM_KIND)),)
    8386    _SLASHJAVA=J:/
    8487  else
    … …  
    125128
    126129ifdef ANT_HOME
    127   ANT = $(ANT_HOME)/bin/ant
     130  ifeq ($(PLATFORM), windows)
     131    ANT = $(subst \,/,$(ANT_HOME))/bin/ant.bat
     132  else
     133  ifeq ($(PLATFORM), os2)
     134    ANT = $(subst \,/,$(ANT_HOME))/bin/ant.cmd
     135  else
     136    ANT = $(ANT_HOME)/bin/ant
     137  endif
     138  endif
    128139  ifneq ($(shell test -x $(ANT); echo $$?), 0)
    129     $(error "$(ANT) not found; please update ANT_HOME")
     140    $(error $(ANT) not found -- please update ANT_HOME)
    130141  endif
    131142else
    132143  ANT = ant
    133144  ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
    134     $(error "\"ant\" not found; please set ANT_HOME or put \"ant\" on your PATH")
     145    $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
    135146  endif
    136147endif
Note: See TracChangeset for help on using the changeset viewer.