Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Thu, 27 Jan 2011 18:43:41 -0800
- author
- ohair
- date
- Thu, 27 Jan 2011 18:43:41 -0800
- changeset 293
- a7a4f6db294d
- parent 284
- 6e0f4d6099bb
- parent 292
- 3a9f19cbf7f1
- child 294
- 57d702105b23
Merge
1.1 --- a/Makefile Thu Jan 27 17:28:28 2011 -0800 1.2 +++ b/Makefile Thu Jan 27 18:43:41 2011 -0800 1.3 @@ -29,15 +29,6 @@ 1.4 TOPDIR:=. 1.5 endif 1.6 1.7 -# Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true) 1.8 -OPENJDK_SOURCETREE=$(TOPDIR)/openjdk 1.9 -OPENJDK_BUILDDIR:=$(shell \ 1.10 - if [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \ 1.11 - echo "$(OPENJDK_SOURCETREE)"; \ 1.12 - else \ 1.13 - echo "."; \ 1.14 - fi) 1.15 - 1.16 ifndef JDK_TOPDIR 1.17 JDK_TOPDIR=$(TOPDIR)/jdk 1.18 endif 1.19 @@ -70,7 +61,7 @@ 1.20 all:: 1.21 @$(START_ECHO) 1.22 1.23 -all:: openjdk_check sanity 1.24 +all:: sanity 1.25 1.26 ifeq ($(SKIP_FASTDEBUG_BUILD), false) 1.27 all:: fastdebug_build 1.28 @@ -80,10 +71,6 @@ 1.29 all:: debug_build 1.30 endif 1.31 1.32 -ifneq ($(SKIP_OPENJDK_BUILD), true) 1.33 - all:: openjdk_build 1.34 -endif 1.35 - 1.36 all:: all_product_build 1.37 1.38 all:: 1.39 @@ -267,81 +254,6 @@ 1.40 debug_build:: build_debug_image 1.41 fastdebug_build:: build_fastdebug_image 1.42 1.43 -# Check on whether we really can build the openjdk, need source etc. 1.44 -openjdk_check: FRC 1.45 -ifneq ($(SKIP_OPENJDK_BUILD), true) 1.46 - @$(ECHO) " " 1.47 - @$(ECHO) "=================================================" 1.48 - @if [ ! -r $(OPENJDK_BUILDDIR)/Makefile ] ; then \ 1.49 - $(ECHO) "ERROR: No openjdk source tree available at: $(OPENJDK_BUILDDIR)"; \ 1.50 - exit 1; \ 1.51 - else \ 1.52 - $(ECHO) "OpenJDK will be built after JDK is built"; \ 1.53 - $(ECHO) " OPENJDK_BUILDDIR=$(OPENJDK_BUILDDIR)"; \ 1.54 - fi 1.55 - @$(ECHO) "=================================================" 1.56 - @$(ECHO) " " 1.57 -endif 1.58 - 1.59 -# If we have bundle rules, we have a chance here to do a complete cycle 1.60 -# build, of production and open build. 1.61 -# FIXUP: We should create the openjdk source bundle and build that? 1.62 -# But how do we reliable create or get at a formal openjdk source tree? 1.63 -# The one we have needs to be trimmed of built bits and closed dirs. 1.64 -# The repositories might not be available. 1.65 -# The openjdk source bundle is probably not available. 1.66 - 1.67 -ifneq ($(SKIP_OPENJDK_BUILD), true) 1.68 - ifeq ($(BUILD_JDK), true) 1.69 - ifeq ($(BUNDLE_RULES_AVAILABLE), true) 1.70 - 1.71 -OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output 1.72 -OPENJDK_BUILD_NAME \ 1.73 - = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE) 1.74 -OPENJDK_BUILD_BINARY_ZIP=$(ABS_BIN_BUNDLEDIR)/$(OPENJDK_BUILD_NAME).zip 1.75 -BUILT_IMAGE=$(ABS_OUTPUTDIR)/j2sdk-image 1.76 -ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) 1.77 - OPENJDK_BOOTDIR=$(BOOTDIR) 1.78 - OPENJDK_IMPORTJDK=$(JDK_IMPORT_PATH) 1.79 -else 1.80 - OPENJDK_BOOTDIR=$(BUILT_IMAGE) 1.81 - OPENJDK_IMPORTJDK=$(BUILT_IMAGE) 1.82 -endif 1.83 - 1.84 -openjdk_build: 1.85 - @$(START_ECHO) 1.86 - @$(ECHO) " " 1.87 - @$(ECHO) "=================================================" 1.88 - @$(ECHO) "Starting openjdk build" 1.89 - @$(ECHO) " Using: ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR)" 1.90 - @$(ECHO) "=================================================" 1.91 - @$(ECHO) " " 1.92 - $(RM) -r $(OPENJDK_OUTPUTDIR) 1.93 - $(MKDIR) -p $(OPENJDK_OUTPUTDIR) 1.94 - ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \ 1.95 - OPENJDK=true \ 1.96 - GENERATE_DOCS=false \ 1.97 - ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ 1.98 - ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ 1.99 - ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \ 1.100 - ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \ 1.101 - product_build ) 1.102 - $(RM) $(OPENJDK_BUILD_BINARY_ZIP) 1.103 - ( $(CD) $(OPENJDK_OUTPUTDIR)/j2sdk-image && \ 1.104 - $(ZIPEXE) -q -r $(OPENJDK_BUILD_BINARY_ZIP) .) 1.105 - $(RM) -r $(OPENJDK_OUTPUTDIR) 1.106 - @$(ECHO) " " 1.107 - @$(ECHO) "=================================================" 1.108 - @$(ECHO) "Finished openjdk build" 1.109 - @$(ECHO) " Binary Bundle: $(OPENJDK_BUILD_BINARY_ZIP)" 1.110 - @$(ECHO) "=================================================" 1.111 - @$(ECHO) " " 1.112 - @$(FINISH_ECHO) 1.113 - 1.114 - endif 1.115 - endif 1.116 -endif 1.117 - 1.118 clobber:: 1.119 $(RM) -r $(OUTPUTDIR)/* 1.120 $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/* 1.121 @@ -448,7 +360,6 @@ 1.122 DEVTOOLS_PATH.desc = Directory containing zip and gnumake 1.123 CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files 1.124 DXSDK_PATH.desc = Root directory of DirectX SDK 1.125 -MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll 1.126 1.127 # Make variables to print out (description and value) 1.128 VARIABLE_PRINTVAL_LIST += \ 1.129 @@ -477,12 +388,10 @@ 1.130 ifeq ($(PLATFORM), windows) 1.131 1.132 VARIABLE_PRINTVAL_LIST += \ 1.133 - DXSDK_PATH \ 1.134 - MSVCRT_DLL_PATH 1.135 + DXSDK_PATH 1.136 1.137 VARIABLE_CHECKDIR_LIST += \ 1.138 - DXSDK_PATH \ 1.139 - MSVCRT_DLL_PATH 1.140 + DXSDK_PATH 1.141 1.142 endif 1.143
2.1 --- a/README-builds.html Thu Jan 27 17:28:28 2011 -0800 2.2 +++ b/README-builds.html Thu Jan 27 18:43:41 2011 -0800 2.3 @@ -1414,14 +1414,14 @@ 2.4 but it's normally found via the DirectX environment variable 2.5 <tt>DXSDK_DIR</tt>. 2.6 </blockquote> 2.7 - <strong><a name="msvcrt"><tt>MSVCR100.DLL</tt></a></strong> 2.8 + <strong><a name="msvcrNN"><tt>MSVCR100.DLL</tt></a></strong> 2.9 <blockquote> 2.10 The OpenJDK build requires access to a redistributable 2.11 <tt>MSVCR100.DLL</tt>. 2.12 This is usually picked up automatically from the redist 2.13 directories of Visual Studio 2010. 2.14 If this cannot be found set the 2.15 - <a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a> 2.16 + <a href="#ALT_MSVCRNN_DLL_PATH"><tt>ALT_MSVCRNN_DLL_PATH</tt></a> 2.17 variable to the location of this file. 2.18 <p> 2.19 </blockquote> 2.20 @@ -1671,15 +1671,10 @@ 2.21 variable <tt>DXSDK_DIR</tt>, 2.22 failing that, look in <tt>C:/DXSDK</tt>. 2.23 </dd> 2.24 - <dt><tt><a name="ALT_MSVCRT_DLL_PATH">ALT_MSVCRT_DLL_PATH</a></tt> </dt> 2.25 - <dd> 2.26 - The location of the 2.27 - <a href="#msvcrt"><tt>MSVCRT.DLL</tt></a>. 2.28 - </dd> 2.29 <dt><tt><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></tt> </dt> 2.30 <dd> 2.31 The location of the 2.32 - <a href="#msvcrt"><tt>MSVCR100.DLL</tt></a>. 2.33 + <a href="#msvcrNN"><tt>MSVCR100.DLL</tt></a>. 2.34 </dd> 2.35 </dl> 2.36 </dd>
3.1 --- a/make/Defs-internal.gmk Thu Jan 27 17:28:28 2011 -0800 3.2 +++ b/make/Defs-internal.gmk Thu Jan 27 18:43:41 2011 -0800 3.3 @@ -147,7 +147,7 @@ 3.4 endif 3.5 3.6 3.7 -# Do we build the source and openjdk binary plug bundles? 3.8 +# Do we build the source bundles? 3.9 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk 3.10 ifeq ($(SKIP_BUNDLES_BUILD), true) 3.11 BUNDLE_RULES_AVAILABLE := false 3.12 @@ -171,7 +171,6 @@ 3.13 ifndef SKIP_COMPARE_IMAGES 3.14 SKIP_COMPARE_IMAGES = true 3.15 endif 3.16 - SKIP_OPENJDK_BUILD = true 3.17 else 3.18 3.19 # Various non-OPENJDK reasons to NOT build the deploy repository 3.20 @@ -187,21 +186,11 @@ 3.21 endif 3.22 endif 3.23 3.24 - ifndef SKIP_OPENJDK_BUILD 3.25 - #SKIP_OPENJDK_BUILD = false 3.26 - # Until 6675289 is resolved, or this feature is removed. 3.27 - SKIP_OPENJDK_BUILD = true 3.28 - endif 3.29 endif 3.30 ifndef SKIP_PRODUCT_BUILD 3.31 SKIP_PRODUCT_BUILD = false 3.32 endif 3.33 3.34 -# Solaris 64 bit builds are not complete enough to ever do this 3.35 -ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) 3.36 - SKIP_OPENJDK_BUILD = true 3.37 -endif 3.38 - 3.39 # Many reasons why we would want to skip the comparison to previous jdk 3.40 ifndef SKIP_COMPARE_IMAGES 3.41 ifeq ($(BUILD_JDK), false)
