Changeset 310 for trunk


Ignore:
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
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LocalEnv.tpl.cmd

    r304 r310  
    3333 * environment.
    3434 */
    35 G.PATH_TOOL_GCC4_ENV    = 'D:\Dev\gcc452\gcc452.cmd'
     35/*G.PATH_TOOL_GCC4_ENV    = 'D:\Dev\gcc452\gcc452.cmd'*/
    3636
    3737/**
    … …  
    4242
    4343/**
    44  * Path to Odin32 SDK. Must be set.
     44 * Path to the Odin32 SDK. Must be set. Assumes the source build and should
     45 * point to the root of the source tree. The locaiton of separate parts, if
     46 * differs from the default layout, can be individually tailored below.
    4547 */
    46 G.PATH_LIB_ODIN32       = 'D:\Coding\odin32'
     48G.PATH_SDK_ODIN32_SRCTREE   = 'D:\Coding\odin\odin32'
     49
     50G.PATH_SDK_ODIN32_HEADERS   = G.PATH_SDK_ODIN32_SRCTREE'\include'
     51G.PATH_SDK_ODIN32_LIBS      = G.PATH_SDK_ODIN32_SRCTREE'\out\os2.x86\release\stage\lib'
     52G.PATH_SDK_ODIN32_DBGLIBS   = G.PATH_SDK_ODIN32_SRCTREE'\out\os2.x86\debug\stage\lib'
     53G.PATH_SDK_ODIN32_BIN       = G.PATH_SDK_ODIN32_SRCTREE'\out\os2.x86\release\stage\bin'
     54G.PATH_SDK_ODIN32_DBGBIN    = G.PATH_SDK_ODIN32_SRCTREE'\out\os2.x86\debug\stage\bin'
    4755
    4856/**

  • trunk/env.cmd

    r304 r310  
    112112 * setup GCC
    113113 */
    114 if (G.PATH_TOOL_GCC4_ENV \== '') then do
    115     cmdline = 'call' G.PATH_TOOL_GCC4_ENV
    116     cmdline
    117     drop cmdline
     114if (symbol('G.PATH_TOOL_GCC4_ENV') == 'VAR') then do
     115    if (G.PATH_TOOL_GCC4_ENV \== '') then do
     116        cmdline = 'call' G.PATH_TOOL_GCC4_ENV
     117        cmdline
     118        drop cmdline
     119    end
    118120end
    119121
    … …  
    168170 */
    169171call EnvSetIfEmpty 'ALT_BOOTDIR', UnixSlashes(G.PATH_TOOL_BOOT_JDK)
    170 call EnvSetIfEmpty 'ALT_ODINSDK_PATH', UnixSlashes(G.PATH_LIB_ODIN32)
     172call EnvSetIfEmpty 'ALT_ODINSDK_HEADERS_PATH', UnixSlashes(G.PATH_SDK_ODIN32_HEADERS)
     173call EnvSetIfEmpty 'ALT_ODINSDK_LIB_PATH', UnixSlashes(G.PATH_SDK_ODIN32_LIBS)
     174call EnvSetIfEmpty 'ALT_ODINSDK_DBGLIB_PATH', UnixSlashes(G.PATH_SDK_ODIN32_DBGLIBS)
    171175call EnvSetIfEmpty 'ALT_FREETYPE_HEADERS_PATH', UnixSlashes(ScriptDir'libs\freetype\include')
    172176call EnvSetIfEmpty 'ALT_FREETYPE_LIB_PATH', UnixSlashes(ScriptDir'libs\freetype\lib')
    … …  
    230234if (\fMake) then do
    231235    if (fRelease) then do
    232         call EnvAddFront 'PATH', G.PATH_LIB_ODIN32'\bin\Release;'G.PATH_LIB_ODIN32'\bin'
    233         call EnvAddFront 'BEGINLIBPATH', G.PATH_LIB_ODIN32'\bin\Release;'G.PATH_LIB_ODIN32'\bin'
     236        call EnvAddFront 'PATH', G.PATH_SDK_ODIN32_BIN';'G.PATH_LIB_ODIN32_SRCTREE'\bin'
     237        call EnvAddFront 'BEGINLIBPATH', G.PATH_SDK_ODIN32_BIN';'G.PATH_LIB_ODIN32_SRCTREE'\bin'
    234238    end
    235239    else do
    236         call EnvAddFront 'PATH', G.PATH_LIB_ODIN32'\bin\Debug;'G.PATH_LIB_ODIN32'\bin'
    237         call EnvAddFront 'BEGINLIBPATH', G.PATH_LIB_ODIN32'\bin\Debug;'G.PATH_LIB_ODIN32'\bin'
     240        call EnvAddFront 'PATH', G.PATH_SDK_ODIN32_DBGBIN';'G.PATH_LIB_ODIN32_SRCTREE'\bin'
     241        call EnvAddFront 'BEGINLIBPATH', G.PATH_SDK_ODIN32_DBGBIN';'G.PATH_LIB_ODIN32_SRCTREE'\bin'
    238242        call EnvSet 'WIN32.DEBUGBREAK', '1'
    239243    end
    … …  
    278282end
    279283else do
    280     if (G.LOG_FILE \== '') then do
     284    if (G.LOG_FILE \== '' & aArgs \= '') then do
    281285        /* copy all output to the log file */
    282286        aArgs = aArgs '2>&1 | tee' G.LOG_FILE

  • trunk/openjdk/Makefile

    r309 r310  
    332332MSDEVTOOLS_PATH.desc       = Root directory of VC++ tools (e.g. rc.exe)
    333333MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
    334 ODINSDK_PATH.desc          = Root directory of Odin32 SDK (OS/2)
     334ODINSDK_HEADERS_PATH.desc  = Include directory of Odin32 SDK (OS/2)
     335ODINSDK_LIB_PATH.desc      = Library directory of Odin32 SDK (OS/2)
     336ODINSDK_DBGLIB_PATH.desc   = Debug Library directory of Odin32 SDK (OS/2, optional)
    335337
    336338# Make variables to print out (description and value)
    … …  
    376378
    377379VARIABLE_PRINTVAL_LIST +=       \
    378     ODINSDK_PATH
     380    ODINSDK_HEADERS_PATH        \
     381    ODINSDK_LIB_PATH
    379382
    380383VARIABLE_CHECKDIR_LIST +=       \
    381     ODINSDK_PATH
     384    ODINSDK_HEADERS_PATH        \
     385    ODINSDK_LIB_PATH
    382386
    383387endif

  • trunk/openjdk/corba/make/common/Defs-os2.gmk

    r258 r310  
    164164                   -D_POSIX_C_SOURCE=200112 -D_EMX_SOURCE -D_XOPEN_SOURCE=600 \
    165165                                   -D_SVID_SOURCE
    166 CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include \
     166CPPFLAGS_COMMON += -I$(ODINSDK_HEADERS_PATH)/Win -I$(ODINSDK_HEADERS_PATH) \
    167167                   -DWINE_LARGE_INTEGER
    168168
    169 LDFLAGS_OPT     += -L$(ODINSDK_PATH)/lib/Release -L$(ODINSDK_PATH)/lib
    170 LDFLAGS_DBG     += -L$(ODINSDK_PATH)/lib/Debug -L$(ODINSDK_PATH)/lib
     169LDFLAGS_OPT     += -L$(ODINSDK_LIB_PATH)
     170LDFLAGS_DBG     += -L$(firstword $(ODINSDK_DBGLIB_PATH) $(ODINSDK_LIB_PATH))
    171171LDFLAGS_COMMON  += -lkernel32.lib -luser32.lib -ladvapi32.lib \
    172                                    -lminivcrt.lib -lntdll.lib \
    173                                    -llibwrap0.lib -llibwrap1.lib
     172                                   -lminivcrt.lib -lntdll.lib -llibwrap.lib
    174173
    175174#

  • trunk/openjdk/corba/make/common/shared/Defs-os2.gmk

    r258 r310  
    142142endif
    143143
    144 # ODINSDK_PATH: Path to the root directory of Odin32 SDK
    145 ifdef ALT_ODINSDK_PATH
    146   xALT_ODINSDK_PATH :="$(subst \,/,$(ALT_ODINSDK_PATH))"
    147   ODINSDK_PATH      :=$(call FullPath,$(xALT_ODINSDK_PATH))
     144# ODINSDK_HEADERS_PATH: Include directory of Odin32 SDK (OS/2)
     145ifdef ALT_ODINSDK_HEADERS_PATH
     146  xALT_ODINSDK_HEADERS_PATH :="$(subst \,/,$(ALT_ODINSDK_HEADERS_PATH))"
     147  ODINSDK_HEADERS_PATH      :=$(call FullPath,$(xALT_ODINSDK_HEADERS_PATH))
    148148endif
    149 ODINSDK_PATH :=$(call AltCheckSpaces,ODINSDK_PATH)
    150 ODINSDK_PATH :=$(call AltCheckValue,ODINSDK_PATH)
     149ODINSDK_HEADERS_PATH :=$(call AltCheckSpaces,ODINSDK_HEADERS_PATH)
     150ODINSDK_HEADERS_PATH :=$(call AltCheckValue,ODINSDK_HEADERS_PATH)
     151
     152# ODINSDK_LIB_PATH: Library directory of Odin32 SDK (OS/2)
     153ifdef ALT_ODINSDK_LIB_PATH
     154  xALT_ODINSDK_LIB_PATH :="$(subst \,/,$(ALT_ODINSDK_LIB_PATH))"
     155  ODINSDK_LIB_PATH      :=$(call FullPath,$(xALT_ODINSDK_LIB_PATH))
     156endif
     157ODINSDK_LIB_PATH :=$(call AltCheckSpaces,ODINSDK_LIB_PATH)
     158ODINSDK_LIB_PATH :=$(call AltCheckValue,ODINSDK_LIB_PATH)
     159
     160# ODINSDK_DBGLIB_PATH: Debug Library directory of Odin32 SDK (OS/2)
     161ifdef ALT_ODINSDK_DBGLIB_PATH
     162  xALT_ODINSDK_DBGLIB_PATH :="$(subst \,/,$(ALT_ODINSDK_DBGLIB_PATH))"
     163  ODINSDK_DBGLIB_PATH      :=$(call FullPath,$(xALT_ODINSDK_DBGLIB_PATH))
     164endif
     165ODINSDK_DBGLIB_PATH :=$(call AltCheckSpaces,ODINSDK_DBGLIB_PATH)
     166ODINSDK_DBGLIB_PATH :=$(call AltCheckValue,ODINSDK_DBGLIB_PATH)
    151167
    152168# Import JDK images allow for partial builds, components not built are

  • trunk/openjdk/hotspot/make/os2/makefiles/compile.make

    r245 r310  
    7777             -D_POSIX_C_SOURCE=200112 -D_EMX_SOURCE -D_XOPEN_SOURCE=600 \
    7878                 -D_SVID_SOURCE
    79 CPP_FLAGS += -I$(ALT_ODINSDK_PATH)/include/Win -I$(ALT_ODINSDK_PATH)/include
     79CPP_FLAGS += -I$(ALT_ODINSDK_HEADERS_PATH)/Win -I$(ALT_ODINSDK_HEADERS_PATH)
    8080
    81 PRODUCT_LINK_FLAGS      += -L$(ALT_ODINSDK_PATH)/lib/Release -L$(ALT_ODINSDK_PATH)/lib
    82 FASTDEBUG_LINK_FLAGS    += -L$(ALT_ODINSDK_PATH)/lib/Debug -L$(ALT_ODINSDK_PATH)/lib
    83 DEBUG_LINK_FLAGS        += -L$(ALT_ODINSDK_PATH)/lib/Debug -L$(ALT_ODINSDK_PATH)/lib
     81PRODUCT_LINK_FLAGS      += -L$(ALT_ODINSDK_LIB_PATH)
     82FASTDEBUG_LINK_FLAGS    += -L$(firstword $(ALT_ODINSDK_DBGLIB_PATH) $(ALT_ODINSDK_LIB_PATH))
     83DEBUG_LINK_FLAGS        += -L$(firstword $(ALT_ODINSDK_DBGLIB_PATH) $(ALT_ODINSDK_LIB_PATH))
    8484
    8585LINK_FLAGS  += -lkernel32.lib -luser32.lib -lgdi32.lib -lwinspool.lib \
    8686               -lcomdlg32.lib -ladvapi32.lib -lshell32.lib -lole32.lib \
    87                -loleaut32.lib -lWsock32.lib -lwinmm.lib \
    88                -llibwrap0.lib -llibwrap1.lib
     87               -loleaut32.lib -lWsock32.lib -lwinmm.lib -llibwrap.lib

  • trunk/openjdk/jdk/make/Makefile

    r279 r310  
    106106UNICOWS_DLL_PATH.desc      = Directory containing unicows.dll
    107107UNICOWS_LIB_PATH.desc      = Directory containing unicows.lib
    108 ODINSDK_PATH.desc          = Root directory of Odin32 SDK (OS/2)
     108ODINSDK_HEADERS_PATH.desc  = Include directory of Odin32 SDK (OS/2)
     109ODINSDK_LIB_PATH.desc      = Library directory of Odin32 SDK (OS/2)
     110ODINSDK_DBGLIB_PATH.desc   = Debug Library directory of Odin32 SDK (OS/2, optional)
    109111
    110112# Make variables to print out (description and value)
    … …  
    159161
    160162VARIABLE_PRINTVAL_LIST +=       \
    161     ODINSDK_PATH
     163    ODINSDK_HEADERS_PATH        \
     164    ODINSDK_LIB_PATH
    162165
    163166VARIABLE_CHECKDIR_LIST +=       \
    164     ODINSDK_PATH
     167    ODINSDK_HEADERS_PATH        \
     168    ODINSDK_LIB_PATH
    165169
    166170endif

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

    r221 r310  
    174174                   -D_POSIX_C_SOURCE=200112 -D_EMX_SOURCE -D_XOPEN_SOURCE=600 \
    175175                                   -D_SVID_SOURCE
    176 CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include \
     176CPPFLAGS_COMMON += -I$(ODINSDK_HEADERS_PATH)/Win -I$(ODINSDK_HEADERS_PATH) \
    177177                   -DWINE_LARGE_INTEGER
    178178
    179 LDFLAGS_OPT     += -L$(ODINSDK_PATH)/lib/Release -L$(ODINSDK_PATH)/lib
    180 LDFLAGS_DBG     += -L$(ODINSDK_PATH)/lib/Debug -L$(ODINSDK_PATH)/lib
     179LDFLAGS_OPT     += -L$(ODINSDK_LIB_PATH)
     180LDFLAGS_DBG     += -L$(firstword $(ODINSDK_DBGLIB_PATH) $(ODINSDK_LIB_PATH))
    181181LDFLAGS_COMMON  += -lkernel32.lib -luser32.lib -ladvapi32.lib \
    182                                    -lminivcrt.lib -lntdll.lib \
    183                                    -llibwrap0.lib -llibwrap1.lib
     182                                   -lminivcrt.lib -lntdll.lib -llibwrap.lib
    184183
    185184#

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

    r29 r310  
    142142endif
    143143
    144 # ODINSDK_PATH: Path to the root directory of Odin32 SDK
    145 ifdef ALT_ODINSDK_PATH
    146   xALT_ODINSDK_PATH :="$(subst \,/,$(ALT_ODINSDK_PATH))"
    147   ODINSDK_PATH      :=$(call FullPath,$(xALT_ODINSDK_PATH))
    148 endif
    149 ODINSDK_PATH :=$(call AltCheckSpaces,ODINSDK_PATH)
    150 ODINSDK_PATH :=$(call AltCheckValue,ODINSDK_PATH)
     144# ODINSDK_HEADERS_PATH: Include directory of Odin32 SDK (OS/2)
     145ifdef ALT_ODINSDK_HEADERS_PATH
     146  xALT_ODINSDK_HEADERS_PATH :="$(subst \,/,$(ALT_ODINSDK_HEADERS_PATH))"
     147  ODINSDK_HEADERS_PATH      :=$(call FullPath,$(xALT_ODINSDK_HEADERS_PATH))
     148endif
     149ODINSDK_HEADERS_PATH :=$(call AltCheckSpaces,ODINSDK_HEADERS_PATH)
     150ODINSDK_HEADERS_PATH :=$(call AltCheckValue,ODINSDK_HEADERS_PATH)
     151
     152# ODINSDK_LIB_PATH: Library directory of Odin32 SDK (OS/2)
     153ifdef ALT_ODINSDK_LIB_PATH
     154  xALT_ODINSDK_LIB_PATH :="$(subst \,/,$(ALT_ODINSDK_LIB_PATH))"
     155  ODINSDK_LIB_PATH      :=$(call FullPath,$(xALT_ODINSDK_LIB_PATH))
     156endif
     157ODINSDK_LIB_PATH :=$(call AltCheckSpaces,ODINSDK_LIB_PATH)
     158ODINSDK_LIB_PATH :=$(call AltCheckValue,ODINSDK_LIB_PATH)
     159
     160# ODINSDK_DBGLIB_PATH: Debug Library directory of Odin32 SDK (OS/2)
     161ifdef ALT_ODINSDK_DBGLIB_PATH
     162  xALT_ODINSDK_DBGLIB_PATH :="$(subst \,/,$(ALT_ODINSDK_DBGLIB_PATH))"
     163  ODINSDK_DBGLIB_PATH      :=$(call FullPath,$(xALT_ODINSDK_DBGLIB_PATH))
     164endif
     165ODINSDK_DBGLIB_PATH :=$(call AltCheckSpaces,ODINSDK_DBGLIB_PATH)
     166ODINSDK_DBGLIB_PATH :=$(call AltCheckValue,ODINSDK_DBGLIB_PATH)
    151167
    152168# Import JDK images allow for partial builds, components not built are

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

    r309 r310  
    234234endif
    235235ifeq ($(PLATFORM),os2)
    236   ALL_SETTINGS+=$(call addAltSetting,ODINSDK_PATH)
     236  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_HEADERS_PATH)
     237  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_LIB_PATH)
     238  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_DBGLIB_PATH)
    237239endif
    238240ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)

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

    r309 r310  
    13121312sane-odinsdk:
    13131313ifeq ($(PLATFORM), os2)
    1314         @if [ ! -r $(ODINSDK_PATH)/include/odin.h  ]; then \
     1314        @if [ ! -r $(ODINSDK_HEADERS_PATH)/odin.h  ]; then \
    13151315        $(ECHO) "ERROR: You do not have access to a valid Odin32 SDK include dir.\n" \
    1316           "      The value of ODINSDK_PATH must point a valid Odin32 SDK dir.\n" \
     1316          "      The value of ODINSDK_HEADERS_PATH must point a valid Odin32 SDK dir.\n" \
    13171317          "      Please check your access to \n" \
    1318           "          $(ODINSDK_PATH)/include \n" \
    1319           "      and/or check your value of ALT_ODINSDK_PATH.\n" \
     1318          "          $(ODINSDK_HEADERS_PATH) \n" \
     1319          "      and/or check your value of ALT_ODINSDK_HEADERS_PATH.\n" \
    13201320          "" >> $(ERROR_FILE) ; \
    13211321        fi
    1322         @if [ ! -r $(ODINSDK_PATH)/lib/odincrt.lib -a \
    1323               ! -r $(ODINSDK_PATH)/lib/Release/odincrt.lib ]; then \
     1322        @if [ ! -r $(ODINSDK_LIB_PATH)/odincrt.lib ]; then \
    13241323        $(ECHO) "ERROR: You do not have access to a valid Odin32 SDK lib dir.\n" \
    1325           "      The value of ODINSDK_PATH must point a valid Odin32 SDK dir.\n" \
     1324          "      The value of ODINSDK_LIB_PATH must point a valid Odin32 SDK dir.\n" \
    13261325          "      Please check your access to \n" \
    1327           "          $(ODINSDK_PATH)/lib          or \n" \
    1328           "          $(ODINSDK_PATH)/lib/Release \n" \
    1329           "      and/or check your value of ALT_ODINSDK_PATH.\n" \
     1326          "          $(ODINSDK_LIB_PATH)/lib \n" \
     1327          "      and/or check your value of ALT_ODINSDK_LIB_PATH.\n" \
    13301328          "" >> $(ERROR_FILE) ; \
    13311329        fi
Note: See TracChangeset for help on using the changeset viewer.