Mercurial > hg > release > icedtea7-forest-2.3
changeset 562:38a165b231d1
Merge
author | asaha |
---|---|
date | Fri, 01 Jun 2012 10:52:52 -0700 |
parents | c1847068ecf3 (current diff) 4ad51b8f3b04 (diff) |
children | 068ef98b8868 |
files | .hgtags |
diffstat | 2 files changed, 55 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Apr 19 09:57:36 2012 -0700 +++ b/.hgtags Fri Jun 01 10:52:52 2012 -0700 @@ -166,9 +166,23 @@ 21d4722185b95ab571c9e1e07d9ddd5e637cc2c9 jdk7u4-b18 212bad4649eff2fbdfcd397afcb0d1e3d566b41a jdk7u4-b19 1eae71787c3343d7f492c075f94d4010abdd4d5c jdk7u4-b20 +f3f02c7d86c7b6da7596ddacbba04906cd02ab0f jdk7u4-b30 +d738383dd287f0bdad23934c43674a1170dad993 jdk7u4-b21 +3e92586871d9e0cf6ef4f2a95f38a5d102ebd297 jdk7u4-b22 +0faf04aa1dd4cbfa92fa87492a29be52a0068033 jdk7u4-b31 +18b62edd0ae7fdb8ea93e8b4df1256a6284b5097 jdk7u5-b02 +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
--- a/README-builds.html Thu Apr 19 09:57:36 2012 -0700 +++ b/README-builds.html Fri Jun 01 10:52:52 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>