Changeset 7

Timestamp:

Jun 5, 2010, 1:01:45 AM (15 years ago)

Author:

dmik

Message:

Added OS/2 versions of make files for JDK.

Location:

trunk/openjdk/jdk/make/common

Files:

• Defs-os2.gmk (added)
• shared/Compiler.gmk (modified) (1 diff)
• shared/Defs-os2.gmk (added)
• shared/Platform.gmk (modified) (8 diffs)

trunk/openjdk/jdk/make/common/shared/Compiler.gmk

@@ -33 +33 @@
 endif
 
+# OS/2 uses GNU compilers by default
+ifeq ($(PLATFORM), os2)
+  override CC_VERSION = gcc
+endif
+
 # Solaris uses Sun Studio compilers by default
 ifeq ($(PLATFORM), solaris)

trunk/openjdk/jdk/make/common/shared/Platform.gmk

@@ -73 +73 @@
 #     LIBARCH32                   solaris only: sparc or i386
 #     LIBARCH64                   solaris only: sparcv9 or amd64
-#     REQUIRED_WINDOWS_VERSION    windows only: specific version of windows 
+#     REQUIRED_WINDOWS_VERSION    windows only: specific version of windows
 #     USING_CYGWIN                windows only: true or false
 #     WINDOWS_NT_VERSION_STRING   windows only: long version name
@@ -86 +86 @@
 #     REQUIRED_LINUX_FULLVER      linux only: required full version of linux
 #     REQUIRED_ALSA_VERSION       linux only: required version of ALSA
-#     REQUIRED_FREETYPE_VERSION   openjdk only: required version of freetype 
+#     REQUIRED_FREETYPE_VERSION   openjdk only: required version of freetype
 
 SYSTEM_UNAME := $(shell uname)
@@ -174 +174 @@
     REQUIRED_OS_VERSION = 5.8
   endif
-  # Minimum disk space needed as determined by running 'du -sk' on 
+  # Minimum disk space needed as determined by running 'du -sk' on
   #    a fully built workspace.
   ifeq ($(ARCH_FAMILY), sparc)
@@ -250 +250 @@
   # Suffix for file bundles used in previous release
   BUNDLE_FILE_SUFFIX=.tar.gz
-  # Minimum disk space needed as determined by running 'du -sk' on 
+  # Minimum disk space needed as determined by running 'du -sk' on
   #    a fully built workspace.
   REQUIRED_FREE_SPACE=1460000
@@ -372 +372 @@
   # Suffix for file bundles used in previous release
   BUNDLE_FILE_SUFFIX=.tar
-  # Minimum disk space needed as determined by running 'du -sk' on 
+  # Minimum disk space needed as determined by running 'du -sk' on
   #    a fully built workspace.
   REQUIRED_FREE_SPACE=500000
@@ -389 +389 @@
       echo "512"; \
     fi)
+endif
+
+# Platform settings specific to OS/2
+ifeq ($(SYSTEM_UNAME), OS/2)
+  PLATFORM = os2
+  OS_NAME = os2
+  OS_VERSION := $(shell uname -r)
+  OS_VENDOR = IBM
+  TEMP_DISK = $(subst \,/,$(TEMP))
+  ARCH_DATA_MODEL = 32
+  ARCH = i586
+  # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
+  LIBARCH = i386
+  # Value of Java os.arch property
+  ARCHPROP = x86
+  ARCH_FAMILY = $(ARCH)
+  # Where is unwanted output to be delivered?
+  DEV_NULL = nul
+  # Classpath separator
+  CLASSPATH_SEPARATOR = ;
+  # The suffix used for object file (.o for unix .obj for windows)
+  OBJECT_SUFFIX = obj
+  # The suffix applied to executables (.exe for windows, nothing for solaris)
+  EXE_SUFFIX = .exe
+  # The prefix applied to library files (lib for solaris, nothing for windows)
+  LIB_PREFIX =
+  LIBRARY_SUFFIX = dll
+  LIB_SUFFIX = lib
+  # User name determination (set _USER)
+  ifndef USER
+    ifdef USERNAME
+      _USER := $(USERNAME)
+    else
+      ifdef LOGNAME
+        _USER := $(LOGNAME)
+      else
+        _USER := $(shell id -un)
+      endif
+    endif
+  else
+    _USER:=$(USER)
+  endif
+  # Location of client/server directories
+  ARCH_VM_SUBDIR=jre/bin
+  # Suffix for file bundles used in previous release
+  BUNDLE_FILE_SUFFIX=.tar
+  # Minimum disk space needed as determined by running 'du -sk' on
+  #    a fully built workspace.
+  REQUIRED_FREE_SPACE=500000
+  # How much RAM does this machine have:
+  # @todo
 endif
 
@@ -427 +478 @@
 
 # Unix type settings (same for all unix platforms)
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows os2, $(PLATFORM)),)
   # Temporary disk area
   TEMP_DISK=/tmp
@@ -433 +484 @@
   DEV_NULL = /dev/null
   export DEV_NULL
-  # Character used between entries in classpath 
+  # Character used between entries in classpath
   CLASSPATH_SEPARATOR = :
   # suffix used for object file (.o for unix .obj for windows)