Mercurial > hg > openjdk > icedtea > jdk7
changeset 526:528f1589f5f2 jdk7u6-b15
Merge
author | asaha |
---|---|
date | Fri, 15 Jun 2012 12:47:20 -0700 |
parents | e741093e96f3 (diff) ba23b4217dc6 (current diff) |
children | 7b77364eb09f 1145cdaefc86 |
files | .hgtags |
diffstat | 8 files changed, 103 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu May 24 13:54:34 2012 -0700 +++ b/.hgtags Fri Jun 15 12:47:20 2012 -0700 @@ -174,3 +174,17 @@ c1abaa3cb715ee7d525da238f8a0c68297f95821 jdk7u5-b04 0b45462b55fe715459570f5f422f0c4b770c2af9 jdk7u5-b05 9459a5112a9af101d6de9746f0fc5df5474686c5 jdk7u5-b30 +d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u6-b01 +f0b9ae49261df769c37d5afbf074458bd8e4f59c jdk7u6-b02 +b98436f0ff704739d2ada2a755a1b862370523c2 jdk7u6-b03 +559f6e91d3a33c3441a6ed1f81246553b7e59621 jdk7u6-b04 +4562d0be282463a88be5c65a5c1ea137cab1c376 jdk7u6-b05 +65181dfaabb78ffd9e8919c234ed713d6abc8566 jdk7u6-b06 +0bf314122c8e4a6cac83315d542b8e50e9c5ef0c jdk7u6-b07 +09182be47ee96755a90db77b5ef6219d71ecd1fe jdk7u6-b08 +01001f439af7c2523bc004b7540ed67b85d5807d jdk7u6-b09 +5f3645aa920d373b26d01b21f3b8b30fc4e10a0d jdk7u6-b10 +cd64596c2dd7f195a6d38b6269bab23e7fad4361 jdk7u6-b11 +61cfcee1d00cb4af288e640216af2bccbc3c9ef0 jdk7u6-b12 +9b9a6d318e8aa5b8f0e42d2d3d2c0c34cb3f986d jdk7u6-b13 +eff9ea1ca63df8656ebef9fedca0c647a210d807 jdk7u6-b14
--- a/README-builds.html Thu May 24 13:54:34 2012 -0700 +++ b/README-builds.html Fri Jun 15 12:47:20 2012 -0700 @@ -65,6 +65,7 @@ <li><a href="#linux">Basic Linux System Setup</a> </li> <li><a href="#solaris">Basic Solaris System Setup</a> </li> <li><a href="#windows">Basic Windows System Setup</a> </li> + <li><a href="#macosx">Basic Mac OS X System Setup</a></li> <li><a href="#dependencies">Build Dependencies</a> <ul> <li><a href="#bootjdk">Bootstrap JDK</a> </li> @@ -256,6 +257,12 @@ <td>Microsoft Visual Studio C++ 2010 Professional Edition</td> <td>JDK 6u18</td> </tr> + <tr> + <td>Mac OS X X64 (64-bit)</td> + <td>Mac OS X 10.7.3 "Lion"</td> + <td>XCode 4.1 or later</td> + <td>Java for OS X Lion Update 1</td> + </tr> </tbody> </table> <p> @@ -977,6 +984,36 @@ </blockquote> <!-- ------------------------------------------------------ --> <hr> + <h3><a name="macosx">Basic Mac OS X System Setup</a></h3> + <blockquote> + <strong>X64 only:</strong> + The minimum recommended hardware for building + the Mac OS X version is any 64-bit capable Intel processor, at least 2 + GB of RAM, and approximately 3 GB of free disk space. You should also + have OS X Lion 10.7.3 installed. + </blockquote> + <!-- ------------------------------------------------------ --> + + <h4><a name="macosx_checklist">Basic Mac OS X Check List</a></h4> + <blockquote> + <ol> + <li> + Install <a href="https://developer.apple.com/xcode/">XCode 4.1</a> or newer. + If you install XCode 4.3 or newer, make sure you also install + "Command line tools" found under the preferences pane "Downloads". + </li> + <li> + Install <a href="http://support.apple.com/kb/dl1421" target="_blank">"Java for OS X Lion Update 1"</a>, + set <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a> to <code>`/usr/libexec/java_home -v 1.6`</code></tt> + </li> + <li> + <a href="#importjdk">Optional Import JDK</a>, set + <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>. + </li> + </ol> + </blockquote> + <!-- ------------------------------------------------------ --> + <hr> <h3><a name="dependencies">Build Dependencies</a></h3> <blockquote> Depending on the platform, the OpenJDK build process has some basic @@ -1220,6 +1257,10 @@ set INCLUDE=%VSINSTALLDIR%\vc\include;%WindowsSdkDir%\include set LIB=%VSINSTALLDIR%\vc\lib\amd64;%WindowsSdkDir%\lib\x64 </pre> + <strong><a name="llvmgcc">OS X Lion 10.7.3: LLVM GCC</a></strong> + <blockquote> + LLVM GCC is bundled with XCode. The version should be at least 4.2.1. + </blockquote> </blockquote> <!-- ------------------------------------------------------ --> <h4><a name="zip">Zip and Unzip</a></h4>
--- a/make/Defs-internal.gmk Thu May 24 13:54:34 2012 -0700 +++ b/make/Defs-internal.gmk Fri Jun 15 12:47:20 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -348,3 +348,12 @@ COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)" endif +# When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES, +# then these can be set here: +#ifdef FULL_DEBUG_SYMBOLS +# COMMON_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +#endif +# +#ifdef ZIP_DEBUGINFO_FILES +# COMMON_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +#endif
--- a/make/hotspot-rules.gmk Thu May 24 13:54:34 2012 -0700 +++ b/make/hotspot-rules.gmk Fri Jun 15 12:47:20 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -71,6 +71,7 @@ ifeq ($(DEBUG_NAME), fastdebug) HOTSPOT_TARGET = all_fastdebug endif +BUILD_FLAVOR=$(HOTSPOT_TARGET:all_%=%) ifeq ($(ZERO_BUILD), true) ifeq ($(SHARK_BUILD), true) @@ -83,6 +84,7 @@ HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS) HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH) +HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR) # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=? # Or is there something wrong with hotspot/make/Makefile? @@ -93,6 +95,16 @@ HOTSPOT_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST) endif +# Move to COMMON_BUILD_ARGUMENTS when all repos support +# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES: +ifdef FULL_DEBUG_SYMBOLS + HOTSPOT_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +endif + +ifdef ZIP_DEBUGINFO_FILES + HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +endif + hotspot-build:: $(MKDIR) -p $(HOTSPOT_OUTPUTDIR) $(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
--- a/make/jdk-rules.gmk Thu May 24 13:54:34 2012 -0700 +++ b/make/jdk-rules.gmk Fri Jun 15 12:47:20 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -70,6 +70,16 @@ JDK_BUILD_ARGUMENTS += \ BUILD_HOTSPOT=$(BUILD_HOTSPOT) +# Move to COMMON_BUILD_ARGUMENTS when all repos support +# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES: +ifdef FULL_DEBUG_SYMBOLS + JDK_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +endif + +ifdef ZIP_DEBUGINFO_FILES + JDK_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +endif + $(JDK_JAVA_EXE):: jdk-build
--- a/make/jprt.gmk Thu May 24 13:54:34 2012 -0700 +++ b/make/jprt.gmk Fri Jun 15 12:47:20 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -36,21 +36,28 @@ JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip +ifeq ($(PLATFORM),windows) + ZIPFLAGS=-q +else + # store symbolic links as the link + ZIPFLAGS=-q -y +endif + jprt_build_product: sanity all_product_build ( $(CD) $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) && \ - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) ifdef HAVE_JPRT_SAVE_BUNDLES ( $(CD) $(OUTPUTDIR)/bundles && \ - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ) + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ) endif jprt_build_fastdebug: fastdebug_build ( $(CD) $(OUTPUTDIR)/$(REL_JDK_FASTDEBUG_IMAGE_DIR) && \ - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) jprt_build_debug: debug_build ( $(CD) $(OUTPUTDIR)/$(REL_JDK_DEBUG_IMAGE_DIR) && \ - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) ################################################################ # PHONY
--- a/make/jprt.properties Thu May 24 13:54:34 2012 -0700 +++ b/make/jprt.properties Fri Jun 15 12:47:20 2012 -0700 @@ -106,6 +106,7 @@ ${jprt.my.test.target.set:TESTNAME=jdk_beans1} \ ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \ ${jprt.my.test.target.set:TESTNAME=jdk_swing} # JCK test targets in test/Makefile (no windows)