Changeset 27 for trunk


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

Legend:

Unmodified
Added
Removed

  • trunk/env.cmd

    r19 r27  
    8585 */
    8686call EnvSetIfEmtpy 'ALT_BOOTDIR', UnixSlashes(G.PATH_TOOL_BOOT_JDK)
     87call EnvSetIfEmtpy 'ALT_ODINSDK_PATH', UnixSlashes(G.PATH_LIB_ODIN32)
    8788call EnvSetIfEmtpy 'ALT_FREETYPE_HEADERS_PATH', UnixSlashes(ScriptDir'libs\freetype\include')
    8889call EnvSetIfEmtpy 'ALT_FREETYPE_LIB_PATH', UnixSlashes(ScriptDir'libs\freetype\lib')

  • trunk/openjdk/Makefile

    r2 r27  
    116116endif
    117117
    118 build:: sanity 
     118build:: sanity
    119119
    120120clobber::
    … …  
    141141
    142142ifeq ($(BUILD_HOTSPOT), true)
    143   build:: $(HOTSPOT) 
     143  build:: $(HOTSPOT)
    144144  clobber:: hotspot-clobber
    145145endif
    … …  
    168168#   ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
    169169#   The resulting j2sdk-image is used by the install makefiles to create a
    170 #     debug install bundle jdk-*-debug-** bundle (tar or zip) 
     170#     debug install bundle jdk-*-debug-** bundle (tar or zip)
    171171#     which will install in the debug or fastdebug subdirectory of the
    172172#     normal product install area.
    … …  
    281281        @$(ECHO) "================================================="
    282282        @$(ECHO) " "
    283    
     283
    284284    endif
    285285  endif
    … …  
    294294clean: clobber
    295295
    296 all:: 
     296all::
    297297        @$(ECHO) Control build finished: `$(DATE) '+%y-%m-%d %H:%M'`
    298298
    … …  
    384384MSDEVTOOLS_PATH.desc       = Root directory of VC++ tools (e.g. rc.exe)
    385385MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
     386ODINSDK_PATH.desc          = Root directory of Odin32 SDK (OS/2)
    386387
    387388# Make variables to print out (description and value)
    … …  
    402403    JDK_IMPORT_PATH             \
    403404    COMPILER_PATH               \
    404     DEVTOOLS_PATH 
     405    DEVTOOLS_PATH
    405406
    406407# Make variables that should refer to files that exist
    … …  
    420421    MSDEVTOOLS_PATH             \
    421422    MSVCRT_DLL_PATH
     423
     424endif
     425
     426# Some are OS/2 specific
     427ifeq ($(PLATFORM), os2)
     428
     429VARIABLE_PRINTVAL_LIST +=       \
     430    ODINSDK_PATH
     431
     432VARIABLE_CHECKDIR_LIST +=       \
     433    ODINSDK_PATH
    422434
    423435endif
    … …  
    483495# Cycle build. Build the jdk, use it to build the jdk again.
    484496################################################################
    485  
     497
    486498ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
    487  
     499
    488500boot_cycle:
    489501        $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) product_build

  • trunk/openjdk/jdk/make/Makefile

    r2 r27  
    106106UNICOWS_DLL_PATH.desc      = Directory containing unicows.dll
    107107UNICOWS_LIB_PATH.desc      = Directory containing unicows.lib
     108ODINSDK_PATH.desc          = Root directory of Odin32 SDK (OS/2)
    108109
    109110# Make variables to print out (description and value)
    … …  
    151152    UNICOWS_DLL_PATH            \
    152153    UNICOWS_LIB_PATH
     154
     155endif
     156
     157# Some are OS/2 specific
     158ifeq ($(PLATFORM), os2)
     159
     160VARIABLE_PRINTVAL_LIST +=       \
     161    ODINSDK_PATH
     162
     163VARIABLE_CHECKDIR_LIST +=       \
     164    ODINSDK_PATH
    153165
    154166endif
    … …  
    213225# 'all' target intro
    214226#
    215 all:: 
     227all::
    216228        @$(ECHO) $(PLATFORM) $(ARCH) $(RELEASE) build started: $(shell $(DATE) '+%y-%m-%d %H:%M')
    217229
    … …  
    283295# workspace, and if it is a Teamware workspace, then see if there are
    284296# any files which are not under SCCS control.
    285 clean clobber:: 
     297clean clobber::
    286298ifndef EXTERNALSANITYCONTROL
    287299        @if [ -d $(TOPDIR)/Codemgr_wsdata ]; then \

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

    r14 r27  
    4444
    4545ifndef PLATFORM_SRC
    46   PLATFORM_SRC  = $(BUILDDIR)/../src/os2
     46  # We mostly reuse the windows code so far.
     47  PLATFORM_SRC  = $(BUILDDIR)/../src/windows
    4748endif # PLATFORM_SRC
    4849
    … …  
    7576# level.
    7677#
    77 HPIS = os2
     78HPIS = windows
    7879
    7980#
    … …  
    134135# Linker options
    135136#
    136 LDFLAGS_COMMON  = -Zomf -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
     137LDFLAGS_COMMON  = -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
    137138LDFLAGS_OPT     = -s
    138139LDFLAGS_DBG     =
     140
     141#
     142# Additional libraries needed by all targets
     143#
     144
     145CPPFLAGS_COMMON += -D__WIN32OS2__ -D__i386__
     146CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include
     147LDFLAGS_COMMON  += -L$(ODINSDK_PATH)/lib -L$(ODINSDK_PATH)/lib/Release
     148EXTRA_LIBS      +=
    139149
    140150#

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

    r2 r27  
    4040
    4141ifeq ($(LIBRARY), fdlibm)
    42 ifeq ($(PLATFORM),windows)
     42ifeq ($(filter-out windows os2,$(PLATFORM)),)
    4343ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY).$(FDDLIBM_SUFFIX)
    4444ACTUAL_LIBRARY_DIR = $(OBJDIR)
    … …  
    177177                @$(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(LDLIBS_COMMON)
    178178else # LIBRARY
    179 # build it into $(OBJDIR) so that the other generated files get put 
     179# build it into $(OBJDIR) so that the other generated files get put
    180180# there, then copy just the DLL (and MAP file) to the requested directory.
    181181#
    … …  
    196196        @$(prep-target)
    197197        @$(MKDIR) -p $(TEMPDIR)
    198         @$(ECHO) $(FILES_o) > $@ 
     198        @$(ECHO) $(FILES_o) > $@
    199199ifndef LOCAL_RESOURCE_FILE
    200200        @$(ECHO) $(OBJDIR)/$(LIBRARY).res >> $@
    201201endif
    202         @$(ECHO) Created $@ 
     202        @$(ECHO) Created $@
    203203
    204204# J2SE name required here
    … …  
    219219$(ACTUAL_LIBRARY):: $(LIBDIR)/$(LIBRARY).lib
    220220
    221 clean:: 
     221clean::
    222222        -$(RM) $(LIBDIR)/$(LIBRARY).lib
    223223
    … …  
    257257ifeq ($(PLATFORM),solaris)
    258258lint.errors : $(FILES_ln)
    259         $(LINT.c) $(FILES_ln) $(LDLIBS) 
     259        $(LINT.c) $(FILES_ln) $(LDLIBS)
    260260endif
    261261

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

    r2 r27  
    7373    sane-ant_version \
    7474    sane-zip_version \
    75     sane-msvcrt_path
     75    sane-msvcrt_path \
     76    sane-odinsdk
    7677
    7778# The rules sanity-* have a one-to-one correspondence with the major targets

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

    r16 r27  
    140140  _BOOTDIR2  =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
    141141endif
     142
     143# ODINSDK_PATH: Path to the root directory of Odin32 SDK
     144ifdef ALT_ODINSDK_PATH
     145  xALT_ODINSDK_PATH :="$(subst \,/,$(ALT_ODINSDK_PATH))"
     146  ODINSDK_PATH      :=$(call FullPath,$(xALT_ODINSDK_PATH))
     147endif
     148ODINSDK_PATH :=$(call AltCheckSpaces,ODINSDK_PATH)
     149ODINSDK_PATH :=$(call AltCheckValue,ODINSDK_PATH)
    142150
    143151# Import JDK images allow for partial builds, components not built are

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

    r16 r27  
    247247  endif
    248248endif
     249ifeq ($(PLATFORM),os2)
     250  ALL_SETTINGS+=$(call addAltSetting,ODINSDK_PATH)
     251endif
    249252ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
    250253ifndef OPENJDK

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

    r12 r27  
    13441344
    13451345######################################################
     1346# Check for Odin32 SDK directory
     1347######################################################
     1348sane-odinsdk:
     1349ifeq ($(PLATFORM), os2)
     1350        @if [ ! -r $(ODINSDK_PATH)/include/odin.h  ]; then \
     1351        $(ECHO) "ERROR: You do not have access to a valid Odin32 SDK include dir.\n" \
     1352          "      The value of ODINSDK_PATH must point a valid Odin32 SDK dir.\n" \
     1353          "      Please check your access to \n" \
     1354          "          $(ODINSDK_PATH)/include \n" \
     1355          "      and/or check your value of ALT_ODINSDK_PATH.\n" \
     1356          "" >> $(ERROR_FILE) ; \
     1357        fi
     1358        @if [ ! -r $(ODINSDK_PATH)/lib/odincrt.lib -a \
     1359              ! -r $(ODINSDK_PATH)/lib/Release/odincrt.lib ]; then \
     1360        $(ECHO) "ERROR: You do not have access to a valid Odin32 SDK lib dir.\n" \
     1361          "      The value of ODINSDK_PATH must point a valid Odin32 SDK dir.\n" \
     1362          "      Please check your access to \n" \
     1363          "          $(ODINSDK_PATH)/lib          or \n" \
     1364          "          $(ODINSDK_PATH)/lib/Release \n" \
     1365          "      and/or check your value of ALT_ODINSDK_PATH.\n" \
     1366          "" >> $(ERROR_FILE) ; \
     1367        fi
     1368endif
     1369
     1370######################################################
    13461371# Check the linker version(s)
    13471372######################################################
Note: See TracChangeset for help on using the changeset viewer.