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

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/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

@@ -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)
 ######################################################