Changeset 27 for trunk/openjdk/jdk/make/common

Timestamp:

Jun 17, 2010, 4:08:35 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Integrate Odin SDK to the compiler/linker definitions and require a valid path to it to be set.

Location:

trunk/openjdk/jdk/make/common

Files:

• Defs-os2.gmk (modified) (3 diffs)
• Library.gmk (modified) (5 diffs)
• Sanity.gmk (modified) (1 diff)
• shared/Defs-os2.gmk (modified) (1 diff)
• shared/Sanity-Settings.gmk (modified) (1 diff)
• shared/Sanity.gmk (modified) (1 diff)

trunk/openjdk/jdk/make/common/Defs-os2.gmk

@@ -44 +44 @@
 
 ifndef PLATFORM_SRC
-  PLATFORM_SRC  = $(BUILDDIR)/../src/os2
+  # We mostly reuse the windows code so far.
+  PLATFORM_SRC  = $(BUILDDIR)/../src/windows
 endif # PLATFORM_SRC
 
@@ -75 +76 @@
 # level.
 #
-HPIS = os2
+HPIS = windows
 
 #
@@ -134 +135 @@
 # Linker options
 #
-LDFLAGS_COMMON  = -Zomf -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
+LDFLAGS_COMMON  = -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
 LDFLAGS_OPT     = -s
 LDFLAGS_DBG     =
+
+#
+# Additional libraries needed by all targets
+#
+
+CPPFLAGS_COMMON += -D__WIN32OS2__ -D__i386__
+CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include
+LDFLAGS_COMMON  += -L$(ODINSDK_PATH)/lib -L$(ODINSDK_PATH)/lib/Release
+EXTRA_LIBS      +=
 
 #

trunk/openjdk/jdk/make/common/Library.gmk

@@ -40 +40 @@
 
 ifeq ($(LIBRARY), fdlibm)
-ifeq ($(PLATFORM),windows)
+ifeq ($(filter-out windows os2,$(PLATFORM)),)
 ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY).$(FDDLIBM_SUFFIX)
 ACTUAL_LIBRARY_DIR = $(OBJDIR)
@@ -177 +177 @@
                 @$(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(LDLIBS_COMMON)
 else # LIBRARY
-# build it into $(OBJDIR) so that the other generated files get put 
+# build it into $(OBJDIR) so that the other generated files get put
 # there, then copy just the DLL (and MAP file) to the requested directory.
 #
@@ -196 +196 @@
         @$(prep-target)
         @$(MKDIR) -p $(TEMPDIR)
-        @$(ECHO) $(FILES_o) > $@ 
+        @$(ECHO) $(FILES_o) > $@
 ifndef LOCAL_RESOURCE_FILE
         @$(ECHO) $(OBJDIR)/$(LIBRARY).res >> $@
 endif
-        @$(ECHO) Created $@ 
+        @$(ECHO) Created $@
 
 # J2SE name required here
@@ -219 +219 @@
 $(ACTUAL_LIBRARY):: $(LIBDIR)/$(LIBRARY).lib
 
-clean:: 
+clean::
         -$(RM) $(LIBDIR)/$(LIBRARY).lib
 
@@ -257 +257 @@
 ifeq ($(PLATFORM),solaris)
 lint.errors : $(FILES_ln)
-        $(LINT.c) $(FILES_ln) $(LDLIBS) 
+        $(LINT.c) $(FILES_ln) $(LDLIBS)
 endif
 

trunk/openjdk/jdk/make/common/Sanity.gmk

@@ -73 +73 @@
     sane-ant_version \
     sane-zip_version \
-    sane-msvcrt_path
+    sane-msvcrt_path \
+    sane-odinsdk
 
 # The rules sanity-* have a one-to-one correspondence with the major targets

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

@@ -140 +140 @@
   _BOOTDIR2  =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
 endif
+
+# ODINSDK_PATH: Path to the root directory of Odin32 SDK
+ifdef ALT_ODINSDK_PATH
+  xALT_ODINSDK_PATH :="$(subst \,/,$(ALT_ODINSDK_PATH))"
+  ODINSDK_PATH      :=$(call FullPath,$(xALT_ODINSDK_PATH))
+endif
+ODINSDK_PATH :=$(call AltCheckSpaces,ODINSDK_PATH)
+ODINSDK_PATH :=$(call AltCheckValue,ODINSDK_PATH)
 
 # Import JDK images allow for partial builds, components not built are

trunk/openjdk/jdk/make/common/shared/Sanity-Settings.gmk

@@ -247 +247 @@
   endif
 endif
+ifeq ($(PLATFORM),os2)
+  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_PATH)
+endif
 ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
 ifndef OPENJDK

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

@@ -1344 +1344 @@
 
 ######################################################
+# Check for Odin32 SDK directory
+######################################################
+sane-odinsdk:
+ifeq ($(PLATFORM), os2)
+        @if [ ! -r $(ODINSDK_PATH)/include/odin.h  ]; then \
+        $(ECHO) "ERROR: You do not have access to a valid Odin32 SDK include dir.\n" \
+          "      The value of ODINSDK_PATH must point a valid Odin32 SDK dir.\n" \
+          "      Please check your access to \n" \
+          "          $(ODINSDK_PATH)/include \n" \
+          "      and/or check your value of ALT_ODINSDK_PATH.\n" \
+          "" >> $(ERROR_FILE) ; \
+        fi
+        @if [ ! -r $(ODINSDK_PATH)/lib/odincrt.lib -a \
+              ! -r $(ODINSDK_PATH)/lib/Release/odincrt.lib ]; then \
+        $(ECHO) "ERROR: You do not have access to a valid Odin32 SDK lib dir.\n" \
+          "      The value of ODINSDK_PATH must point a valid Odin32 SDK dir.\n" \
+          "      Please check your access to \n" \
+          "          $(ODINSDK_PATH)/lib          or \n" \
+          "          $(ODINSDK_PATH)/lib/Release \n" \
+          "      and/or check your value of ALT_ODINSDK_PATH.\n" \
+          "" >> $(ERROR_FILE) ; \
+        fi
+endif
+
+######################################################
 # Check the linker version(s)
 ######################################################