r7052 - in trunk/BOOK: . general/prog introduction/welcome

dj at linuxfromscratch.org dj at linuxfromscratch.org
Sun Aug 12 17:14:28 PDT 2007


Author: dj
Date: 2007-08-12 18:14:28 -0600 (Sun, 12 Aug 2007)
New Revision: 7052

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/jdk.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/introduction/welcome/credits.xml
Log:
Updated to JDK-6 Update 2

Modified: trunk/BOOK/general/prog/jdk.xml
===================================================================
--- trunk/BOOK/general/prog/jdk.xml	2007-08-12 21:23:16 UTC (rev 7051)
+++ trunk/BOOK/general/prog/jdk.xml	2007-08-13 00:14:28 UTC (rev 7052)
@@ -4,31 +4,31 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY jdk-download-binary       "http://java.sun.com/javase/downloads/index_jdk5.jsp">
-  <!ENTITY jdk-bin-md5sum            "14ba8eccfd97f6bd23d8dc32b38b1121">
-  <!ENTITY jdk-bin-size              "49 MB">
-  <!ENTITY jdk-bin-buildsize         "150 MB">
+  <!ENTITY jdk-download-binary       "http://java.sun.com/javase/downloads/index.jsp">
+  <!ENTITY jdk-bin-md5sum            "6a488cb0a161a1c3a541a66e3b076f8e">
+  <!ENTITY jdk-bin-size              "57 MB">
+  <!ENTITY jdk-bin-buildsize         "178 MB">
 
-  <!ENTITY jdk-download-source-jrl   "http://www.java.net/download/tiger/tiger_u11/jdk-1_5_0_11-fcs-src-b03-jrl-15_dec_2006.jar">
-  <!ENTITY jdk-download-source-jiul  "http://www.java.net/download/tiger/tiger_u11/jdk-1_5_0_11-fcs-src-b03-jiul-15_dec_2006.jar">
-  <!ENTITY jdk-download-source-bin   "http://www.java.net/download/tiger/tiger_u11/jdk-1_5_0_11-fcs-bin-b03-jrl-15_dec_2006.jar">
-  <!ENTITY jdk-download-source-moz   "http://www.java.net/download/tiger/tiger_u11/jdk-1_5_0_11-mozilla_headers-b03-unix-15_dec_2006.jar">
+  <!ENTITY jdk-download-source-jrl "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-src-b05-jrl-22_jun_2007.jar">
+  <!ENTITY jdk-download-source-bin "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-bin-b05-jrl-22_jun_2007.jar">
+  <!ENTITY jdk-download-source-moz "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-mozilla_headers-b05-unix-14_jun_2007.jar">
 
-  <!ENTITY jdk-source-jrl-md5sum     "e6661cce9c94009e2fa909a151c0160c">
-  <!ENTITY jdk-source-jiul-md5sum    "be3653bc93d9efe715cb7a64c513eeef">
-  <!ENTITY jdk-source-bin-md5sum     "7c952fba37101c154f1636dc401aa093">
-  <!ENTITY jdk-source-moz-md5sum     "16ed66d11701496e3b4e10a24edd3f1b">
 
-  <!ENTITY jdk-source-jrl-size       "57 MB">
-  <!ENTITY jdk-source-jiul-size      "57 MB">
-  <!ENTITY jdk-source-bin-size       "2.2 MB">
-  <!ENTITY jdk-source-moz-size       "7.4 MB">
+  <!ENTITY jdk-source-jrl-md5sum     "7adaf7e9b4504d1d2d822676eb69796d">
+  <!ENTITY jdk-source-bin-md5sum     "063a3bf1e4a5c16507e87707673e53c0">
+  <!ENTITY jdk-source-moz-md5sum     "2bd979b1ef2d07d5b0a34a7e0e304217">
 
-  <!ENTITY jdk-src-buildsize         "1.9 GB">
-  <!ENTITY jdk-time                  "30 SBU">
+  <!ENTITY jdk-source-jrl-size       "102 MB">
+  <!ENTITY jdk-source-bin-size       "2 MB">
+  <!ENTITY jdk-source-moz-size       "8.2 MB">
+
+  <!ENTITY jdk-src-buildsize         "1.3 GB">
+  <!ENTITY jdk-time                  "12.4 SBU (for both installations)">
+  <!ENTITY jdk-version-string        "6u2">
+  <!ENTITY jdk-bin-version-string    "1.6.0_02">
 ]>
 
-<sect1 id="jdk" xreflabel="JDK-&jdk-src-version;">
+<sect1 id="jdk" xreflabel="JDK &jdk-version;">
   <?dbhtml filename="jdk.html" ?>
 
   <sect1info>
@@ -36,7 +36,7 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>JDK-&jdk-src-version;</title>
+  <title>JDK-&jdk-version;</title>
 
   <indexterm zone="jdk">
     <primary sortas="a-JDK">JDK</primary>
@@ -74,10 +74,10 @@
     source build as detailed below. Note that in some countries you cannot
     download the source code.</para>
 
-    <bridgehead renderas="sect3">Precompiled Package Information</bridgehead>
+    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Binary download (jdk-&jdk-bin-string;-linux-i586.bin):
+        <para>Binary download (jdk-&jdk-version-string;-linux-i586.bin):
         <ulink url="&jdk-download-binary;"/></para>
       </listitem>
       <listitem>
@@ -92,9 +92,6 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">Source Package Information</bridgehead>
-    <para>The source code is distributed under two licenses and most will need
-    the JRL version. The JIUL version is listed as well, but you only need to
-    download one or the other.</para>
 
     <itemizedlist spacing="compact">
       <listitem>
@@ -107,15 +104,6 @@
         </para>
       </listitem>
       <listitem>
-        <para>JIUL Source
-          <simplelist>
-            <member><ulink url="&jdk-download-source-jiul;"/></member>
-            <member>&jdk-source-jiul-md5sum;</member>
-            <member>&jdk-source-jiul-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
         <para>Source Binaries
           <simplelist>
             <member><ulink url="&jdk-download-source-bin;"/></member>
@@ -147,47 +135,30 @@
     <itemizedlist spacing='compact'>
       <listitem>
         <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-gcc4-1.patch"/></para>
+        url="&patch-root;/jdk-&jdk-version-string;-gcc4-2.patch"/></para>
       </listitem>
       <listitem>
         <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-motif_fixes-1.patch"/></para>
+        url="&patch-root;/jdk-&jdk-version-string;-motif_fixes-1.patch"/></para>
       </listitem>
       <listitem>
         <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-nptl-1.patch"/></para></listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-remove_broken_demo-1.patch"/></para>
+        url="&patch-root;/jdk-&jdk-version-string;-remove_fixed_paths-1.patch"/></para>
       </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-remove_fixed_paths-1.patch"/></para>
-      </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect4">Recommended Patches</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-remove_debug_image-1.patch"/>
-        (skips compiling of the <application>JDK</application> debug image)</para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-static_cxx-1.patch"/>
-        (forces dynamic linking to <application>GCC</application> libs)</para></listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required (to Build JDK from Source)</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/>,
-    <xref linkend="zip"/>,
+    <para role="required">
+    <xref linkend="alsa-lib"/>,
+    <xref linkend="cpio"/>,
+    <xref linkend="cups"/>,
+    <xref linkend="ksh"/>,
     <xref linkend="unzip"/>,
-    <xref linkend="cpio"/>,
-    <xref linkend="alsa-lib"/>, and
-    <xref linkend="tcsh"/></para>
+    <xref linkend="which"/>,
+    <xref linkend="x-window-system"/>, and
+    <xref linkend="zip"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/jdk"/></para>
@@ -202,10 +173,10 @@
     the source version. You can choose to keep either or both.</para>
 
     <tip>
-      <para>The <command>./jdk-mod.bin</command>
+      <para>The <command>./jdk-&jdk-version-string;-linux-i586.bin</command>
       command below unpacks the distribution into a
-      <filename class='directory'>jdk&jdk-bin-version;</filename> directory.
-      You will be required to view, and then accept (by entering a
+      <filename class='directory'>jdk&jdk-bin-version-string;</filename>
+      directory.  You will be required to view, and then accept (by entering a
       <keycap>y</keycap> keypress), a license agreement before any files are
       unpacked. If you are scripting (automating) the build, you'll need to
       account for this. There is information about automating build commands
@@ -219,24 +190,31 @@
     location.  For this application only, start in the directory where all
     the downloaded files are located.</para>
 
-    <para>Install the precompiled <application>JDK</application> with the
+    <para>Install the binary <application>JDK</application> with the
     following commands:</para>
 
-<screen><userinput>install -m755 jdk-&jdk-bin-string;-linux-i?86.bin jdk-mod.bin &&
-sed -i "s:^PATH=.*::" jdk-mod.bin &&
-./jdk-mod.bin &&
-rm jdk-mod.bin</userinput></screen>
+<screen><userinput>chmod 755 jdk-&jdk-version-string;-linux-i586.bin &&
+./jdk-&jdk-version-string;-linux-i586.bin</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>cd jdk&jdk-bin-version; &&
-install -v -m755 -d /opt/jdk/jdk-precompiled-&jdk-bin-version; &&
-mv -v * /opt/jdk/jdk-precompiled-&jdk-bin-version; &&
-chown -v -R root:root /opt/jdk/jdk-precompiled-&jdk-bin-version; &&
-ln -v -sf motif21/libmawt.so \
-    /opt/jdk/jdk-precompiled-&jdk-bin-version;/jre/lib/i386/ &&
+<screen role="root"><userinput>cd jdk&jdk-bin-version-string; &&
+install -v -m755 -d /opt/jdk-bin-&jdk-version-string; &&
+mv -v * /opt/jdk-bin-&jdk-version-string; &&
+chown -v -R root:root /opt/jdk-bin-&jdk-version-string; &&
+ln -v -sf xawt/libmawt.so \
+    /opt/jdk-bin-&jdk-version-string;/jre/lib/i386/ &&
 cd ..</userinput></screen>
 
+    <para>Recent versions of libX11 break the statically linked libmawt
+    when used with the Xinerama extension.  While still the
+    <systemitem class="username">root</systemitem> user, apply the
+    folowing sed to the installed binary to work around this
+    problem:</para>
+
+<screen role="root"><userinput>sed -i 's at XINERAMA@FAKEEXTN at g' \
+    /opt/jdk-bin-&jdk-version-string;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
+
     <para>The binary version is now installed.</para>
 
     <para>If you don't want to compile the source or are not in a position to
@@ -246,7 +224,7 @@
     <para>Save the existing path, and append the recently installed
     <application>JDK</application>.</para>
 
-<screen><userinput>export JAVA_HOME=/opt/jdk/jdk-precompiled-&jdk-bin-version; &&
+<screen><userinput>export JAVA_HOME=/opt/jdk-bin-&jdk-version-string; &&
 export PATH_HOLD=${PATH} &&
 export PATH=${PATH}:${JAVA_HOME}/bin</userinput></screen>
 
@@ -259,46 +237,64 @@
 
 <screen><userinput>mkdir jdk-build &&
 cd jdk-build &&
-for JAR in ../jdk-&jdk-src-string;*.jar
+for JAR in ../jdk-&jdk-version-string;*.jar
     do java -jar ${JAR}
 done</userinput></screen>
 
     <para>Apply all the patches downloaded above:</para>
 
-<screen><userinput>for PATCH in ../jdk-&jdk-src-version;*.patch
+<screen><userinput>for PATCH in ../jdk-&jdk-version-string;*.patch
     do patch -Np1 -i ${PATCH}
 done</userinput></screen>
 
+    <para>Use the following commands to apply some minor changes that
+    are a little more specific to BLFS, such as lack of a gcc-2.9 
+    compiler, removing a broken demo, and forcing to link to shared
+    libraries.  See the 'Command Explanations' section for more detail:</para>
+
+<screen><userinput>sed -i '/^.*linux)/ { N; /.*/ { N; /.*/d }}' \
+    deploy/make/plugin/{adapter,nscore}/Makefile &&
+sed -i '/.*mtrace.*/ { N; /.*/ s/.*mtrace.*\n.*/\t  mtrace/ }' \
+    j2se/make/mkdemo/jvmti/Makefile &&
+sed -i 's/= true/= false/' \
+    j2se/make/common/shared/Compiler-gcc.gmk</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../xincludes/X11R6_symlink.xml"/>
 
     <!-- <para>If your <application>X Window System</application> is installed into
     any prefix other than <filename class="directory">/usr/X11R6</filename>,
-    execute the following command, replacing
+    execute the following commands, replacing
     <replaceable><PREFIX></replaceable> with the installation prefix of
     the <application>X Window System</application>:</para>
 
-<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' {} \;</userinput></screen> -->
+<screen><userinput>for file in `find . -name Makefile \
+    -or -name Imakefile -or -name *.gmk`
+do sed -i 's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' $file
+done &&
+sed -i 's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' \
+    j2se/src/solaris/native/sun/awt/fontpath.c \
+    j2se/src/solaris/classes/sun/awt/motif/linux.fontconfig.Sun.properties \
+    j2se/src/solaris/classes/sun/awt/motif/linux.fontconfig.RedHat.3.properties</userinput></screen> -->
 
     <para>Set/unset some variables which affect the build:</para>
 
 <screen><userinput>export ALT_BOOTDIR=${JAVA_HOME} &&
 export CLASSPATH_HOLD=${CLASSPATH} &&
-unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS &&
-export ALT_DEVTOOLS_PATH="/usr/bin" &&
-export BUILD_NUMBER="update-10" &&
+export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts &&
+export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin &&
+export MILESTONE="02-BLFS" &&
+export BUILD_NUMBER="b05" &&
+export INSANE=true &&
 export DEV_ONLY=true &&
-export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin/ &&
-export INSANE=true &&
-export MAKE_VERBOSE=true &&
-export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts</userinput></screen>
+export SKIP_FASTDEBUG_BUILD=true &&
+unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</userinput></screen>
 
-    <warning>
-      <para>Setting CFLAGS/CXXFLAGS/LDFLAGS is guaranteed to make the build
-      fail. If you are interested in optimizing the build, set
+      <warning><para>Setting CFLAGS/CXXFLAGS/LDFLAGS is guaranteed to make 
+      the build fail. If you are interested in optimizing the build, set
       OTHER_CFLAGS/OTHER_CXXFLAGS/OTHER_LDFLAGS instead.  -O3, even in
-      OTHER_C{,XX}FLAGS, is known to cause a build failure.</para>
-    </warning>
+      OTHER_C{,XX}FLAGS, is known to cause a build failure.</para></warning>
+ 
 
     <para>Additionally, if you would like to <command>make</command> in
     parallel, add the following:</para>
@@ -319,22 +315,17 @@
     using the newly created <command>java</command> binary. Issue the
     following commands:</para>
 
-<screen><userinput>pushd control/build/linux-i?86/j2sdk-image/demo/jfc/Java2D &&
+<screen><userinput>pushd control/build/linux-i586/j2sdk-image/demo/jfc/Java2D &&
 ../../../bin/java -jar Java2Demo.jar &&
 popd</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user,
     install the <application>JDK</application>:</para>
 
-<screen role="root"><userinput>pushd control/build/linux-i?86 &&
-cp -v -a j2sdk-image /opt/jdk/jdk-&jdk-src-version; &&
-chown -v -R root:root /opt/jdk/jdk-&jdk-src-version; &&
-ln -v -sf motif21/libmawt.so  /opt/jdk/jdk-&jdk-src-version;/jre/lib/i386/ &&
-find /opt/jdk/jdk-&jdk-src-version; \
-     -type f -perm 600 -exec chmod -v 644 {} \; &&
-find /opt/jdk/jdk-&jdk-src-version; \
-     -name "*.so" -exec chmod -v 755 {} \; &&
-chmod -v 755 /opt/jdk/jdk-&jdk-src-version;/jre/bin/* &&
+<screen role="root"><userinput>pushd control/build/linux-i586 &&
+cp -v -a j2sdk-image /opt/jdk-&jdk-version-string; &&
+chown -v -R root:root /opt/jdk-&jdk-version-string; &&
+ln -v -sf xawt/libmawt.so  /opt/jdk-&jdk-version-string;/jre/lib/i386/ &&
 popd</userinput></screen>
 
     <para>Restore the unprivileged user's environment using the following
@@ -343,53 +334,68 @@
 <screen><userinput>export JAVA_HOME=${ALT_BOOTDIR} &&
 export CLASSPATH=${CLASSPATH_HOLD} &&
 export PATH=${PATH_HOLD} &&
-unset ALT_BOOTDIR CLASSPATH_HOLD ALT_DEVTOOLS_PATH BUILD_NUMBER &&
-unset DEV_ONLY ALT_MOZILLA_HEADERS_PATH INSANE MAKE_VERBOSE &&
-unset ALT_CACERTS_FILE PATH_HOLD</userinput></screen>
+unset PATH_HOLD ALT_BOOTDIR CLASSPATH_HOLD \
+    ALT_CACERTS_FILE ALT_MOZILLA_HEADERS_PATH \
+    BUILD_NUMBER MILESTONE INSANE DEV_ONLY \
+    SKIP_FASTDEBUG_BUILD</userinput></screen>
 
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -i '/^.*linux)/...</command>: This command disables
+    the build of a gcc-2.9 compatible browser plugin.  LFS does not contain
+    gcc-2.9, and hasn't in quite a few years.</para>
+
+    <para><command>sed -i '/.*mtrace.*/...</command>: This command disables
+    building of the broken 'waiters' demo.</para>
+
+    <para><command>sed -i 's/= true/= false/'...</command>: This command
+    forces the compiler to link against the standard C libraries
+    dynamically.</para>
+
     <para><command>export ALT_BOOTDIR=${JAVA_HOME}</command>: This variable sets
     the location of the bootstrap <application>JDK</application>.</para>
 
+    <para><command>export ALT_CACERTS_FILE...</command>: Specifies the
+    certificate file to use (from the installed binary
+    <application>JDK</application>).</para>
+
     <para><command>export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin/</command>:
     This tells the build exactly where to find the
     <application>Mozilla</application> headers.  This has changed since the
     previous version and is not mentioned in the installation documentation
     included with the package source.</para>
 
-    <para><command>export ALT_DEVTOOLS_PATH="/usr/bin"</command>: This
-    changes the location where the build finds the needed executables.</para>
+    <para><command>export MILESTONE="02-BLFS"</command>: This appends
+    the string '02-BLFS' to the buld number.  'internal' is
+    unconditionally added if MILESTONE is unset.  This is similar
+    to the format used by Sun for the official release.</para>
 
-    <para><command>export BUILD_NUMBER="update-10"</command>:
-    This will help you identify the compiled version of the runtime environment
-    and virtual machine by appending this information to the version
-    string.</para>
+    <para><command>export BUILD_NUMBER="b05"</command>:
+    This will help you identify the compiled version of the runtime 
+    environment and virtual machine by appending this information to
+    the version string. This is the same build number used by Sun to
+    identify the official release.</para>
 
-    <para><command>export DEV_ONLY=true</command>: This command
-    skips compiling the documentation and eliminates a dependency on
-    <application>rpm</application>.</para>
-
-    <para><command>unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</command>:
-    These variables cause miscompilation of the build. Never set them.</para>
-
     <para><command>export INSANE=true</command>: The certified platform for the
     build is Redhat Enterprise Advanced Server 2.1. This variable ensures that
     all the errors related to compiling on a non-certified platform will be
     displayed as warnings instead of errors.</para>
 
-    <para><command>export MAKE_VERBOSE=true</command>: Allows the compiler
-    commands to be displayed on the console.</para>
+    <para><command>export DEV_ONLY=true</command>: This command
+    skips compiling the comparison build.</para>
 
-    <para><command>export ALT_CACERTS_FILE...</command>: Specifies the
-    certificate file to use (from the installed binary
-    <application>JDK</application>).</para>
+    <para><command>export SKIP_FASTDEBUG_BUILD=true</command>: This command
+    skips building of the debug version.  Omit this command if you need
+    to build the fastdebug target.</para>
 
-    <para><command>ln -sf motif21/libmawt.so
-    /opt/jdk/jdk-&jdk-src-version;/jre/lib/i386/</command>: This fixes
+    <para><command>unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</command>:
+    These variables cause miscompilation of the build. Never set them.</para>
+
+    <para><command>ln -sf xawt/libmawt.so
+    /opt/jdk-&jdk-version-string;/jre/lib/i386/</command>: This fixes
     linking issues with other applications that expect to find the
     <application>motif</application> libraries with the other
     <application>JDK</application> libraries.</para>
@@ -403,12 +409,12 @@
       <title>Configuration Information</title>
 
       <para>There are now two Java 2 SDKs installed in
-      <filename>/opt/jdk</filename>. You should decide on which one you
+      <filename>/opt</filename>. You should decide on which one you
       would like to use as the default. For example if you decide to use the
       source compiled <application>JDK</application>, do the following as the
       <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>ln -v -nsf jdk-&jdk-src-version; /opt/jdk/jdk</userinput></screen>
+<screen role="root"><userinput>ln -v -nsf jdk-&jdk-version-string; /opt/jdk</userinput></screen>
 
     <para>The information below assumes your system is set up using the
     instructions found in
@@ -424,7 +430,7 @@
 <literal># Begin /etc/profile.d/jdk.sh
 
 # Set JAVA_HOME directory
-JAVA_HOME=/opt/jdk/jdk
+JAVA_HOME=/opt/jdk
 
 # Adjust PATH
 pathappend ${JAVA_HOME}/bin PATH
@@ -468,14 +474,17 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>appletviewer, extcheck, idlj, jar, jarsigner, java, javac,
-        javadoc,javah, javap, javaws, jdb, keytool, native2ascii, orbd,
-        policytool, rmic, rmid, rmiregistry, serialver, servertool, and
-        tnameserv</seg>
+        <seg>appletviewer, apt, extcheck, idlj, HtmlConverter, jar,
+        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
+        javaws, jconsole, jdb, jhat, jinfo, jmap, jps,
+        jrunscript, jsadebugd, jstack, jstat, jstatd, keytool,
+        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
+        schemagen, serialver, servertool, tnameserv, unpack200, 
+        wsgen, wsimport, and xjc</seg>
         <seg><envar>$JAVA_HOME</envar>/lib/*,
         <envar>$JAVA_HOME</envar>/jre/lib/*,
         and libjavaplugin_oji.so</seg>
-        <seg>/opt/jdk</seg>
+        <seg>/opt/jdk-&jdk-version-string;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -487,31 +496,49 @@
       <varlistentry id="appletviewer">
         <term><command>appletviewer</command></term>
         <listitem>
-          <para>runs <application>Java</application> applets outside of the
-          context of a browser.</para>
+          <para>runs Java applets outside of the context of a browser.</para>
           <indexterm zone="jdk appletviewer">
             <primary sortas="b-appletviewer">appletviewer</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="apt">
+        <term><command>apt</command></term>
+        <listitem>
+          <para>is an annotation processing tool.</para>
+          <indexterm zone="jdk apt">
+            <primary sortas="b-apt">apt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="extcheck">
         <term><command>extcheck</command></term>
         <listitem>
-          <para>checks a specified <filename>JAR</filename> file for title
-          and version conflicts with any extensions installed in the
-          <application>JDK</application> software.</para>
+          <para>checks a specified jar file for title and version conflicts
+          with any extensions installed in the <application>JDK</application>
+          software.</para>
           <indexterm zone="jdk extcheck">
             <primary sortas="b-extcheck">extcheck</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="HtmlConverter">
+        <term><command>HtmlConverter</command></term>
+        <listitem>
+          <para>adds Java auto download to html and asp pages. </para>
+          <indexterm zone="jdk HtmlConverter">
+            <primary sortas="b-HtmlConverter">HtmlConverter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="idlj">
         <term><command>idlj</command></term>
         <listitem>
-          <para>generates <application>Java</application> bindings from a
-          given IDL file.</para>
+          <para>generates Java bindings from a given IDL file.</para>
           <indexterm zone="jdk idlj">
             <primary sortas="b-idlj">idlj</primary>
           </indexterm>
@@ -521,8 +548,7 @@
       <varlistentry id="jar">
         <term><command>jar</command></term>
         <listitem>
-          <para>combines multiple files into a single <filename>JAR</filename>
-          archive file.</para>
+          <para>combines multiple files into a single jar archive.</para>
           <indexterm zone="jdk jar">
             <primary sortas="b-jar">jar</primary>
           </indexterm>
@@ -532,8 +558,8 @@
       <varlistentry id="jarsigner">
         <term><command>jarsigner</command></term>
         <listitem>
-          <para>signs <filename>JAR</filename> (Java ARchive) files and verifies the
-          signatures and integrity of a signed <filename>JAR</filename>.</para>
+          <para>signs jar files and verifies the signatures and integrity
+          of a signed jar file.</para>
           <indexterm zone="jdk jarsigner">
             <primary sortas="b-jarsigner">jarsigner</primary>
           </indexterm>
@@ -543,9 +569,9 @@
       <varlistentry id="java">
         <term><command>java</command></term>
         <listitem>
-          <para>launches a <application>Java</application> application by
-          starting a <application>Java</application> runtime environment, loading a
-          specified class and invoking its main method.</para>
+          <para>launches a Java application by starting a Java runtime
+          environment, loading a specified class and invoking its main
+          method.</para>
           <indexterm zone="jdk java">
             <primary sortas="b-java">java</primary>
           </indexterm>
@@ -556,8 +582,8 @@
         <term><command>javac</command></term>
         <listitem>
           <para>reads class and interface definitions, written in the
-          <application>Java</application> programming language, and compiles
-          them into bytecode class files.</para>
+          Java programming language, and compiles them into bytecode
+          class files.</para>
           <indexterm zone="jdk javac">
             <primary sortas="b-javac">javac</primary>
           </indexterm>
@@ -567,10 +593,10 @@
       <varlistentry id="javadoc">
         <term><command>javadoc</command></term>
         <listitem>
-          <para>parses the declarations and documentation comments in a set of
-          <application>Java</application> source files and produces a corresponding
-          set of HTML pages describing the classes, interfaces,
-          constructors, methods, and fields.</para>
+          <para>parses the declarations and documentation comments in a
+          set of Java source files and produces a corresponding set of
+          HTML pages describing the classes, interfaces,constructors,
+          methods, and fields.</para>
           <indexterm zone="jdk javadoc">
             <primary sortas="b-javadoc">javadoc</primary>
           </indexterm>
@@ -580,7 +606,7 @@
       <varlistentry id="javah">
         <term><command>javah</command></term>
         <listitem>
-          <para>generates <application>C</application> header and source files
+          <para>generates C header and source files
           that are needed to implement native methods.</para>
           <indexterm zone="jdk javah">
             <primary sortas="b-javah">javah</primary>
@@ -591,35 +617,150 @@
       <varlistentry id="javap">
         <term><command>javap</command></term>
         <listitem>
-          <para>disassembles a <application>Java</application> class file.</para>
+          <para>disassembles a Java class file.</para>
           <indexterm zone="jdk javap">
             <primary sortas="b-javap">javap</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="java-rmi.cgi">
+        <term><command>java-rmi.cgi</command></term>
+        <listitem>
+          <para>is the Java RMI client.</para>
+          <indexterm zone="jdk java-rmi.cgi">
+            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="javaws">
         <term><command>javaws</command></term>
         <listitem>
-          <para>launches <application>Java </application>application/applets
-          hosted on a network.</para>
+          <para>launches Java application/applets hosted on a network.</para>
           <indexterm zone="jdk javaws">
             <primary sortas="b-javaws">javaws</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="jconsole">
+        <term><command>jconsole</command></term>
+        <listitem>
+          <para>is a graphical console tool to monitor and manage both
+          local and remote Java applications and virtual machines.</para>
+          <indexterm zone="jdk jconsole">
+            <primary sortas="b-jconsole">jconsole</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="jdb">
         <term><command>jdb</command></term>
         <listitem>
-          <para>is a simple command-line debugger for
-          <application>Java</application> classes.</para>
+          <para>is a simple command-line debugger for Java classes.</para>
           <indexterm zone="jdk jdb">
             <primary sortas="b-jdb">jdb</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="jhat">
+        <term><command>jhat</command></term>
+        <listitem>
+          <para>parses a java heap dump file and allows viewing
+          in a webbrowser.</para>
+          <indexterm zone="jdk jhat">
+            <primary sortas="b-jhat">jhat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jinfo">
+        <term><command>jinfo</command></term>
+        <listitem>
+          <para>prints Java configuration information for a given Java
+          process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jinfo">
+            <primary sortas="b-jinfo">jinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jmap">
+        <term><command>jmap</command></term>
+        <listitem>
+          <para>prints shared object memory maps or heap memory details
+          of a given process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jmap">
+            <primary sortas="b-jmap">jmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jps">
+        <term><command>jps</command></term>
+        <listitem>
+          <para>lists the instrumented JVMs on the target system.</para>
+          <indexterm zone="jdk jps">
+            <primary sortas="b-jps">jps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jrunscript">
+        <term><command>jrunscript</command></term>
+        <listitem>
+          <para>is a command line script shell.</para>
+          <indexterm zone="jdk jrunscript">
+            <primary sortas="b-jrunscript">jrunscript</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jsadebugd">
+        <term><command>jsadebugd</command></term>
+        <listitem>
+          <para>attaches to a Java process or core file and acts as a
+          debug server.</para>
+          <indexterm zone="jdk jsadebugd">
+            <primary sortas="b-jsadebugd">jsadebugd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstack">
+        <term><command>jstack</command></term>
+        <listitem>
+          <para>prints Java stack traces of Java threads for a given
+          Java process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jstack">
+            <primary sortas="b-jstack">jstack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstat">
+        <term><command>jstat</command></term>
+        <listitem>
+          <para>displays performance statistics for an instrumented JVM.</para>
+          <indexterm zone="jdk jstat">
+            <primary sortas="b-jstat">jstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstatd">
+        <term><command>jstatd</command></term>
+        <listitem>
+          <para>is an RMI server application that monitors for the creation
+          and termination of instrumented JVMs.</para>
+          <indexterm zone="jdk jstatd">
+            <primary sortas="b-jstatd">jstatd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="keytool">
         <term><command>keytool</command></term>
         <listitem>
@@ -652,6 +793,17 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="pack200">
+        <term><command>pack200</command></term>
+        <listitem>
+          <para>is a Java application that transforms a jar file into a
+          compressed pack200 file using the Java gzip compressor.</para>
+          <indexterm zone="jdk pack200">
+            <primary sortas="b-pack200">pack200</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="policytool">
         <term><command>policytool</command></term>
         <listitem>
@@ -666,8 +818,8 @@
         <term><command>rmic</command></term>
         <listitem>
           <para>generates stub and skeleton class files for remote objects
-          from the names of compiled <application>Java</application> classes that
-          contain remote object implementations.</para>
+          from the names of compiled Java classes that contain remote 
+          object implementations.</para>
           <indexterm zone="jdk rmic">
             <primary sortas="b-rmic">rmic</primary>
           </indexterm>
@@ -695,6 +847,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="schemagen">
+        <term><command>schemagen</command></term>
+        <listitem>
+          <para>is a Java XML binding schema generator.</para>
+          <indexterm zone="jdk schemagen">
+            <primary sortas="b-schemagen">schemagen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="serialver">
         <term><command>serialver</command></term>
         <listitem>
@@ -720,13 +882,56 @@
       <varlistentry id="tnameserv">
         <term><command>tnameserv</command></term>
         <listitem>
-          <para>starts the <application>Java</application> IDL name server.</para>
+          <para>starts the Java IDL name server.</para>
           <indexterm zone="jdk tnameserv">
             <primary sortas="b-tnameserv">tnameserv</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="unpack200">
+        <term><command>unpack200</command></term>
+        <listitem>
+          <para>is a native implementation that transforms a packed file
+          produced by <application>pack200</application> into a jar
+          file.</para>
+          <indexterm zone="jdk unpack200">
+            <primary sortas="b-unpack200">unpack200</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wsgen">
+        <term><command>wsgen</command></term>
+        <listitem>
+          <para>generates JAX-WS portable artifacts used in JAX-WS
+          web services.</para>
+          <indexterm zone="jdk wsgen">
+            <primary sortas="b-wsgen">wsgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wsimport">
+        <term><command>wsimport</command></term>
+        <listitem>
+          <para>generates JAX-WS portable artifacts.</para>
+          <indexterm zone="jdk wsimport">
+            <primary sortas="b-wsimport">wsimport</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xjc">
+        <term><command>xjc</command></term>
+        <listitem>
+          <para>is a Java XML binding compiler.</para>
+          <indexterm zone="jdk xjc">
+            <primary sortas="b-xjc">xjc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2007-08-12 21:23:16 UTC (rev 7051)
+++ trunk/BOOK/general.ent	2007-08-13 00:14:28 UTC (rev 7052)
@@ -204,10 +204,7 @@
 <!ENTITY gcc-version                  "4.1.2">
 <!ENTITY gcc3-version                 "3.3.6">
 <!ENTITY guile-version                "1.8.2">
-<!ENTITY jdk-bin-version              "1.5.0_11">
-<!ENTITY jdk-bin-string               "1_5_0_11">
-<!ENTITY jdk-src-version              "1.5.0_11">
-<!ENTITY jdk-src-string               "1_5_0_11">
+<!ENTITY jdk-version                  "6 Update 2">
 <!ENTITY junit-version                "4.3.1">
 <!ENTITY librep-version               "0.17">
 <!ENTITY NASM-version                 "0.98.39">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2007-08-12 21:23:16 UTC (rev 7051)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2007-08-13 00:14:28 UTC (rev 7052)
@@ -52,6 +52,9 @@
           <para>[randy] - Added instructions to create an X11R6 symlink to the
           X Windows Components page.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Updated to JDK-6 Update 2.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/introduction/welcome/credits.xml
===================================================================
--- trunk/BOOK/introduction/welcome/credits.xml	2007-08-12 21:23:16 UTC (rev 7051)
+++ trunk/BOOK/introduction/welcome/credits.xml	2007-08-13 00:14:28 UTC (rev 7052)
@@ -258,7 +258,7 @@
       </listitem>
 
       <listitem>
-        <para>Archive::Zip, cracklib, JDK-5, ksh, libdrm, libpcap, Mesa, 
+        <para>Archive::Zip, cracklib, JDK 5 and 6, ksh, libdrm, libpcap, Mesa, 
         <!-- ncpfs, -->
         netfs, OpenOffice-2, pppd (update), RP-PPPoE, Samba-3, Subversion,
         Xorg-7 and xterm:




More information about the blfs-book mailing list