Mercurial > hg > icedtea9-forest
changeset 444:9760a2114f51
Merge
| author | asaha |
|---|---|
| date | Tue, 14 Feb 2012 10:21:25 -0800 |
| parents | ea2ab83ce564 (current diff) 8e2104d565ba (diff) |
| children | d47bf204f34d |
| files | |
| diffstat | 5 files changed, 69 insertions(+), 121 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jul 19 11:03:08 2011 -0700 +++ b/.hgtags Tue Feb 14 10:21:25 2012 -0800 @@ -122,3 +122,14 @@ 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 +f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01 +69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02 +587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03 +0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04 +b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05 +28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06 +0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07 +fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08 +8adb70647b5af5273dfe6a540f07be667cd50216 jdk8-b09 +a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10 +1defbc57940a56f0aa41e9dee87b71e8c8b71103 jdk8-b11
--- a/README Tue Jul 19 11:03:08 2011 -0700 +++ b/README Tue Feb 14 10:21:25 2012 -0800 @@ -9,11 +9,14 @@ will be needed. This one root repository can be obtained with something like: - hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7 - To make sure you have all the nested repositories, you can run: - cd openjdk7 && sh ./get_source.sh - (This is identical to using the Mercurial Forest Extension command - 'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7'). + + hg clone http://hg.openjdk.java.net/jdk8/jdk8 openjdk8 + + To make sure you have all the nested repositories, you can run the + get_source.sh script located in the same respository as this file: + + cd openjdk8 && sh ./get_source.sh + People unfamiliar with Mercurial should read the first few chapters of the Mercurial book: http://hgbook.red-bean.com/read/ @@ -22,7 +25,7 @@ Simple Build Instructions: 0. Get the necessary system software/packages installed on your system, see - http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html + http://hg.openjdk.java.net/jdk8/build/raw-file/tip/README-builds.html 1. If you don't have a jdk6 installed, download and install a JDK 6 from http://java.sun.com/javase/downloads/index.jsp
--- a/README-builds.html Tue Jul 19 11:03:08 2011 -0700 +++ b/README-builds.html Tue Feb 14 10:21:25 2012 -0800 @@ -126,38 +126,15 @@ <a href="http://openjdk.java.net/guide/repositories.html#installConfig"> Developer Guide: Installing and Configuring Mercurial</a> section for more information. - The Forest Extension is not part of the Mercurial install, - and is optional, - but can be obtained with the following commands: - <blockquote> - <tt> - hg clone https://bitbucket.org/pmezard/hgforest-crew/overview/ <i>YourHgForest</i> - </tt> - </blockquote> - Once you have the file <tt>forest.py</tt>, you need to add these - lines to your <tt>${HOME}/.hgrc</tt> file: - <blockquote> - <tt> - [extensions] - <br>forest = <i>YourHgForest</i>/forest.py - </tt> - </blockquote> <!-- ------------------------------------------------------ --> <h3><a name="get_source">Getting the Source</a></h3> <blockquote> To get the entire set of OpenJDK Mercurial repositories - using the Forest Extension: + use the script <code>get_source.sh</code> located in the root repository: <blockquote> <tt> - hg fclone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i> - </tt> - </blockquote> - To get the entire set of OpenJDK Mercurial repositories - without using the Forest Extension: - <blockquote> - <tt> - hg clone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i> + hg clone http://hg.openjdk.java.net/jdk8/jdk8 <i>YourOpenJDK</i> <br>cd <i>YourOpenJDK</i> <br>sh ./get_source.sh </tt> @@ -172,9 +149,6 @@ <br>sh ./make/scripts/hgforest.sh pull -u </tt> </blockquote> - You may find this script <tt>make/scripts/hgforest.sh</tt> faster - than the <tt>hg</tt> forest commands provided by the - Forest Extension. </blockquote> </blockquote> @@ -558,7 +532,7 @@ understood that this is not ideal for the open source community. It is possible this process could change in the future. <br> - <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk7/"> + <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk8/"> Complete OpenJDK Source Bundles</a> <u>will</u> contain the JAXP and JAX-WS sources. </p> @@ -578,7 +552,7 @@ </li> <li> The OpenJDK team copies this new bundle into shared - area (e.g. <tt>/java/devtools/share/jdk7-drops</tt>). + area (e.g. <tt>/java/devtools/share/jdk8-drops</tt>). Older bundles are never deleted so we retain the history. </li> <li> @@ -1726,7 +1700,7 @@ The location of any source drop bundles (see <a href="#drops">Managing the Source Drops</a>). The default will be - <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk7-drops</tt>. + <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk8-drops</tt>. </dd> <dt><a name="ALT_UNIXCCS_PATH"><tt>ALT_UNIXCCS_PATH</tt></a></dt> <dd> @@ -1931,7 +1905,7 @@ PATH, INCLUDE, LIB, LIBPATH, and WINDOWSSDKDIR variables set in your shell environment. These bat files are not easy to use from a shell environment. - However, there is a script placed in the root jdk7 repository called + However, there is a script placed in the root jdk8 repository called vsvars.sh that can help, it should only be done once in a shell that will be doing the build, e.g.<br> <tt>sh ./make/scripts/vsvars.sh -v10 > settings<br>
--- a/make/jprt.properties Tue Jul 19 11:03:08 2011 -0700 +++ b/make/jprt.properties Tue Feb 14 10:21:25 2012 -0800 @@ -25,22 +25,12 @@ # Properties for jprt -# At submit time, the release supplied will be in jprt.submit.release -# and will be one of the official release names defined in jprt. -# jprt supports property value expansion using ${property.name} syntax. - -# This tells jprt what default release we want to build -jprt.tools.default.release=${jprt.submit.release} +# Release to build +jprt.tools.default.release=jdk8 # The different build flavors we want, we override here so we just get these 2 jprt.build.flavors=product,fastdebug -# Define the Windows we want (temporary) -jprt.my.windows.i586.jdk7b107=windows_i586_5.0 -jprt.my.windows.i586.jdk7temp=windows_i586_5.0 -jprt.my.windows.i586.jdk7=windows_i586_5.1 -jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} - # Standard list of jprt build targets for this source tree jprt.build.targets= \ solaris_sparc_5.10-{product|fastdebug}, \ @@ -49,7 +39,7 @@ solaris_x64_5.10-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \ - ${jprt.my.windows.i586}-{product|fastdebug}, \ + windows_i586_5.1-{product|fastdebug}, \ windows_x64_5.2-{product|fastdebug} # User can select the test set with jprt submit "-testset name" option @@ -64,7 +54,7 @@ solaris_x64_5.10-product-c2-jvm98, \ linux_i586_2.6-product-{c1|c2}-jvm98, \ linux_x64_2.6-product-c2-jvm98, \ - ${jprt.my.windows.i586}-product-c1-jvm98, \ + windows_i586_5.1-product-c1-jvm98, \ windows_x64_5.2-product-c2-jvm98, \ \ solaris_sparc_5.10-product-c1-scimark, \ @@ -73,7 +63,7 @@ solaris_x64_5.10-product-c2-scimark, \ linux_i586_2.6-product-{c1|c2}-scimark, \ linux_x64_2.6-product-c2-scimark, \ - ${jprt.my.windows.i586}-product-c1-scimark, \ + windows_i586_5.1-product-c1-scimark, \ windows_x64_5.2-product-c2-scimark # Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing) @@ -85,7 +75,7 @@ solaris_x64_5.10-product-c2-langtools_jtreg, \ linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \ linux_x64_2.6-product-c2-langtools_jtreg, \ - ${jprt.my.windows.i586}-product-c1-langtools_jtreg, \ + windows_i586_5.1-product-c1-langtools_jtreg, \ windows_x64_5.2-product-c2-langtools_jtreg, \ \ solaris_sparc_5.10-product-c1-jdk_beans1, \ @@ -94,7 +84,7 @@ solaris_x64_5.10-product-c2-jdk_beans1, \ linux_i586_2.6-product-{c1|c2}-jdk_beans1, \ linux_x64_2.6-product-c2-jdk_beans1, \ - ${jprt.my.windows.i586}-product-c1-jdk_beans1, \ + windows_i586_5.1-product-c1-jdk_beans1, \ windows_x64_5.2-product-c2-jdk_beans1, \ \ solaris_sparc_5.10-product-c1-jdk_io, \ @@ -103,7 +93,7 @@ solaris_x64_5.10-product-c2-jdk_io, \ linux_i586_2.6-product-{c1|c2}-jdk_io, \ linux_x64_2.6-product-c2-jdk_io, \ - ${jprt.my.windows.i586}-product-c1-jdk_io, \ + windows_i586_5.1-product-c1-jdk_io, \ windows_x64_5.2-product-c2-jdk_io, \ \ solaris_sparc_5.10-product-c1-jdk_lang, \ @@ -112,7 +102,7 @@ solaris_x64_5.10-product-c2-jdk_lang, \ linux_i586_2.6-product-{c1|c2}-jdk_lang, \ linux_x64_2.6-product-c2-jdk_lang, \ - ${jprt.my.windows.i586}-product-c1-jdk_lang, \ + windows_i586_5.1-product-c1-jdk_lang, \ windows_x64_5.2-product-c2-jdk_lang, \ \ solaris_sparc_5.10-product-c1-jdk_math, \ @@ -121,7 +111,7 @@ solaris_x64_5.10-product-c2-jdk_math, \ linux_i586_2.6-product-{c1|c2}-jdk_math, \ linux_x64_2.6-product-c2-jdk_math, \ - ${jprt.my.windows.i586}-product-c1-jdk_math, \ + windows_i586_5.1-product-c1-jdk_math, \ windows_x64_5.2-product-c2-jdk_math, \ \ solaris_sparc_5.10-product-c1-jdk_misc, \ @@ -130,7 +120,7 @@ solaris_x64_5.10-product-c2-jdk_misc, \ linux_i586_2.6-product-{c1|c2}-jdk_misc, \ linux_x64_2.6-product-c2-jdk_misc, \ - ${jprt.my.windows.i586}-product-c1-jdk_misc, \ + windows_i586_5.1-product-c1-jdk_misc, \ windows_x64_5.2-product-c2-jdk_misc, \ \ solaris_sparc_5.10-product-c1-jdk_net, \ @@ -139,7 +129,7 @@ solaris_x64_5.10-product-c2-jdk_net, \ linux_i586_2.6-product-{c1|c2}-jdk_net, \ linux_x64_2.6-product-c2-jdk_net, \ - ${jprt.my.windows.i586}-product-c1-jdk_net, \ + windows_i586_5.1-product-c1-jdk_net, \ windows_x64_5.2-product-c2-jdk_net, \ \ solaris_sparc_5.10-product-c1-jdk_nio1, \ @@ -148,7 +138,7 @@ solaris_x64_5.10-product-c2-jdk_nio1, \ linux_i586_2.6-product-{c1|c2}-jdk_nio1, \ linux_x64_2.6-product-c2-jdk_nio1, \ - ${jprt.my.windows.i586}-product-c1-jdk_nio1, \ + windows_i586_5.1-product-c1-jdk_nio1, \ windows_x64_5.2-product-c2-jdk_nio1, \ \ solaris_sparc_5.10-product-c1-jdk_nio2, \ @@ -157,7 +147,7 @@ solaris_x64_5.10-product-c2-jdk_nio2, \ linux_i586_2.6-product-{c1|c2}-jdk_nio2, \ linux_x64_2.6-product-c2-jdk_nio2, \ - ${jprt.my.windows.i586}-product-c1-jdk_nio2, \ + windows_i586_5.1-product-c1-jdk_nio2, \ windows_x64_5.2-product-c2-jdk_nio2, \ \ solaris_sparc_5.10-product-c1-jdk_nio3, \ @@ -166,7 +156,7 @@ solaris_x64_5.10-product-c2-jdk_nio3, \ linux_i586_2.6-product-{c1|c2}-jdk_nio3, \ linux_x64_2.6-product-c2-jdk_nio3, \ - ${jprt.my.windows.i586}-product-c1-jdk_nio3, \ + windows_i586_5.1-product-c1-jdk_nio3, \ windows_x64_5.2-product-c2-jdk_nio3, \ \ solaris_sparc_5.10-product-c1-jdk_security1, \ @@ -175,7 +165,7 @@ solaris_x64_5.10-product-c2-jdk_security1, \ linux_i586_2.6-product-{c1|c2}-jdk_security1, \ linux_x64_2.6-product-c2-jdk_security1, \ - ${jprt.my.windows.i586}-product-c1-jdk_security1, \ + windows_i586_5.1-product-c1-jdk_security1, \ windows_x64_5.2-product-c2-jdk_security1, \ \ solaris_sparc_5.10-product-c1-jdk_text, \ @@ -184,7 +174,7 @@ solaris_x64_5.10-product-c2-jdk_text, \ linux_i586_2.6-product-{c1|c2}-jdk_text, \ linux_x64_2.6-product-c2-jdk_text, \ - ${jprt.my.windows.i586}-product-c1-jdk_text, \ + windows_i586_5.1-product-c1-jdk_text, \ windows_x64_5.2-product-c2-jdk_text, \ \ solaris_sparc_5.10-product-c1-jdk_tools1, \ @@ -193,7 +183,7 @@ solaris_x64_5.10-product-c2-jdk_tools1, \ linux_i586_2.6-product-{c1|c2}-jdk_tools1, \ linux_x64_2.6-product-c2-jdk_tools1, \ - ${jprt.my.windows.i586}-product-c1-jdk_tools1, \ + windows_i586_5.1-product-c1-jdk_tools1, \ windows_x64_5.2-product-c2-jdk_tools1, \ \ solaris_sparc_5.10-product-c1-jdk_util, \ @@ -202,7 +192,7 @@ solaris_x64_5.10-product-c2-jdk_util, \ linux_i586_2.6-product-{c1|c2}-jdk_util, \ linux_x64_2.6-product-c2-jdk_util, \ - ${jprt.my.windows.i586}-product-c1-jdk_util, \ + windows_i586_5.1-product-c1-jdk_util, \ windows_x64_5.2-product-c2-jdk_util # All vm test targets (but still no fastdebug & limited c2 testing) @@ -216,7 +206,7 @@ solaris_x64_5.10-product-c2-runThese, \ linux_i586_2.6-product-{c1|c2}-runThese, \ linux_x64_2.6-product-c2-runThese, \ - ${jprt.my.windows.i586}-product-c1-runThese, \ + windows_i586_5.1-product-c1-runThese, \ windows_x64_5.2-product-c2-runThese, \ \ solaris_sparc_5.10-product-c1-jbb_default, \ @@ -225,7 +215,7 @@ solaris_x64_5.10-product-c2-jbb_default, \ linux_i586_2.6-product-{c1|c2}-jbb_default, \ linux_x64_2.6-product-c2-jbb_default, \ - ${jprt.my.windows.i586}-product-c1-jbb_default, \ + windows_i586_5.1-product-c1-jbb_default, \ windows_x64_5.2-product-c2-jbb_default # All jdk test targets (but still no fastdebug & limited c2 testing) @@ -239,7 +229,7 @@ solaris_x64_5.10-product-c2-jdk_awt, \ linux_i586_2.6-product-{c1|c2}-jdk_awt, \ linux_x64_2.6-product-c2-jdk_awt, \ - ${jprt.my.windows.i586}-product-c1-jdk_awt, \ + windows_i586_5.1-product-c1-jdk_awt, \ windows_x64_5.2-product-c2-jdk_awt, \ \ solaris_sparc_5.10-product-c1-jdk_beans2, \ @@ -248,7 +238,7 @@ solaris_x64_5.10-product-c2-jdk_beans2, \ linux_i586_2.6-product-{c1|c2}-jdk_beans2, \ linux_x64_2.6-product-c2-jdk_beans2, \ - ${jprt.my.windows.i586}-product-c1-jdk_beans2, \ + windows_i586_5.1-product-c1-jdk_beans2, \ windows_x64_5.2-product-c2-jdk_beans2, \ \ solaris_sparc_5.10-product-c1-jdk_beans3, \ @@ -257,7 +247,7 @@ solaris_x64_5.10-product-c2-jdk_beans3, \ linux_i586_2.6-product-{c1|c2}-jdk_beans3, \ linux_x64_2.6-product-c2-jdk_beans3, \ - ${jprt.my.windows.i586}-product-c1-jdk_beans3, \ + windows_i586_5.1-product-c1-jdk_beans3, \ windows_x64_5.2-product-c2-jdk_beans3, \ \ solaris_sparc_5.10-product-c1-jdk_management1, \ @@ -266,7 +256,7 @@ solaris_x64_5.10-product-c2-jdk_management1, \ linux_i586_2.6-product-{c1|c2}-jdk_management1, \ linux_x64_2.6-product-c2-jdk_management1, \ - ${jprt.my.windows.i586}-product-c1-jdk_management1, \ + windows_i586_5.1-product-c1-jdk_management1, \ windows_x64_5.2-product-c2-jdk_management1, \ \ solaris_sparc_5.10-product-c1-jdk_management2, \ @@ -275,7 +265,7 @@ solaris_x64_5.10-product-c2-jdk_management2, \ linux_i586_2.6-product-{c1|c2}-jdk_management2, \ linux_x64_2.6-product-c2-jdk_management2, \ - ${jprt.my.windows.i586}-product-c1-jdk_management2, \ + windows_i586_5.1-product-c1-jdk_management2, \ windows_x64_5.2-product-c2-jdk_management2, \ \ solaris_sparc_5.10-product-c1-jdk_rmi, \ @@ -284,7 +274,7 @@ solaris_x64_5.10-product-c2-jdk_rmi, \ linux_i586_2.6-product-{c1|c2}-jdk_rmi, \ linux_x64_2.6-product-c2-jdk_rmi, \ - ${jprt.my.windows.i586}-product-c1-jdk_rmi, \ + windows_i586_5.1-product-c1-jdk_rmi, \ windows_x64_5.2-product-c2-jdk_rmi, \ \ solaris_sparc_5.10-product-c1-jdk_security2, \ @@ -293,7 +283,7 @@ solaris_x64_5.10-product-c2-jdk_security2, \ linux_i586_2.6-product-{c1|c2}-jdk_security2, \ linux_x64_2.6-product-c2-jdk_security2, \ - ${jprt.my.windows.i586}-product-c1-jdk_security2, \ + windows_i586_5.1-product-c1-jdk_security2, \ windows_x64_5.2-product-c2-jdk_security2, \ \ solaris_sparc_5.10-product-c1-jdk_security3, \ @@ -302,16 +292,25 @@ solaris_x64_5.10-product-c2-jdk_security3, \ linux_i586_2.6-product-{c1|c2}-jdk_security3, \ linux_x64_2.6-product-c2-jdk_security3, \ - ${jprt.my.windows.i586}-product-c1-jdk_security3, \ + windows_i586_5.1-product-c1-jdk_security3, \ windows_x64_5.2-product-c2-jdk_security3, \ \ + solaris_sparc_5.10-product-c1-jdk_sound, \ + solaris_sparcv9_5.10-product-c2-jdk_sound, \ + solaris_i586_5.10-product-c1-jdk_sound, \ + solaris_x64_5.10-product-c2-jdk_sound, \ + linux_i586_2.6-product-{c1|c2}-jdk_sound, \ + linux_x64_2.6-product-c2-jdk_sound, \ + windows_i586_5.1-product-c1-jdk_sound, \ + windows_x64_5.2-product-c2-jdk_sound, \ + \ solaris_sparc_5.10-product-c1-jdk_swing, \ solaris_sparcv9_5.10-product-c2-jdk_swing, \ solaris_i586_5.10-product-c1-jdk_swing, \ solaris_x64_5.10-product-c2-jdk_swing, \ linux_i586_2.6-product-{c1|c2}-jdk_swing, \ linux_x64_2.6-product-c2-jdk_swing, \ - ${jprt.my.windows.i586}-product-c1-jdk_swing, \ + windows_i586_5.1-product-c1-jdk_swing, \ windows_x64_5.2-product-c2-jdk_swing, \ \ solaris_sparc_5.10-product-c1-jdk_tools2, \ @@ -320,7 +319,7 @@ solaris_x64_5.10-product-c2-jdk_tools2, \ linux_i586_2.6-product-{c1|c2}-jdk_tools2, \ linux_x64_2.6-product-c2-jdk_tools2, \ - ${jprt.my.windows.i586}-product-c1-jdk_tools2, \ + windows_i586_5.1-product-c1-jdk_tools2, \ windows_x64_5.2-product-c2-jdk_tools2 # JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
--- a/make/sanity-rules.gmk Tue Jul 19 11:03:08 2011 -0700 +++ b/make/sanity-rules.gmk Tue Feb 14 10:21:25 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2011, 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 @@ -56,7 +56,7 @@ sanity:: post-sanity -source-sanity : pre-sanity alt_bootdir bootdir post-sanity +source-sanity : pre-sanity post-sanity $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE): @$(prep-target) @@ -224,45 +224,6 @@ endif ###################################################### -# if specified, ALT_BOOTDIR must point to non-relative path if set -###################################################### -alt_bootdir: -ifdef ALT_BOOTDIR - @if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \ - $(ECHO) "ERROR: ALT_BOOTDIR must be an Absolute Path Name, \n" \ - " not a Relative Path Name. \n" \ - " The current value of ALT_BOOTDIR is \n" \ - " $(ALT_BOOTDIR) \n" \ - " Please fix this and continue your build. \n" \ - "" >> $(ERROR_FILE) ; \ - fi -endif - -###################################################### -# BOOTDIR must point to a valid JDK. -###################################################### -JAVA_VERSION := $(shell $(BOOTDIR)/bin/java$(EXE_SUFFIX) -version 2>&1 | $(NAWK) -F'"' '{ print $$2 }') -JAVA_VERSION_OK := $(shell $(ECHO) $(JAVA_VERSION) | $(EGREP) -c '^1.[5-6].[0-9]') -bootdir: - @if [ -x $(BOOTDIR)/bin/java$(EXE_SUFFIX) ]; then \ - if [ $(JAVA_VERSION_OK) -ne 1 ]; then \ - $(ECHO) "ERROR: Your BOOTDIR environment variable does not point \n" \ - " to a valid JDK for bootstrapping this build. \n" \ - " A JDK $(JDK_MKTG_VERSION) source generation process must be \n" \ - " bootstrapped using JDK $(PREVIOUS_JDK_VERSION) fcs (or later). \n" \ - " Apparently, your bootstrap JDK is version $(JAVA_VERSION) \n" \ - " Please update your ALT_BOOTDIR setting and start your build again. \n" \ - "" >> $(ERROR_FILE) ; \ - fi \ - else \ - $(ECHO) "ERROR: BOOTDIR does not point to a valid Java 2 SDK \n" \ - " Check that you have access to \n" \ - " $(BOOTDIR)/bin/java$(EXE_SUFFIX) \n" \ - " and/or check your value of ALT_BOOTDIR. \n" \ - "" >> $(ERROR_FILE) ; \ - fi - -###################################################### # dump out the variable settings... ###################################################### ifneq ($(PLATFORM), windows) @@ -350,4 +311,4 @@ .PHONY: sanity settings pre-sanity insane \ post-sanity post-sanity-hotspot post-sanity-jdk \ post-sanity-install post-sanity-deploy \ - alt_bootdir bootdir environment + environment