archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
J. Duke 2017-07-05 17:48:27 +02:00
commit 03a99aea44
4 changed files with 17 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.hgtags-top-repo
View file

@ -122,3 +122,4 @@ cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01

15
README
View file

@ -9,11 +9,14 @@ README:
will be needed. will be needed.
This one root repository can be obtained with something like: 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: hg clone http://hg.openjdk.java.net/jdk8/jdk8 openjdk8
cd openjdk7 && sh ./get_source.sh
(This is identical to using the Mercurial Forest Extension command To make sure you have all the nested repositories, you can run the
'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7'). 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 People unfamiliar with Mercurial should read the first few chapters of
the Mercurial book: http://hgbook.red-bean.com/read/ the Mercurial book: http://hgbook.red-bean.com/read/
@ -22,7 +25,7 @@ README:
Simple Build Instructions: Simple Build Instructions:
0. Get the necessary system software/packages installed on your system, see 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 1. If you don't have a jdk6 installed, download and install a JDK 6 from
http://java.sun.com/javase/downloads/index.jsp http://java.sun.com/javase/downloads/index.jsp

38
README-builds.html
View file

@ -126,38 +126,15 @@
<a href="http://openjdk.java.net/guide/repositories.html#installConfig"> <a href="http://openjdk.java.net/guide/repositories.html#installConfig">
Developer Guide: Installing and Configuring Mercurial</a> Developer Guide: Installing and Configuring Mercurial</a>
section for more information. 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> <h3><a name="get_source">Getting the Source</a></h3>
<blockquote> <blockquote>
To get the entire set of OpenJDK Mercurial repositories 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> <blockquote>
<tt> <tt>
hg fclone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i> hg clone http://hg.openjdk.java.net/jdk8/jdk8 <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>
<br>cd <i>YourOpenJDK</i> <br>cd <i>YourOpenJDK</i>
<br>sh ./get_source.sh <br>sh ./get_source.sh
</tt> </tt>
@ -172,9 +149,6 @@
<br>sh ./make/scripts/hgforest.sh pull -u <br>sh ./make/scripts/hgforest.sh pull -u
</tt> </tt>
</blockquote> </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>
</blockquote> </blockquote>
@ -558,7 +532,7 @@
understood that this is not ideal for the open source community. understood that this is not ideal for the open source community.
It is possible this process could change in the future. It is possible this process could change in the future.
<br> <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 Complete OpenJDK Source Bundles</a> <u>will</u> contain the JAXP and
JAX-WS sources. JAX-WS sources.
</p> </p>
@ -578,7 +552,7 @@
</li> </li>
<li> <li>
The OpenJDK team copies this new bundle into shared 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. Older bundles are never deleted so we retain the history.
</li> </li>
<li> <li>
@ -1726,7 +1700,7 @@
The location of any source drop bundles The location of any source drop bundles
(see <a href="#drops">Managing the Source Drops</a>). (see <a href="#drops">Managing the Source Drops</a>).
The default will be The default will be
<tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk7-drops</tt>. <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk8-drops</tt>.
</dd> </dd>
<dt><a name="ALT_UNIXCCS_PATH"><tt>ALT_UNIXCCS_PATH</tt></a></dt> <dt><a name="ALT_UNIXCCS_PATH"><tt>ALT_UNIXCCS_PATH</tt></a></dt>
<dd> <dd>
@ -1931,7 +1905,7 @@
PATH, INCLUDE, LIB, LIBPATH, and WINDOWSSDKDIR PATH, INCLUDE, LIB, LIBPATH, and WINDOWSSDKDIR
variables set in your shell environment. variables set in your shell environment.
These bat files are not easy to use from a 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 vsvars.sh that can help, it should only be done once in a shell
that will be doing the build, e.g.<br> that will be doing the build, e.g.<br>
<tt>sh ./make/scripts/vsvars.sh -v10 > settings<br> <tt>sh ./make/scripts/vsvars.sh -v10 > settings<br>

1
hotspot/.hgtags
View file

@ -174,3 +174,4 @@ d283b82966712b353fa307845a1316da42a355f4 hs21-b10
9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12 9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13 c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143 c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01