changeset 501:f51ab5aecdc8

Merge
author andrew
date Wed, 23 May 2012 20:37:39 +0100
parents 6670fad22684 5f3645aa920d
children 4ad80e78b55b
files .hgtags make/Defs-internal.gmk make/hotspot-rules.gmk
diffstat 8 files changed, 106 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed May 02 15:07:06 2012 +0100
+++ b/.hgtags	Wed May 23 20:37:39 2012 +0100
@@ -163,3 +163,20 @@
 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11
 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12
 e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint
+9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13
+d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14
+008753000680a2008175d14b25373356f531aa07 jdk7u4-b15
+901b753e13ee064b01a6df9adeed0516c814f8c2 jdk7u4-b16
+89e8d9a0f6f1b75109693f388b8242945442ae3b jdk7u4-b17
+21d4722185b95ab571c9e1e07d9ddd5e637cc2c9 jdk7u4-b18
+212bad4649eff2fbdfcd397afcb0d1e3d566b41a jdk7u4-b19
+1eae71787c3343d7f492c075f94d4010abdd4d5c jdk7u4-b20
+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
--- a/README-builds.html	Wed May 02 15:07:06 2012 +0100
+++ b/README-builds.html	Wed May 23 20:37:39 2012 +0100
@@ -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	Wed May 02 15:07:06 2012 +0100
+++ b/make/Defs-internal.gmk	Wed May 23 20:37:39 2012 +0100
@@ -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
@@ -349,3 +349,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	Wed May 02 15:07:06 2012 +0100
+++ b/make/hotspot-rules.gmk	Wed May 23 20:37:39 2012 +0100
@@ -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	Wed May 02 15:07:06 2012 +0100
+++ b/make/jdk-rules.gmk	Wed May 23 20:37:39 2012 +0100
@@ -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	Wed May 02 15:07:06 2012 +0100
+++ b/make/jprt.gmk	Wed May 23 20:37:39 2012 +0100
@@ -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	Wed May 02 15:07:06 2012 +0100
+++ b/make/jprt.properties	Wed May 23 20:37:39 2012 +0100
@@ -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)
--- a/test/Makefile	Wed May 02 15:07:06 2012 +0100
+++ b/test/Makefile	Wed May 23 20:37:39 2012 +0100
@@ -63,6 +63,7 @@
 	jdk_net  \
 	jdk_nio1 jdk_nio2 jdk_nio3  \
 	jdk_security1 jdk_security2 jdk_security3  \
+	jdk_sound  \
 	jdk_text  \
 	jdk_tools1 jdk_tools2  \
 	jdk_util