Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Tue, 14 Feb 2012 10:21:25 -0800
- author
- asaha
- date
- Tue, 14 Feb 2012 10:21:25 -0800
- changeset 404
- 9760a2114f51
- parent 380
- ea2ab83ce564
- parent 375
- 8e2104d565ba
- child 405
- d47bf204f34d
Merge
1.1 --- a/.hgtags Tue Jul 19 11:03:08 2011 -0700 1.2 +++ b/.hgtags Tue Feb 14 10:21:25 2012 -0800 1.3 @@ -122,3 +122,14 @@ 1.4 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145 1.5 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 1.6 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 1.7 +f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01 1.8 +69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02 1.9 +587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03 1.10 +0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04 1.11 +b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05 1.12 +28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06 1.13 +0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07 1.14 +fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08 1.15 +8adb70647b5af5273dfe6a540f07be667cd50216 jdk8-b09 1.16 +a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10 1.17 +1defbc57940a56f0aa41e9dee87b71e8c8b71103 jdk8-b11
2.1 --- a/README Tue Jul 19 11:03:08 2011 -0700 2.2 +++ b/README Tue Feb 14 10:21:25 2012 -0800 2.3 @@ -9,11 +9,14 @@ 2.4 will be needed. 2.5 2.6 This one root repository can be obtained with something like: 2.7 - hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7 2.8 - To make sure you have all the nested repositories, you can run: 2.9 - cd openjdk7 && sh ./get_source.sh 2.10 - (This is identical to using the Mercurial Forest Extension command 2.11 - 'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7'). 2.12 + 2.13 + hg clone http://hg.openjdk.java.net/jdk8/jdk8 openjdk8 2.14 + 2.15 + To make sure you have all the nested repositories, you can run the 2.16 + get_source.sh script located in the same respository as this file: 2.17 + 2.18 + cd openjdk8 && sh ./get_source.sh 2.19 + 2.20 People unfamiliar with Mercurial should read the first few chapters of 2.21 the Mercurial book: http://hgbook.red-bean.com/read/ 2.22 2.23 @@ -22,7 +25,7 @@ 2.24 Simple Build Instructions: 2.25 2.26 0. Get the necessary system software/packages installed on your system, see 2.27 - http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html 2.28 + http://hg.openjdk.java.net/jdk8/build/raw-file/tip/README-builds.html 2.29 2.30 1. If you don't have a jdk6 installed, download and install a JDK 6 from 2.31 http://java.sun.com/javase/downloads/index.jsp
3.1 --- a/README-builds.html Tue Jul 19 11:03:08 2011 -0700 3.2 +++ b/README-builds.html Tue Feb 14 10:21:25 2012 -0800 3.3 @@ -126,38 +126,15 @@ 3.4 <a href="http://openjdk.java.net/guide/repositories.html#installConfig"> 3.5 Developer Guide: Installing and Configuring Mercurial</a> 3.6 section for more information. 3.7 - The Forest Extension is not part of the Mercurial install, 3.8 - and is optional, 3.9 - but can be obtained with the following commands: 3.10 - <blockquote> 3.11 - <tt> 3.12 - hg clone https://bitbucket.org/pmezard/hgforest-crew/overview/ <i>YourHgForest</i> 3.13 - </tt> 3.14 - </blockquote> 3.15 - Once you have the file <tt>forest.py</tt>, you need to add these 3.16 - lines to your <tt>${HOME}/.hgrc</tt> file: 3.17 - <blockquote> 3.18 - <tt> 3.19 - [extensions] 3.20 - <br>forest = <i>YourHgForest</i>/forest.py 3.21 - </tt> 3.22 - </blockquote> 3.23 3.24 <!-- ------------------------------------------------------ --> 3.25 <h3><a name="get_source">Getting the Source</a></h3> 3.26 <blockquote> 3.27 To get the entire set of OpenJDK Mercurial repositories 3.28 - using the Forest Extension: 3.29 + use the script <code>get_source.sh</code> located in the root repository: 3.30 <blockquote> 3.31 <tt> 3.32 - hg fclone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i> 3.33 - </tt> 3.34 - </blockquote> 3.35 - To get the entire set of OpenJDK Mercurial repositories 3.36 - without using the Forest Extension: 3.37 - <blockquote> 3.38 - <tt> 3.39 - hg clone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i> 3.40 + hg clone http://hg.openjdk.java.net/jdk8/jdk8 <i>YourOpenJDK</i> 3.41 <br>cd <i>YourOpenJDK</i> 3.42 <br>sh ./get_source.sh 3.43 </tt> 3.44 @@ -172,9 +149,6 @@ 3.45 <br>sh ./make/scripts/hgforest.sh pull -u 3.46 </tt> 3.47 </blockquote> 3.48 - You may find this script <tt>make/scripts/hgforest.sh</tt> faster 3.49 - than the <tt>hg</tt> forest commands provided by the 3.50 - Forest Extension. 3.51 </blockquote> 3.52 3.53 </blockquote> 3.54 @@ -558,7 +532,7 @@ 3.55 understood that this is not ideal for the open source community. 3.56 It is possible this process could change in the future. 3.57 <br> 3.58 - <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk7/"> 3.59 + <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk8/"> 3.60 Complete OpenJDK Source Bundles</a> <u>will</u> contain the JAXP and 3.61 JAX-WS sources. 3.62 </p> 3.63 @@ -578,7 +552,7 @@ 3.64 </li> 3.65 <li> 3.66 The OpenJDK team copies this new bundle into shared 3.67 - area (e.g. <tt>/java/devtools/share/jdk7-drops</tt>). 3.68 + area (e.g. <tt>/java/devtools/share/jdk8-drops</tt>). 3.69 Older bundles are never deleted so we retain the history. 3.70 </li> 3.71 <li> 3.72 @@ -1726,7 +1700,7 @@ 3.73 The location of any source drop bundles 3.74 (see <a href="#drops">Managing the Source Drops</a>). 3.75 The default will be 3.76 - <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk7-drops</tt>. 3.77 + <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk8-drops</tt>. 3.78 </dd> 3.79 <dt><a name="ALT_UNIXCCS_PATH"><tt>ALT_UNIXCCS_PATH</tt></a></dt> 3.80 <dd> 3.81 @@ -1931,7 +1905,7 @@ 3.82 PATH, INCLUDE, LIB, LIBPATH, and WINDOWSSDKDIR 3.83 variables set in your shell environment. 3.84 These bat files are not easy to use from a shell environment. 3.85 - However, there is a script placed in the root jdk7 repository called 3.86 + However, there is a script placed in the root jdk8 repository called 3.87 vsvars.sh that can help, it should only be done once in a shell 3.88 that will be doing the build, e.g.<br> 3.89 <tt>sh ./make/scripts/vsvars.sh -v10 > settings<br>
4.1 --- a/make/jprt.properties Tue Jul 19 11:03:08 2011 -0700 4.2 +++ b/make/jprt.properties Tue Feb 14 10:21:25 2012 -0800 4.3 @@ -25,22 +25,12 @@ 4.4 4.5 # Properties for jprt 4.6 4.7 -# At submit time, the release supplied will be in jprt.submit.release 4.8 -# and will be one of the official release names defined in jprt. 4.9 -# jprt supports property value expansion using ${property.name} syntax. 4.10 - 4.11 -# This tells jprt what default release we want to build 4.12 -jprt.tools.default.release=${jprt.submit.release} 4.13 +# Release to build 4.14 +jprt.tools.default.release=jdk8 4.15 4.16 # The different build flavors we want, we override here so we just get these 2 4.17 jprt.build.flavors=product,fastdebug 4.18 4.19 -# Define the Windows we want (temporary) 4.20 -jprt.my.windows.i586.jdk7b107=windows_i586_5.0 4.21 -jprt.my.windows.i586.jdk7temp=windows_i586_5.0 4.22 -jprt.my.windows.i586.jdk7=windows_i586_5.1 4.23 -jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} 4.24 - 4.25 # Standard list of jprt build targets for this source tree 4.26 jprt.build.targets= \ 4.27 solaris_sparc_5.10-{product|fastdebug}, \ 4.28 @@ -49,7 +39,7 @@ 4.29 solaris_x64_5.10-{product|fastdebug}, \ 4.30 linux_i586_2.6-{product|fastdebug}, \ 4.31 linux_x64_2.6-{product|fastdebug}, \ 4.32 - ${jprt.my.windows.i586}-{product|fastdebug}, \ 4.33 + windows_i586_5.1-{product|fastdebug}, \ 4.34 windows_x64_5.2-{product|fastdebug} 4.35 4.36 # User can select the test set with jprt submit "-testset name" option 4.37 @@ -64,7 +54,7 @@ 4.38 solaris_x64_5.10-product-c2-jvm98, \ 4.39 linux_i586_2.6-product-{c1|c2}-jvm98, \ 4.40 linux_x64_2.6-product-c2-jvm98, \ 4.41 - ${jprt.my.windows.i586}-product-c1-jvm98, \ 4.42 + windows_i586_5.1-product-c1-jvm98, \ 4.43 windows_x64_5.2-product-c2-jvm98, \ 4.44 \ 4.45 solaris_sparc_5.10-product-c1-scimark, \ 4.46 @@ -73,7 +63,7 @@ 4.47 solaris_x64_5.10-product-c2-scimark, \ 4.48 linux_i586_2.6-product-{c1|c2}-scimark, \ 4.49 linux_x64_2.6-product-c2-scimark, \ 4.50 - ${jprt.my.windows.i586}-product-c1-scimark, \ 4.51 + windows_i586_5.1-product-c1-scimark, \ 4.52 windows_x64_5.2-product-c2-scimark 4.53 4.54 # Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing) 4.55 @@ -85,7 +75,7 @@ 4.56 solaris_x64_5.10-product-c2-langtools_jtreg, \ 4.57 linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \ 4.58 linux_x64_2.6-product-c2-langtools_jtreg, \ 4.59 - ${jprt.my.windows.i586}-product-c1-langtools_jtreg, \ 4.60 + windows_i586_5.1-product-c1-langtools_jtreg, \ 4.61 windows_x64_5.2-product-c2-langtools_jtreg, \ 4.62 \ 4.63 solaris_sparc_5.10-product-c1-jdk_beans1, \ 4.64 @@ -94,7 +84,7 @@ 4.65 solaris_x64_5.10-product-c2-jdk_beans1, \ 4.66 linux_i586_2.6-product-{c1|c2}-jdk_beans1, \ 4.67 linux_x64_2.6-product-c2-jdk_beans1, \ 4.68 - ${jprt.my.windows.i586}-product-c1-jdk_beans1, \ 4.69 + windows_i586_5.1-product-c1-jdk_beans1, \ 4.70 windows_x64_5.2-product-c2-jdk_beans1, \ 4.71 \ 4.72 solaris_sparc_5.10-product-c1-jdk_io, \ 4.73 @@ -103,7 +93,7 @@ 4.74 solaris_x64_5.10-product-c2-jdk_io, \ 4.75 linux_i586_2.6-product-{c1|c2}-jdk_io, \ 4.76 linux_x64_2.6-product-c2-jdk_io, \ 4.77 - ${jprt.my.windows.i586}-product-c1-jdk_io, \ 4.78 + windows_i586_5.1-product-c1-jdk_io, \ 4.79 windows_x64_5.2-product-c2-jdk_io, \ 4.80 \ 4.81 solaris_sparc_5.10-product-c1-jdk_lang, \ 4.82 @@ -112,7 +102,7 @@ 4.83 solaris_x64_5.10-product-c2-jdk_lang, \ 4.84 linux_i586_2.6-product-{c1|c2}-jdk_lang, \ 4.85 linux_x64_2.6-product-c2-jdk_lang, \ 4.86 - ${jprt.my.windows.i586}-product-c1-jdk_lang, \ 4.87 + windows_i586_5.1-product-c1-jdk_lang, \ 4.88 windows_x64_5.2-product-c2-jdk_lang, \ 4.89 \ 4.90 solaris_sparc_5.10-product-c1-jdk_math, \ 4.91 @@ -121,7 +111,7 @@ 4.92 solaris_x64_5.10-product-c2-jdk_math, \ 4.93 linux_i586_2.6-product-{c1|c2}-jdk_math, \ 4.94 linux_x64_2.6-product-c2-jdk_math, \ 4.95 - ${jprt.my.windows.i586}-product-c1-jdk_math, \ 4.96 + windows_i586_5.1-product-c1-jdk_math, \ 4.97 windows_x64_5.2-product-c2-jdk_math, \ 4.98 \ 4.99 solaris_sparc_5.10-product-c1-jdk_misc, \ 4.100 @@ -130,7 +120,7 @@ 4.101 solaris_x64_5.10-product-c2-jdk_misc, \ 4.102 linux_i586_2.6-product-{c1|c2}-jdk_misc, \ 4.103 linux_x64_2.6-product-c2-jdk_misc, \ 4.104 - ${jprt.my.windows.i586}-product-c1-jdk_misc, \ 4.105 + windows_i586_5.1-product-c1-jdk_misc, \ 4.106 windows_x64_5.2-product-c2-jdk_misc, \ 4.107 \ 4.108 solaris_sparc_5.10-product-c1-jdk_net, \ 4.109 @@ -139,7 +129,7 @@ 4.110 solaris_x64_5.10-product-c2-jdk_net, \ 4.111 linux_i586_2.6-product-{c1|c2}-jdk_net, \ 4.112 linux_x64_2.6-product-c2-jdk_net, \ 4.113 - ${jprt.my.windows.i586}-product-c1-jdk_net, \ 4.114 + windows_i586_5.1-product-c1-jdk_net, \ 4.115 windows_x64_5.2-product-c2-jdk_net, \ 4.116 \ 4.117 solaris_sparc_5.10-product-c1-jdk_nio1, \ 4.118 @@ -148,7 +138,7 @@ 4.119 solaris_x64_5.10-product-c2-jdk_nio1, \ 4.120 linux_i586_2.6-product-{c1|c2}-jdk_nio1, \ 4.121 linux_x64_2.6-product-c2-jdk_nio1, \ 4.122 - ${jprt.my.windows.i586}-product-c1-jdk_nio1, \ 4.123 + windows_i586_5.1-product-c1-jdk_nio1, \ 4.124 windows_x64_5.2-product-c2-jdk_nio1, \ 4.125 \ 4.126 solaris_sparc_5.10-product-c1-jdk_nio2, \ 4.127 @@ -157,7 +147,7 @@ 4.128 solaris_x64_5.10-product-c2-jdk_nio2, \ 4.129 linux_i586_2.6-product-{c1|c2}-jdk_nio2, \ 4.130 linux_x64_2.6-product-c2-jdk_nio2, \ 4.131 - ${jprt.my.windows.i586}-product-c1-jdk_nio2, \ 4.132 + windows_i586_5.1-product-c1-jdk_nio2, \ 4.133 windows_x64_5.2-product-c2-jdk_nio2, \ 4.134 \ 4.135 solaris_sparc_5.10-product-c1-jdk_nio3, \ 4.136 @@ -166,7 +156,7 @@ 4.137 solaris_x64_5.10-product-c2-jdk_nio3, \ 4.138 linux_i586_2.6-product-{c1|c2}-jdk_nio3, \ 4.139 linux_x64_2.6-product-c2-jdk_nio3, \ 4.140 - ${jprt.my.windows.i586}-product-c1-jdk_nio3, \ 4.141 + windows_i586_5.1-product-c1-jdk_nio3, \ 4.142 windows_x64_5.2-product-c2-jdk_nio3, \ 4.143 \ 4.144 solaris_sparc_5.10-product-c1-jdk_security1, \ 4.145 @@ -175,7 +165,7 @@ 4.146 solaris_x64_5.10-product-c2-jdk_security1, \ 4.147 linux_i586_2.6-product-{c1|c2}-jdk_security1, \ 4.148 linux_x64_2.6-product-c2-jdk_security1, \ 4.149 - ${jprt.my.windows.i586}-product-c1-jdk_security1, \ 4.150 + windows_i586_5.1-product-c1-jdk_security1, \ 4.151 windows_x64_5.2-product-c2-jdk_security1, \ 4.152 \ 4.153 solaris_sparc_5.10-product-c1-jdk_text, \ 4.154 @@ -184,7 +174,7 @@ 4.155 solaris_x64_5.10-product-c2-jdk_text, \ 4.156 linux_i586_2.6-product-{c1|c2}-jdk_text, \ 4.157 linux_x64_2.6-product-c2-jdk_text, \ 4.158 - ${jprt.my.windows.i586}-product-c1-jdk_text, \ 4.159 + windows_i586_5.1-product-c1-jdk_text, \ 4.160 windows_x64_5.2-product-c2-jdk_text, \ 4.161 \ 4.162 solaris_sparc_5.10-product-c1-jdk_tools1, \ 4.163 @@ -193,7 +183,7 @@ 4.164 solaris_x64_5.10-product-c2-jdk_tools1, \ 4.165 linux_i586_2.6-product-{c1|c2}-jdk_tools1, \ 4.166 linux_x64_2.6-product-c2-jdk_tools1, \ 4.167 - ${jprt.my.windows.i586}-product-c1-jdk_tools1, \ 4.168 + windows_i586_5.1-product-c1-jdk_tools1, \ 4.169 windows_x64_5.2-product-c2-jdk_tools1, \ 4.170 \ 4.171 solaris_sparc_5.10-product-c1-jdk_util, \ 4.172 @@ -202,7 +192,7 @@ 4.173 solaris_x64_5.10-product-c2-jdk_util, \ 4.174 linux_i586_2.6-product-{c1|c2}-jdk_util, \ 4.175 linux_x64_2.6-product-c2-jdk_util, \ 4.176 - ${jprt.my.windows.i586}-product-c1-jdk_util, \ 4.177 + windows_i586_5.1-product-c1-jdk_util, \ 4.178 windows_x64_5.2-product-c2-jdk_util 4.179 4.180 # All vm test targets (but still no fastdebug & limited c2 testing) 4.181 @@ -216,7 +206,7 @@ 4.182 solaris_x64_5.10-product-c2-runThese, \ 4.183 linux_i586_2.6-product-{c1|c2}-runThese, \ 4.184 linux_x64_2.6-product-c2-runThese, \ 4.185 - ${jprt.my.windows.i586}-product-c1-runThese, \ 4.186 + windows_i586_5.1-product-c1-runThese, \ 4.187 windows_x64_5.2-product-c2-runThese, \ 4.188 \ 4.189 solaris_sparc_5.10-product-c1-jbb_default, \ 4.190 @@ -225,7 +215,7 @@ 4.191 solaris_x64_5.10-product-c2-jbb_default, \ 4.192 linux_i586_2.6-product-{c1|c2}-jbb_default, \ 4.193 linux_x64_2.6-product-c2-jbb_default, \ 4.194 - ${jprt.my.windows.i586}-product-c1-jbb_default, \ 4.195 + windows_i586_5.1-product-c1-jbb_default, \ 4.196 windows_x64_5.2-product-c2-jbb_default 4.197 4.198 # All jdk test targets (but still no fastdebug & limited c2 testing) 4.199 @@ -239,7 +229,7 @@ 4.200 solaris_x64_5.10-product-c2-jdk_awt, \ 4.201 linux_i586_2.6-product-{c1|c2}-jdk_awt, \ 4.202 linux_x64_2.6-product-c2-jdk_awt, \ 4.203 - ${jprt.my.windows.i586}-product-c1-jdk_awt, \ 4.204 + windows_i586_5.1-product-c1-jdk_awt, \ 4.205 windows_x64_5.2-product-c2-jdk_awt, \ 4.206 \ 4.207 solaris_sparc_5.10-product-c1-jdk_beans2, \ 4.208 @@ -248,7 +238,7 @@ 4.209 solaris_x64_5.10-product-c2-jdk_beans2, \ 4.210 linux_i586_2.6-product-{c1|c2}-jdk_beans2, \ 4.211 linux_x64_2.6-product-c2-jdk_beans2, \ 4.212 - ${jprt.my.windows.i586}-product-c1-jdk_beans2, \ 4.213 + windows_i586_5.1-product-c1-jdk_beans2, \ 4.214 windows_x64_5.2-product-c2-jdk_beans2, \ 4.215 \ 4.216 solaris_sparc_5.10-product-c1-jdk_beans3, \ 4.217 @@ -257,7 +247,7 @@ 4.218 solaris_x64_5.10-product-c2-jdk_beans3, \ 4.219 linux_i586_2.6-product-{c1|c2}-jdk_beans3, \ 4.220 linux_x64_2.6-product-c2-jdk_beans3, \ 4.221 - ${jprt.my.windows.i586}-product-c1-jdk_beans3, \ 4.222 + windows_i586_5.1-product-c1-jdk_beans3, \ 4.223 windows_x64_5.2-product-c2-jdk_beans3, \ 4.224 \ 4.225 solaris_sparc_5.10-product-c1-jdk_management1, \ 4.226 @@ -266,7 +256,7 @@ 4.227 solaris_x64_5.10-product-c2-jdk_management1, \ 4.228 linux_i586_2.6-product-{c1|c2}-jdk_management1, \ 4.229 linux_x64_2.6-product-c2-jdk_management1, \ 4.230 - ${jprt.my.windows.i586}-product-c1-jdk_management1, \ 4.231 + windows_i586_5.1-product-c1-jdk_management1, \ 4.232 windows_x64_5.2-product-c2-jdk_management1, \ 4.233 \ 4.234 solaris_sparc_5.10-product-c1-jdk_management2, \ 4.235 @@ -275,7 +265,7 @@ 4.236 solaris_x64_5.10-product-c2-jdk_management2, \ 4.237 linux_i586_2.6-product-{c1|c2}-jdk_management2, \ 4.238 linux_x64_2.6-product-c2-jdk_management2, \ 4.239 - ${jprt.my.windows.i586}-product-c1-jdk_management2, \ 4.240 + windows_i586_5.1-product-c1-jdk_management2, \ 4.241 windows_x64_5.2-product-c2-jdk_management2, \ 4.242 \ 4.243 solaris_sparc_5.10-product-c1-jdk_rmi, \ 4.244 @@ -284,7 +274,7 @@ 4.245 solaris_x64_5.10-product-c2-jdk_rmi, \ 4.246 linux_i586_2.6-product-{c1|c2}-jdk_rmi, \ 4.247 linux_x64_2.6-product-c2-jdk_rmi, \ 4.248 - ${jprt.my.windows.i586}-product-c1-jdk_rmi, \ 4.249 + windows_i586_5.1-product-c1-jdk_rmi, \ 4.250 windows_x64_5.2-product-c2-jdk_rmi, \ 4.251 \ 4.252 solaris_sparc_5.10-product-c1-jdk_security2, \ 4.253 @@ -293,7 +283,7 @@ 4.254 solaris_x64_5.10-product-c2-jdk_security2, \ 4.255 linux_i586_2.6-product-{c1|c2}-jdk_security2, \ 4.256 linux_x64_2.6-product-c2-jdk_security2, \ 4.257 - ${jprt.my.windows.i586}-product-c1-jdk_security2, \ 4.258 + windows_i586_5.1-product-c1-jdk_security2, \ 4.259 windows_x64_5.2-product-c2-jdk_security2, \ 4.260 \ 4.261 solaris_sparc_5.10-product-c1-jdk_security3, \ 4.262 @@ -302,16 +292,25 @@ 4.263 solaris_x64_5.10-product-c2-jdk_security3, \ 4.264 linux_i586_2.6-product-{c1|c2}-jdk_security3, \ 4.265 linux_x64_2.6-product-c2-jdk_security3, \ 4.266 - ${jprt.my.windows.i586}-product-c1-jdk_security3, \ 4.267 + windows_i586_5.1-product-c1-jdk_security3, \ 4.268 windows_x64_5.2-product-c2-jdk_security3, \ 4.269 \ 4.270 + solaris_sparc_5.10-product-c1-jdk_sound, \ 4.271 + solaris_sparcv9_5.10-product-c2-jdk_sound, \ 4.272 + solaris_i586_5.10-product-c1-jdk_sound, \ 4.273 + solaris_x64_5.10-product-c2-jdk_sound, \ 4.274 + linux_i586_2.6-product-{c1|c2}-jdk_sound, \ 4.275 + linux_x64_2.6-product-c2-jdk_sound, \ 4.276 + windows_i586_5.1-product-c1-jdk_sound, \ 4.277 + windows_x64_5.2-product-c2-jdk_sound, \ 4.278 + \ 4.279 solaris_sparc_5.10-product-c1-jdk_swing, \ 4.280 solaris_sparcv9_5.10-product-c2-jdk_swing, \ 4.281 solaris_i586_5.10-product-c1-jdk_swing, \ 4.282 solaris_x64_5.10-product-c2-jdk_swing, \ 4.283 linux_i586_2.6-product-{c1|c2}-jdk_swing, \ 4.284 linux_x64_2.6-product-c2-jdk_swing, \ 4.285 - ${jprt.my.windows.i586}-product-c1-jdk_swing, \ 4.286 + windows_i586_5.1-product-c1-jdk_swing, \ 4.287 windows_x64_5.2-product-c2-jdk_swing, \ 4.288 \ 4.289 solaris_sparc_5.10-product-c1-jdk_tools2, \ 4.290 @@ -320,7 +319,7 @@ 4.291 solaris_x64_5.10-product-c2-jdk_tools2, \ 4.292 linux_i586_2.6-product-{c1|c2}-jdk_tools2, \ 4.293 linux_x64_2.6-product-c2-jdk_tools2, \ 4.294 - ${jprt.my.windows.i586}-product-c1-jdk_tools2, \ 4.295 + windows_i586_5.1-product-c1-jdk_tools2, \ 4.296 windows_x64_5.2-product-c2-jdk_tools2 4.297 4.298 # JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
5.1 --- a/make/sanity-rules.gmk Tue Jul 19 11:03:08 2011 -0700 5.2 +++ b/make/sanity-rules.gmk Tue Feb 14 10:21:25 2012 -0800 5.3 @@ -1,5 +1,5 @@ 5.4 # 5.5 -# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. 5.6 +# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. 5.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 # 5.9 # This code is free software; you can redistribute it and/or modify it 5.10 @@ -56,7 +56,7 @@ 5.11 5.12 sanity:: post-sanity 5.13 5.14 -source-sanity : pre-sanity alt_bootdir bootdir post-sanity 5.15 +source-sanity : pre-sanity post-sanity 5.16 5.17 $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE): 5.18 @$(prep-target) 5.19 @@ -224,45 +224,6 @@ 5.20 endif 5.21 5.22 ###################################################### 5.23 -# if specified, ALT_BOOTDIR must point to non-relative path if set 5.24 -###################################################### 5.25 -alt_bootdir: 5.26 -ifdef ALT_BOOTDIR 5.27 - @if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \ 5.28 - $(ECHO) "ERROR: ALT_BOOTDIR must be an Absolute Path Name, \n" \ 5.29 - " not a Relative Path Name. \n" \ 5.30 - " The current value of ALT_BOOTDIR is \n" \ 5.31 - " $(ALT_BOOTDIR) \n" \ 5.32 - " Please fix this and continue your build. \n" \ 5.33 - "" >> $(ERROR_FILE) ; \ 5.34 - fi 5.35 -endif 5.36 - 5.37 -###################################################### 5.38 -# BOOTDIR must point to a valid JDK. 5.39 -###################################################### 5.40 -JAVA_VERSION := $(shell $(BOOTDIR)/bin/java$(EXE_SUFFIX) -version 2>&1 | $(NAWK) -F'"' '{ print $$2 }') 5.41 -JAVA_VERSION_OK := $(shell $(ECHO) $(JAVA_VERSION) | $(EGREP) -c '^1.[5-6].[0-9]') 5.42 -bootdir: 5.43 - @if [ -x $(BOOTDIR)/bin/java$(EXE_SUFFIX) ]; then \ 5.44 - if [ $(JAVA_VERSION_OK) -ne 1 ]; then \ 5.45 - $(ECHO) "ERROR: Your BOOTDIR environment variable does not point \n" \ 5.46 - " to a valid JDK for bootstrapping this build. \n" \ 5.47 - " A JDK $(JDK_MKTG_VERSION) source generation process must be \n" \ 5.48 - " bootstrapped using JDK $(PREVIOUS_JDK_VERSION) fcs (or later). \n" \ 5.49 - " Apparently, your bootstrap JDK is version $(JAVA_VERSION) \n" \ 5.50 - " Please update your ALT_BOOTDIR setting and start your build again. \n" \ 5.51 - "" >> $(ERROR_FILE) ; \ 5.52 - fi \ 5.53 - else \ 5.54 - $(ECHO) "ERROR: BOOTDIR does not point to a valid Java 2 SDK \n" \ 5.55 - " Check that you have access to \n" \ 5.56 - " $(BOOTDIR)/bin/java$(EXE_SUFFIX) \n" \ 5.57 - " and/or check your value of ALT_BOOTDIR. \n" \ 5.58 - "" >> $(ERROR_FILE) ; \ 5.59 - fi 5.60 - 5.61 -###################################################### 5.62 # dump out the variable settings... 5.63 ###################################################### 5.64 ifneq ($(PLATFORM), windows) 5.65 @@ -350,4 +311,4 @@ 5.66 .PHONY: sanity settings pre-sanity insane \ 5.67 post-sanity post-sanity-hotspot post-sanity-jdk \ 5.68 post-sanity-install post-sanity-deploy \ 5.69 - alt_bootdir bootdir environment 5.70 + environment
