Changeset 310 for trunk/openjdk/jdk/make/common/shared

Timestamp:

Feb 14, 2012, 9:22:16 PM (14 years ago)

Author:

dmik

Message:

Tailor makefiles for the new Odin 8.x build layout.

Location:

trunk/openjdk/jdk/make/common/shared

Files:

• Defs-os2.gmk (modified) (1 diff)
• Sanity-Settings.gmk (modified) (1 diff)
• Sanity.gmk (modified) (1 diff)

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

@@ -142 +142 @@
 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)
+# ODINSDK_HEADERS_PATH: Include directory of Odin32 SDK (OS/2)
+ifdef ALT_ODINSDK_HEADERS_PATH
+  xALT_ODINSDK_HEADERS_PATH :="$(subst \,/,$(ALT_ODINSDK_HEADERS_PATH))"
+  ODINSDK_HEADERS_PATH      :=$(call FullPath,$(xALT_ODINSDK_HEADERS_PATH))
+endif
+ODINSDK_HEADERS_PATH :=$(call AltCheckSpaces,ODINSDK_HEADERS_PATH)
+ODINSDK_HEADERS_PATH :=$(call AltCheckValue,ODINSDK_HEADERS_PATH)
+
+# ODINSDK_LIB_PATH: Library directory of Odin32 SDK (OS/2)
+ifdef ALT_ODINSDK_LIB_PATH
+  xALT_ODINSDK_LIB_PATH :="$(subst \,/,$(ALT_ODINSDK_LIB_PATH))"
+  ODINSDK_LIB_PATH      :=$(call FullPath,$(xALT_ODINSDK_LIB_PATH))
+endif
+ODINSDK_LIB_PATH :=$(call AltCheckSpaces,ODINSDK_LIB_PATH)
+ODINSDK_LIB_PATH :=$(call AltCheckValue,ODINSDK_LIB_PATH)
+
+# ODINSDK_DBGLIB_PATH: Debug Library directory of Odin32 SDK (OS/2)
+ifdef ALT_ODINSDK_DBGLIB_PATH
+  xALT_ODINSDK_DBGLIB_PATH :="$(subst \,/,$(ALT_ODINSDK_DBGLIB_PATH))"
+  ODINSDK_DBGLIB_PATH      :=$(call FullPath,$(xALT_ODINSDK_DBGLIB_PATH))
+endif
+ODINSDK_DBGLIB_PATH :=$(call AltCheckSpaces,ODINSDK_DBGLIB_PATH)
+ODINSDK_DBGLIB_PATH :=$(call AltCheckValue,ODINSDK_DBGLIB_PATH)
 
 # Import JDK images allow for partial builds, components not built are

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

@@ -234 +234 @@
 endif
 ifeq ($(PLATFORM),os2)
-  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_PATH)
+  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_HEADERS_PATH)
+  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_LIB_PATH)
+  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_DBGLIB_PATH)
 endif
 ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)

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

@@ -1312 +1312 @@
 sane-odinsdk:
 ifeq ($(PLATFORM), os2)
-        @if [ ! -r $(ODINSDK_PATH)/include/odin.h  ]; then \
+        @if [ ! -r $(ODINSDK_HEADERS_PATH)/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" \
+          "      The value of ODINSDK_HEADERS_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" \
+          "          $(ODINSDK_HEADERS_PATH) \n" \
+          "      and/or check your value of ALT_ODINSDK_HEADERS_PATH.\n" \
           "" >> $(ERROR_FILE) ; \
         fi
-        @if [ ! -r $(ODINSDK_PATH)/lib/odincrt.lib -a \
-              ! -r $(ODINSDK_PATH)/lib/Release/odincrt.lib ]; then \
+        @if [ ! -r $(ODINSDK_LIB_PATH)/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" \
+          "      The value of ODINSDK_LIB_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" \
+          "          $(ODINSDK_LIB_PATH)/lib \n" \
+          "      and/or check your value of ALT_ODINSDK_LIB_PATH.\n" \
           "" >> $(ERROR_FILE) ; \
         fi