Merge

Fri, 18 Sep 2009 09:39:45 -0700

author
xdono
date
Fri, 18 Sep 2009 09:39:45 -0700
changeset 130
76f6380ac0b4
parent 129
931f7f7501da
parent 127
4c4fe09fb670
child 131
d70b157f6407

Merge

     1.1 --- a/.hgtags	Thu Sep 17 13:17:57 2009 -0700
     1.2 +++ b/.hgtags	Fri Sep 18 09:39:45 2009 -0700
     1.3 @@ -46,3 +46,4 @@
     1.4  82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
     1.5  175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
     1.6  4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
     1.7 +0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
     2.1 --- a/README-builds.html	Thu Sep 17 13:17:57 2009 -0700
     2.2 +++ b/README-builds.html	Fri Sep 18 09:39:45 2009 -0700
     2.3 @@ -68,7 +68,6 @@
     2.4                              </li>
     2.5                              <li><a href="#zip">Zip and Unzip</a> </li>
     2.6                              <li><a href="#freetype">FreeType2 Fonts</a> </li>
     2.7 -                            <li><a href="#jibx">JIBX Libraries</a> </li>
     2.8                              <li>Linux and Solaris:
     2.9                                  <ul>
    2.10                                      <li><a href="#cups">CUPS Include files</a> </li>
    2.11 @@ -597,11 +596,6 @@
    2.12                      package</a>.
    2.13                  </li>
    2.14                  <li>
    2.15 -                    Install the
    2.16 -                    <a href="#jibx">JIBX Libraries</a>, set
    2.17 -                    <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
    2.18 -                </li>
    2.19 -                <li>
    2.20                      Install
    2.21                      <a href="#ant">Ant</a>, 
    2.22                      make sure it is in your PATH.
    2.23 @@ -670,11 +664,6 @@
    2.24                      Install the <a href="#xrender">XRender Include files</a>.
    2.25                  </li>
    2.26                  <li>
    2.27 -                    Install the
    2.28 -                    <a href="#jibx">JIBX Libraries</a>, set
    2.29 -                    <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
    2.30 -                </li>
    2.31 -                <li>
    2.32                      Install
    2.33                      <a href="#ant">Ant</a>, 
    2.34                      make sure it is in your PATH.
    2.35 @@ -770,11 +759,6 @@
    2.36                      <a href="#dxsdk">Microsoft DirectX SDK</a>.
    2.37                  </li>
    2.38                  <li>
    2.39 -                    Install the
    2.40 -                    <a href="#jibx">JIBX Libraries</a>, set
    2.41 -                    <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
    2.42 -                </li>
    2.43 -                <li>
    2.44                      Install
    2.45                      <a href="#ant">Ant</a>, 
    2.46                      make sure it is in your PATH and set
    2.47 @@ -903,27 +887,6 @@
    2.48                  fine for most JDK developers.
    2.49              </blockquote>
    2.50              <!-- ------------------------------------------------------ -->
    2.51 -            <h4><a name="jibx">JIBX</a></h4>
    2.52 -            <blockquote>
    2.53 -                JIBX libraries version 1.1.5 is required for building the OpenJDK.
    2.54 -                Namely, the following JAR files from the JIBX distribution package
    2.55 -                are required:
    2.56 -                <ul>
    2.57 -                    <li>bcel.jar
    2.58 -                    <li>jibx-bind.jar
    2.59 -                    <li>jibx-run.jar
    2.60 -                    <li>xpp3.jar
    2.61 -                </ul>
    2.62 -                <p>
    2.63 -                You can download the package from the
    2.64 -                <a href="http://jibx.sourceforge.net" target="_blank">JIBX site</a>.
    2.65 -                <p>
    2.66 -                You will need to set the
    2.67 -                <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>
    2.68 -                environment variable to refer to place where the JAR files,
    2.69 -                above, are located.
    2.70 -            </blockquote>
    2.71 -            <!-- ------------------------------------------------------ -->
    2.72              <h4><a name="compilers">Compilers</a></h4>
    2.73              <blockquote>
    2.74                  <strong><a name="gcc">Linux gcc/binutils</a></strong>
    2.75 @@ -1496,12 +1459,6 @@
    2.76                      The default will refer to 
    2.77                      <tt>jdk/src/share/lib/security/cacerts</tt>.
    2.78                  </dd>
    2.79 -                <dt><tt><a name="ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt></dt>
    2.80 -                <dd>
    2.81 -                    The location of the <a href="#jibx">JIBX libraries</a> file.
    2.82 -                    The default value is
    2.83 -                    <tt>$(ALT_SLASH_JAVA)/devtools/share/jibx/lib</tt>.
    2.84 -                </dd>
    2.85                  <dt><a name="ALT_CUPS_HEADERS_PATH"><tt>ALT_CUPS_HEADERS_PATH</tt></a> </dt>
    2.86                  <dd>
    2.87                      The location of the CUPS header files.

mercurial