Changes in / [30:20]


Ignore:
Location:
/trunk
Files:
4 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • /trunk

    • Property svn:ignore deleted

  • /trunk/LocalEnv.tpl.cmd

    r30 r20  
    4343
    4444/**
    45  * Generate include file dependencies for C/C++ sources.
    46  */
    47 call EnvSet 'INCREMENTAL_BUILD', 'true'
    48 
    49 /**
    5045 * Here you may put any additional environment variable definitions needed for
    5146 * your local environment or for the OpenJDK make files using the form shown

  • /trunk/README

    r30 r20  
    33Requirements (draft)
    44
    5 1.  GCC 4.4.2 + WLINK (ftp://ftp.netlabs.org/pub/qt4/gcc-4_4_2-complete-20091205.zip)
    6 2.  Odin32 SDK (take from SVN at http://svn.netlabs.org/repos/odin32)
    7 3a. Java 1.5.0 (so far, download link is to be clarified)
    8 3b. JAXB 2.1 (https://jaxb.dev.java.net/2.1/JAXB2_20061211.jar)
    9 4a. Ant 1.8.1 (http://ant.apache.org/bindownload.cgi)
    10 4b. Patched ant.jar for Ant 1.8.1 (ftp://ftp.netlabs.org/pub/qt4/tmp/ant-1.8.1-patch-os2_cmd_line_length.zip)
     51. GCC 4.4.2 + WLINK (ftp://ftp.netlabs.org/pub/qt4/gcc-4_4_2-complete-20091205.zip)
     62. Odin32 SDK (take from SVN at http://svn.netlabs.org/repos/odin32)
     73. Java 1.5.0 (so far, download link is to be clarified)
     84. Ant 1.8.1 and above (http://ant.apache.org/bindownload.cgi)
    119
    1210Copy LocalEnv.tpl.cmd to LocalEnv.cmd and alter according to your environment

  • /trunk/env.cmd

    r30 r20  
    8585 */
    8686call EnvSetIfEmtpy 'ALT_BOOTDIR', UnixSlashes(G.PATH_TOOL_BOOT_JDK)
    87 call EnvSetIfEmtpy 'ALT_ODINSDK_PATH', UnixSlashes(G.PATH_LIB_ODIN32)
    8887call EnvSetIfEmtpy 'ALT_FREETYPE_HEADERS_PATH', UnixSlashes(ScriptDir'libs\freetype\include')
    8988call EnvSetIfEmtpy 'ALT_FREETYPE_LIB_PATH', UnixSlashes(ScriptDir'libs\freetype\lib')

  • /trunk/openjdk/Makefile

    r30 r20  
    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
    386 ODINSDK_PATH.desc          = Root directory of Odin32 SDK (OS/2)
    387386
    388387# Make variables to print out (description and value)
    … …  
    403402    JDK_IMPORT_PATH             \
    404403    COMPILER_PATH               \
    405     DEVTOOLS_PATH
     404    DEVTOOLS_PATH 
    406405
    407406# Make variables that should refer to files that exist
    … …  
    421420    MSDEVTOOLS_PATH             \
    422421    MSVCRT_DLL_PATH
    423 
    424 endif
    425 
    426 # Some are OS/2 specific
    427 ifeq ($(PLATFORM), os2)
    428 
    429 VARIABLE_PRINTVAL_LIST +=       \
    430     ODINSDK_PATH
    431 
    432 VARIABLE_CHECKDIR_LIST +=       \
    433     ODINSDK_PATH
    434422
    435423endif
    … …  
    495483# Cycle build. Build the jdk, use it to build the jdk again.
    496484################################################################
    497 
     485 
    498486ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
    499 
     487 
    500488boot_cycle:
    501489        $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) product_build

  • /trunk/openjdk/jdk/make/Makefile

    r30 r20  
    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)
    109108
    110109# Make variables to print out (description and value)
    … …  
    152151    UNICOWS_DLL_PATH            \
    153152    UNICOWS_LIB_PATH
    154 
    155 endif
    156 
    157 # Some are OS/2 specific
    158 ifeq ($(PLATFORM), os2)
    159 
    160 VARIABLE_PRINTVAL_LIST +=       \
    161     ODINSDK_PATH
    162 
    163 VARIABLE_CHECKDIR_LIST +=       \
    164     ODINSDK_PATH
    165153
    166154endif
    … …  
    225213# 'all' target intro
    226214#
    227 all::
     215all:: 
    228216        @$(ECHO) $(PLATFORM) $(ARCH) $(RELEASE) build started: $(shell $(DATE) '+%y-%m-%d %H:%M')
    229217
    … …  
    295283# workspace, and if it is a Teamware workspace, then see if there are
    296284# any files which are not under SCCS control.
    297 clean clobber::
     285clean clobber:: 
    298286ifndef EXTERNALSANITYCONTROL
    299287        @if [ -d $(TOPDIR)/Codemgr_wsdata ]; then \

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

    r30 r20  
    4343endif # LIB_LOCATION
    4444
    45 # Part of INCREMENTAL_BUILD mechanism.
    46 #   Compiler emits things like:  file.obj: file.c file.h...
    47 #   We want something like: obj_path/file.obj: file.c file.h...
    48 CC_DEPEND        = -MM -MT $(@:$(suffix $@)=.$(OBJECT_SUFFIX))
    49 CC_DEPEND_FILTER =
    50 
    5145ifndef PLATFORM_SRC
    52   # We mostly reuse the windows code so far.
    53   PLATFORM_SRC  = $(BUILDDIR)/../src/windows
     46  PLATFORM_SRC  = $(BUILDDIR)/../src/os2
    5447endif # PLATFORM_SRC
    5548
    … …  
    8275# level.
    8376#
    84 HPIS = windows
     77HPIS = os2
    8578
    8679#
    … …  
    141134# Linker options
    142135#
    143 LDFLAGS_COMMON  = -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
     136LDFLAGS_COMMON  = -Zomf -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem
    144137LDFLAGS_OPT     = -s
    145138LDFLAGS_DBG     =
    146 
    147 #
    148 # Additional libraries needed by all targets
    149 #
    150 
    151 CPPFLAGS_COMMON += -D__WIN32OS2__ -D__i386__ -DSTRICT -D_POSIX_SOURCE \
    152                    -D_POSIX_C_SOURCE=200112
    153 CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include
    154 LDFLAGS_COMMON  += -L$(ODINSDK_PATH)/lib -L$(ODINSDK_PATH)/lib/Release
    155 EXTRA_LIBS      +=
    156139
    157140#

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

    r30 r20  
    4040
    4141ifeq ($(LIBRARY), fdlibm)
    42 ifeq ($(filter-out windows os2,$(PLATFORM)),)
     42ifeq ($(PLATFORM),windows)
    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

    r30 r20  
    7373    sane-ant_version \
    7474    sane-zip_version \
    75     sane-msvcrt_path \
    76     sane-odinsdk
     75    sane-msvcrt_path
    7776
    7877# The rules sanity-* have a one-to-one correspondence with the major targets

  • /trunk/openjdk/jdk/make/common/internal/NativeCompileRules.gmk

    r30 r20  
    4747        @$(ECHO) "Creating $@"
    4848        @$(RM) $@.temp
    49         @$(CC) $(CC_DEPEND) $(CPPFLAGS) $< 2> $(DEV_NULL) \
    50             $(if $(CC_DEPEND_FILTER), | $(CC_DEPEND_FILTER)) \
    51             > $@.temp
     49        @$(CC) $(CC_DEPEND) $(CPPFLAGS) $< 2> $(DEV_NULL) | \
     50            $(CC_DEPEND_FILTER) > $@.temp
    5251        @$(MV) $@.temp $@
    5352
    … …  
    5655        @$(ECHO) "Creating $@"
    5756        @$(RM) $@.temp
    58         @$(CXX) $(CC_DEPEND) $(CPPFLAGS) $(CXXFLAGS) $< 2> $(DEV_NULL) \
    59             $(if $(CC_DEPEND_FILTER), | $(CC_DEPEND_FILTER)) \
    60             > $@.temp
     57        @$(CXX) $(CC_DEPEND) $(CPPFLAGS) $(CXXFLAGS) $< 2> $(DEV_NULL) | \
     58            $(CC_DEPEND_FILTER) > $@.temp
    6159        @$(MV) $@.temp $@
    6260

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

    r30 r20  
    4949# Indication that we are doing an incremental build.
    5050#    This may trigger the creation of make depend files.
    51 ifndef INCREMENTAL_BUILD
    52   INCREMENTAL_BUILD = false
    53 endif
     51#    (This may not be working on windows yet, always force to false.)
     52override INCREMENTAL_BUILD = false
    5453
    5554# FullPath just makes sure it never ends with a / and no duplicates
    … …  
    141140  _BOOTDIR2  =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
    142141endif
    143 
    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)
    151142
    152143# Import JDK images allow for partial builds, components not built are

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

    r30 r20  
    408408  DEV_NULL = nul
    409409  # Classpath separator
    410   CLASSPATH_SEPARATOR = \;
     410  CLASSPATH_SEPARATOR = ;
    411411  # The suffix used for object file (.o for unix .obj for windows)
    412412  OBJECT_SUFFIX = obj

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

    r30 r20  
    247247  endif
    248248endif
    249 ifeq ($(PLATFORM),os2)
    250   ALL_SETTINGS+=$(call addAltSetting,ODINSDK_PATH)
    251 endif
    252249ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
    253250ifndef OPENJDK

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

    r30 r20  
    13441344
    13451345######################################################
    1346 # Check for Odin32 SDK directory
    1347 ######################################################
    1348 sane-odinsdk:
    1349 ifeq ($(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
    1368 endif
    1369 
    1370 ######################################################
    13711346# Check the linker version(s)
    13721347######################################################

  • /trunk/openjdk/langtools/make/Makefile

    r30 r20  
    149149ifdef FINDBUGS_HOME
    150150  ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
    151 endif
    152 
    153 ifeq ($(PLATFORM), os2)
    154   # system classpath isn't necessary for the build but it's usually long (due to
    155   # ant jars) and passing it to javac started through cmd.exe (as in case of
    156   # fork=yes) causes cmd.exe to crash with SYS0008, so disable this
    157   ANT_OPTIONS += -Dbuild.sysclasspath=ignore
    158151endif
    159152

  • /trunk/openjdk/langtools/make/build.xml

    r30 r20  
    7979    </condition>
    8080    <condition property="java.marker" value="bin/java.exe">
    81         <or>
    82             <os family="windows"/>
    83             <os family="os/2"/>
    84         </or>
     81        <os family="windows"/>
    8582    </condition>
    8683
Note: See TracChangeset for help on using the changeset viewer.