Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Wed, 09 Feb 2011 16:05:25 -0500
- author
- jqzuo
- date
- Wed, 09 Feb 2011 16:05:25 -0500
- changeset 306
- df3abd560cbd
- parent 305
- 12764a5a3aec
- parent 295
- 904d7c7c44d9
- child 307
- e2370dfcc721
Merge
1.1 --- a/.hgtags Tue Feb 01 15:03:30 2011 -0500 1.2 +++ b/.hgtags Wed Feb 09 16:05:25 2011 -0500 1.3 @@ -102,3 +102,4 @@ 1.4 5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125 1.5 b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126 1.6 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127 1.7 +57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
2.1 --- a/Makefile Tue Feb 01 15:03:30 2011 -0500 2.2 +++ b/Makefile Wed Feb 09 16:05:25 2011 -0500 2.3 @@ -29,15 +29,6 @@ 2.4 TOPDIR:=. 2.5 endif 2.6 2.7 -# Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true) 2.8 -OPENJDK_SOURCETREE=$(TOPDIR)/openjdk 2.9 -OPENJDK_BUILDDIR:=$(shell \ 2.10 - if [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \ 2.11 - echo "$(OPENJDK_SOURCETREE)"; \ 2.12 - else \ 2.13 - echo "."; \ 2.14 - fi) 2.15 - 2.16 ifndef JDK_TOPDIR 2.17 JDK_TOPDIR=$(TOPDIR)/jdk 2.18 endif 2.19 @@ -70,7 +61,7 @@ 2.20 all:: 2.21 @$(START_ECHO) 2.22 2.23 -all:: openjdk_check sanity 2.24 +all:: sanity 2.25 2.26 ifeq ($(SKIP_FASTDEBUG_BUILD), false) 2.27 all:: fastdebug_build 2.28 @@ -80,10 +71,6 @@ 2.29 all:: debug_build 2.30 endif 2.31 2.32 -ifneq ($(SKIP_OPENJDK_BUILD), true) 2.33 - all:: openjdk_build 2.34 -endif 2.35 - 2.36 all:: all_product_build 2.37 2.38 all:: 2.39 @@ -267,81 +254,6 @@ 2.40 debug_build:: build_debug_image 2.41 fastdebug_build:: build_fastdebug_image 2.42 2.43 -# Check on whether we really can build the openjdk, need source etc. 2.44 -openjdk_check: FRC 2.45 -ifneq ($(SKIP_OPENJDK_BUILD), true) 2.46 - @$(ECHO) " " 2.47 - @$(ECHO) "=================================================" 2.48 - @if [ ! -r $(OPENJDK_BUILDDIR)/Makefile ] ; then \ 2.49 - $(ECHO) "ERROR: No openjdk source tree available at: $(OPENJDK_BUILDDIR)"; \ 2.50 - exit 1; \ 2.51 - else \ 2.52 - $(ECHO) "OpenJDK will be built after JDK is built"; \ 2.53 - $(ECHO) " OPENJDK_BUILDDIR=$(OPENJDK_BUILDDIR)"; \ 2.54 - fi 2.55 - @$(ECHO) "=================================================" 2.56 - @$(ECHO) " " 2.57 -endif 2.58 - 2.59 -# If we have bundle rules, we have a chance here to do a complete cycle 2.60 -# build, of production and open build. 2.61 -# FIXUP: We should create the openjdk source bundle and build that? 2.62 -# But how do we reliable create or get at a formal openjdk source tree? 2.63 -# The one we have needs to be trimmed of built bits and closed dirs. 2.64 -# The repositories might not be available. 2.65 -# The openjdk source bundle is probably not available. 2.66 - 2.67 -ifneq ($(SKIP_OPENJDK_BUILD), true) 2.68 - ifeq ($(BUILD_JDK), true) 2.69 - ifeq ($(BUNDLE_RULES_AVAILABLE), true) 2.70 - 2.71 -OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output 2.72 -OPENJDK_BUILD_NAME \ 2.73 - = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE) 2.74 -OPENJDK_BUILD_BINARY_ZIP=$(ABS_BIN_BUNDLEDIR)/$(OPENJDK_BUILD_NAME).zip 2.75 -BUILT_IMAGE=$(ABS_OUTPUTDIR)/j2sdk-image 2.76 -ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) 2.77 - OPENJDK_BOOTDIR=$(BOOTDIR) 2.78 - OPENJDK_IMPORTJDK=$(JDK_IMPORT_PATH) 2.79 -else 2.80 - OPENJDK_BOOTDIR=$(BUILT_IMAGE) 2.81 - OPENJDK_IMPORTJDK=$(BUILT_IMAGE) 2.82 -endif 2.83 - 2.84 -openjdk_build: 2.85 - @$(START_ECHO) 2.86 - @$(ECHO) " " 2.87 - @$(ECHO) "=================================================" 2.88 - @$(ECHO) "Starting openjdk build" 2.89 - @$(ECHO) " Using: ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR)" 2.90 - @$(ECHO) "=================================================" 2.91 - @$(ECHO) " " 2.92 - $(RM) -r $(OPENJDK_OUTPUTDIR) 2.93 - $(MKDIR) -p $(OPENJDK_OUTPUTDIR) 2.94 - ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \ 2.95 - OPENJDK=true \ 2.96 - GENERATE_DOCS=false \ 2.97 - ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ 2.98 - ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ 2.99 - ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \ 2.100 - ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \ 2.101 - product_build ) 2.102 - $(RM) $(OPENJDK_BUILD_BINARY_ZIP) 2.103 - ( $(CD) $(OPENJDK_OUTPUTDIR)/j2sdk-image && \ 2.104 - $(ZIPEXE) -q -r $(OPENJDK_BUILD_BINARY_ZIP) .) 2.105 - $(RM) -r $(OPENJDK_OUTPUTDIR) 2.106 - @$(ECHO) " " 2.107 - @$(ECHO) "=================================================" 2.108 - @$(ECHO) "Finished openjdk build" 2.109 - @$(ECHO) " Binary Bundle: $(OPENJDK_BUILD_BINARY_ZIP)" 2.110 - @$(ECHO) "=================================================" 2.111 - @$(ECHO) " " 2.112 - @$(FINISH_ECHO) 2.113 - 2.114 - endif 2.115 - endif 2.116 -endif 2.117 - 2.118 clobber:: 2.119 $(RM) -r $(OUTPUTDIR)/* 2.120 $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/* 2.121 @@ -448,7 +360,6 @@ 2.122 DEVTOOLS_PATH.desc = Directory containing zip and gnumake 2.123 CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files 2.124 DXSDK_PATH.desc = Root directory of DirectX SDK 2.125 -MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll 2.126 2.127 # Make variables to print out (description and value) 2.128 VARIABLE_PRINTVAL_LIST += \ 2.129 @@ -477,12 +388,10 @@ 2.130 ifeq ($(PLATFORM), windows) 2.131 2.132 VARIABLE_PRINTVAL_LIST += \ 2.133 - DXSDK_PATH \ 2.134 - MSVCRT_DLL_PATH 2.135 + DXSDK_PATH 2.136 2.137 VARIABLE_CHECKDIR_LIST += \ 2.138 - DXSDK_PATH \ 2.139 - MSVCRT_DLL_PATH 2.140 + DXSDK_PATH 2.141 2.142 endif 2.143
3.1 --- a/README-builds.html Tue Feb 01 15:03:30 2011 -0500 3.2 +++ b/README-builds.html Wed Feb 09 16:05:25 2011 -0500 3.3 @@ -1414,14 +1414,14 @@ 3.4 but it's normally found via the DirectX environment variable 3.5 <tt>DXSDK_DIR</tt>. 3.6 </blockquote> 3.7 - <strong><a name="msvcrt"><tt>MSVCR100.DLL</tt></a></strong> 3.8 + <strong><a name="msvcrNN"><tt>MSVCR100.DLL</tt></a></strong> 3.9 <blockquote> 3.10 The OpenJDK build requires access to a redistributable 3.11 <tt>MSVCR100.DLL</tt>. 3.12 This is usually picked up automatically from the redist 3.13 directories of Visual Studio 2010. 3.14 If this cannot be found set the 3.15 - <a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a> 3.16 + <a href="#ALT_MSVCRNN_DLL_PATH"><tt>ALT_MSVCRNN_DLL_PATH</tt></a> 3.17 variable to the location of this file. 3.18 <p> 3.19 </blockquote> 3.20 @@ -1671,15 +1671,10 @@ 3.21 variable <tt>DXSDK_DIR</tt>, 3.22 failing that, look in <tt>C:/DXSDK</tt>. 3.23 </dd> 3.24 - <dt><tt><a name="ALT_MSVCRT_DLL_PATH">ALT_MSVCRT_DLL_PATH</a></tt> </dt> 3.25 - <dd> 3.26 - The location of the 3.27 - <a href="#msvcrt"><tt>MSVCRT.DLL</tt></a>. 3.28 - </dd> 3.29 <dt><tt><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></tt> </dt> 3.30 <dd> 3.31 The location of the 3.32 - <a href="#msvcrt"><tt>MSVCR100.DLL</tt></a>. 3.33 + <a href="#msvcrNN"><tt>MSVCR100.DLL</tt></a>. 3.34 </dd> 3.35 </dl> 3.36 </dd>
4.1 --- a/make/Defs-internal.gmk Tue Feb 01 15:03:30 2011 -0500 4.2 +++ b/make/Defs-internal.gmk Wed Feb 09 16:05:25 2011 -0500 4.3 @@ -147,7 +147,7 @@ 4.4 endif 4.5 4.6 4.7 -# Do we build the source and openjdk binary plug bundles? 4.8 +# Do we build the source bundles? 4.9 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk 4.10 ifeq ($(SKIP_BUNDLES_BUILD), true) 4.11 BUNDLE_RULES_AVAILABLE := false 4.12 @@ -171,7 +171,6 @@ 4.13 ifndef SKIP_COMPARE_IMAGES 4.14 SKIP_COMPARE_IMAGES = true 4.15 endif 4.16 - SKIP_OPENJDK_BUILD = true 4.17 else 4.18 4.19 # Various non-OPENJDK reasons to NOT build the deploy repository 4.20 @@ -187,21 +186,11 @@ 4.21 endif 4.22 endif 4.23 4.24 - ifndef SKIP_OPENJDK_BUILD 4.25 - #SKIP_OPENJDK_BUILD = false 4.26 - # Until 6675289 is resolved, or this feature is removed. 4.27 - SKIP_OPENJDK_BUILD = true 4.28 - endif 4.29 endif 4.30 ifndef SKIP_PRODUCT_BUILD 4.31 SKIP_PRODUCT_BUILD = false 4.32 endif 4.33 4.34 -# Solaris 64 bit builds are not complete enough to ever do this 4.35 -ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) 4.36 - SKIP_OPENJDK_BUILD = true 4.37 -endif 4.38 - 4.39 # Many reasons why we would want to skip the comparison to previous jdk 4.40 ifndef SKIP_COMPARE_IMAGES 4.41 ifeq ($(BUILD_JDK), false)
5.1 --- a/test/Makefile Tue Feb 01 15:03:30 2011 -0500 5.2 +++ b/test/Makefile Wed Feb 09 16:05:25 2011 -0500 5.3 @@ -79,7 +79,7 @@ 5.4 # Test targets 5.5 $(LANGTOOLS_TEST_LIST): 5.6 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) 5.7 -$(JDK_TEST_LIST): 5.8 +$(JDK_TEST_LIST) $(JDK_TEST_LIST2): 5.9 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) 5.10 5.11 clean:
