Merge
authormfang
Mon, 29 Aug 2011 17:09:35 -0700
changeset 10295 0a12b75617ed
parent 10294 8fcdae2a7ec7 (current diff)
parent 10291 cf1fcdf438a0 (diff)
child 10296 11c81bbc7690
Merge
--- a/.hgtags	Wed Aug 17 14:18:26 2011 -0700
+++ b/.hgtags	Mon Aug 29 17:09:35 2011 -0700
@@ -122,3 +122,4 @@
 8294c99e685a1f6d1d37c45cd97854cf74be771e jdk7-b145
 dca1e8a87e8f756f95b99bac8fe795750d42e1b0 jdk7-b146
 a2a589fc29543ed32919c78a1810ad93a6fcf5bc jdk7-b147
+de9223c94f9c710b3eebb599cd3586f36c8b94a9 jdk8-b01
--- a/.hgtags-top-repo	Wed Aug 17 14:18:26 2011 -0700
+++ b/.hgtags-top-repo	Mon Aug 29 17:09:35 2011 -0700
@@ -122,3 +122,4 @@
 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
--- a/README	Wed Aug 17 14:18:26 2011 -0700
+++ b/README	Mon Aug 29 17:09:35 2011 -0700
@@ -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	Wed Aug 17 14:18:26 2011 -0700
+++ b/README-builds.html	Mon Aug 29 17:09:35 2011 -0700
@@ -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/corba/.hgtags	Wed Aug 17 14:18:26 2011 -0700
+++ b/corba/.hgtags	Mon Aug 29 17:09:35 2011 -0700
@@ -122,3 +122,4 @@
 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+949fb60ca830364571e7c4c9964e6b351ca929ec jdk8-b01
--- a/hotspot/.hgtags	Wed Aug 17 14:18:26 2011 -0700
+++ b/hotspot/.hgtags	Mon Aug 29 17:09:35 2011 -0700
@@ -174,3 +174,4 @@
 9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
 c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
 c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
+0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
--- a/jaxp/.hgtags	Wed Aug 17 14:18:26 2011 -0700
+++ b/jaxp/.hgtags	Mon Aug 29 17:09:35 2011 -0700
@@ -122,3 +122,4 @@
 10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145
 bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+4f0fcb812767594fe9de509f946b56942db5a2f0 jdk8-b01
--- a/jaxws/.hgtags	Wed Aug 17 14:18:26 2011 -0700
+++ b/jaxws/.hgtags	Mon Aug 29 17:09:35 2011 -0700
@@ -122,3 +122,4 @@
 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145
 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
+64df57a1edeca74388bd62f0a87d056db981fbdf jdk8-b01
--- a/jdk/.hgtags	Wed Aug 17 14:18:26 2011 -0700
+++ b/jdk/.hgtags	Mon Aug 29 17:09:35 2011 -0700
@@ -122,3 +122,5 @@
 1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145
 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
 f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
+2cdbbc4a63592be7f1556fffe37b1253a77bd481 jdk8-b01
+13e70aa1398eb959c54bc68b783ca0eef1286ad2 jdk8-b02
--- a/langtools/.hgtags	Wed Aug 17 14:18:26 2011 -0700
+++ b/langtools/.hgtags	Mon Aug 29 17:09:35 2011 -0700
@@ -122,3 +122,4 @@
 c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145
 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
+e9f118c2bd3c4690d8d2e6b108b5bad7e226634c jdk8-b01