# HG changeset patch # User lana # Date 1301633372 25200 # Node ID 1527f425ee221ad4ef570ecd2ac85260ad625cc1 # Parent 970c0898ded21001f7ad9066a6d18412f69f677d# Parent 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f Merge diff -r 970c0898ded2 -r 1527f425ee22 .hgtags --- a/.hgtags Tue Mar 22 11:07:40 2011 -0700 +++ b/.hgtags Thu Mar 31 21:49:32 2011 -0700 @@ -109,3 +109,5 @@ 0f62a65fb666b337caa585015ab6ea2e60e709ca jdk7-b132 c6f380693342feadccc5fe2c5adf500e861361aa jdk7-b133 ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 +783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 +2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 diff -r 970c0898ded2 -r 1527f425ee22 README --- a/README Tue Mar 22 11:07:40 2011 -0700 +++ b/README Thu Mar 31 21:49:32 2011 -0700 @@ -29,13 +29,14 @@ Set the environment variable ALT_BOOTDIR to the location of JDK 6. 2. Check the sanity of doing a build with your current system: - gnumake sanity + make sanity See README-builds.html if you run into problems. 3. Do a complete build of the OpenJDK: - gnumake all + make all The resulting JDK image should be found in build/*/j2sdk-image -where gnumake is GNU make 3.81 or newer, /usr/bin/make on Linux and -/usr/sfw/bin/gmake or /opt/sfw/bin/gmake on Solaris. +where make is GNU make 3.81 or newer, /usr/bin/make on Linux usually +is 3.81 or newer. +Complete details are available in README-builds.html. diff -r 970c0898ded2 -r 1527f425ee22 README-builds.html --- a/README-builds.html Tue Mar 22 11:07:40 2011 -0700 +++ b/README-builds.html Thu Mar 31 21:49:32 2011 -0700 @@ -54,7 +54,11 @@
  • OpenSolaris
  • -
  • Source Directory Structure
  • +
  • Source Directory Structure + +
  • Build Information