1.1 --- a/README-builds.html Fri Aug 16 16:22:23 2013 -0700
1.2 +++ b/README-builds.html Thu Sep 05 10:58:25 2013 -0700
1.3 @@ -154,7 +154,7 @@
1.4 </code>
1.5 </blockquote>
1.6 Once you have all the repositories, keep in mind that each
1.7 - repository is it's own independent repository.
1.8 + repository is its own independent repository.
1.9 You can also re-run <code>./get_source.sh</code> anytime to
1.10 pull over all the latest changesets in all the repositories.
1.11 This set of nested repositories has been given the term
1.12 @@ -241,6 +241,14 @@
1.13 source code for the OpenJDK Corba functionality
1.14 </td>
1.15 </tr>
1.16 + <tr>
1.17 + <td>
1.18 + nashorn
1.19 + </td>
1.20 + <td>
1.21 + source code for the OpenJDK JavaScript implementation
1.22 + </td>
1.23 + </tr>
1.24 </tbody>
1.25 </table>
1.26 </blockquote>
1.27 @@ -386,7 +394,7 @@
1.28 <code>--with-boot-jdk</code>.
1.29 </li>
1.30 <li>
1.31 - Insure that GNU make, the Bootstrap JDK,
1.32 + Ensure that GNU make, the Bootstrap JDK,
1.33 and the compilers are all
1.34 in your PATH environment variable
1.35 </li>
1.36 @@ -1202,19 +1210,18 @@
1.37 <blockquote>
1.38
1.39 <p>
1.40 - <b>Q:</b> The <code>configure</code> file looks horrible!
1.41 + <b>Q:</b> The <code>generated-configure.sh</code> file looks horrible!
1.42 How are you going to edit it?
1.43 <br>
1.44 - <b>A:</b> The <code>configure</code> file is generated (think
1.45 + <b>A:</b> The <code>generated-configure.sh</code> file is generated (think
1.46 "compiled") by the autoconf tools. The source code is
1.47 - in <code>configure.ac</code> various .m4 files in common/autoconf,
1.48 - which are
1.49 - much more readable.
1.50 + in <code>configure.ac</code> and various .m4 files in common/autoconf,
1.51 + which are much more readable.
1.52 </p>
1.53
1.54 <p>
1.55 <b>Q:</b>
1.56 - Why is the <code>configure</code> file checked in,
1.57 + Why is the <code>generated-configure.sh</code> file checked in,
1.58 if it is generated?
1.59 <br>
1.60 <b>A:</b>
1.61 @@ -1229,13 +1236,29 @@
1.62 <p>
1.63 <b>Q:</b>
1.64 Do you require a specific version of autoconf for regenerating
1.65 - <code>configure</code>?
1.66 + <code>generated-configure.sh</code>?
1.67 <br>
1.68 <b>A:</b>
1.69 - Currently, no, but this will likely be the case when things have
1.70 - settled down a bit more. (The reason for this is to avoid
1.71 - large spurious changes in <code>configure</code>
1.72 - in commits that made small changes to <code>configure.ac</code>).
1.73 + Yes, version 2.69 is required and should be easy
1.74 + enough to aquire on all supported operating
1.75 + systems. The reason for this is to avoid
1.76 + large spurious changes in <code>generated-configure.sh</code>.
1.77 + </p>
1.78 +
1.79 + <p>
1.80 + <b>Q:</b>
1.81 + How do you regenerate <code>generated-configure.sh</code>
1.82 + after making changes to the input files?
1.83 + <br>
1.84 + <b>A:</b>
1.85 + Regnerating <code>generated-configure.sh</code>
1.86 + should always be done using the
1.87 + script <code>common/autoconf/autogen.sh</code> to
1.88 + ensure that the correct files get updated. This
1.89 + script should also be run after mercurial tries to
1.90 + merge <code>generated-configure.sh</code> as a
1.91 + merge of the generated file is not guaranteed to
1.92 + be correct.
1.93 </p>
1.94
1.95 <p>
1.96 @@ -1307,9 +1330,9 @@
1.97 you will need to modify the makefiles. But for normal file
1.98 additions or removals, no changes are needed. There are certan
1.99 exceptions for some native libraries where the source files are spread
1.100 - over many directories which also contain courses for other
1.101 + over many directories which also contain sources for other
1.102 libraries. In these cases it was simply easier to create include lists
1.103 - rather thane excludes.
1.104 + rather than excludes.
1.105 </p>
1.106
1.107 <p>
1.108 @@ -1327,14 +1350,14 @@
1.109 <p>
1.110 <b>Q:</b>
1.111 <code>configure</code> provides OpenJDK-specific features such as
1.112 - <code>--enable-jigsaw</code> or <code>--with-builddeps-server</code>
1.113 - that are not described in this document. What about those?
1.114 + <code>--with-builddeps-server</code> that are not
1.115 + described in this document. What about those?
1.116 <br>
1.117 <b>A:</b>
1.118 Try them out if you like! But be aware that most of these are
1.119 experimental features.
1.120 Many of them don't do anything at all at the moment; the option
1.121 - is just a placeholder. Other depends on
1.122 + is just a placeholder. Others depend on
1.123 pieces of code or infrastructure that is currently
1.124 not ready for prime time.
1.125 </p>
1.126 @@ -1386,24 +1409,6 @@
1.127 </p>
1.128
1.129 <p>
1.130 - <b>Q:</b> What is @GenerateNativeHeaders?
1.131 - <br>
1.132 - <b>A:</b>
1.133 - To speed up compilation, we added a flag to javac which makes it
1.134 - do the job of javah as well, as a by-product; that is, generating
1.135 - native .h header files. These files are only generated
1.136 - if a class contains native methods. However, sometimes
1.137 - a class contains no native method,
1.138 - but still contains constants that native code needs to use.
1.139 - The new GenerateNativeHeaders annotation tells javac to
1.140 - force generation of a
1.141 - header file in these cases. (We don't want to generate
1.142 - native headers for all classes that contains constants
1.143 - but no native methods, since
1.144 - that would slow down the compilation process needlessly.)
1.145 - </p>
1.146 -
1.147 - <p>
1.148 <b>Q:</b>
1.149 Is anything able to use the results of the new build's default make target?
1.150 <br>
1.151 @@ -1429,10 +1434,9 @@
1.152 What should I do?
1.153 <br>
1.154 <b>A:</b>
1.155 - It might very well be that we have missed to add support for
1.156 + It might very well be that we have neglected to add support for
1.157 an option that was actually used from outside the build system.
1.158 - Email us and we will
1.159 - add support for it!
1.160 + Email us and we will add support for it!
1.161 </p>
1.162
1.163 </blockquote>
