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

dj at linuxfromscratch.org dj at linuxfromscratch.org
Sat Jan 27 23:29:21 PST 2007


Author: dj
Date: 2007-01-28 00:29:21 -0700 (Sun, 28 Jan 2007)
New Revision: 6474

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/jdk.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to JDK-1.5.0_10.

Modified: trunk/BOOK/general/prog/jdk.xml
===================================================================
--- trunk/BOOK/general/prog/jdk.xml	2007-01-27 17:36:13 UTC (rev 6473)
+++ trunk/BOOK/general/prog/jdk.xml	2007-01-28 07:29:21 UTC (rev 6474)
@@ -4,14 +4,14 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY jdk-download-source "https://tiger.dev.java.net/jdk_5_0_08.html">
+  <!ENTITY jdk-download-source "http://download.java.net/tiger/">
   <!ENTITY jdk-download-binary "http://java.sun.com/j2se/1.5.0/download.jsp">
   <!ENTITY jdk-source-md5sum   "&sources-anduin-http;/j/jdk-&jdk-src-version;.md5sums">
-  <!ENTITY jdk-bin-md5sum      "4fb7972a819e9d5a5ecc902e017e8646">
+  <!ENTITY jdk-bin-md5sum      "d916c24bed9eef7aebc2626115e14a11">
   <!ENTITY jdk-bin-size        "47.2 MB">
-  <!ENTITY jdk-src-size        "64.1 MB (three .jar files)">
-  <!ENTITY jdk-src-buildsize   "1700 MB">
-  <!ENTITY jdk-time            "36 SBU">
+  <!ENTITY jdk-src-size        "64.2 MB (three .jar files)">
+  <!ENTITY jdk-src-buildsize   "1882 MB">
+  <!ENTITY jdk-time            "34 SBU">
 ]>
 
 <sect1 id="jdk" xreflabel="JDK-&jdk-src-version;">
@@ -70,23 +70,23 @@
       </listitem>
       <listitem>
         <para>Source download: <ulink url="&jdk-download-source;"/>
-        (to download jdk-&jdk-src-string;-fcs-src-b03-jrl-03_may_2006.jar (or
+        (to download jdk-&jdk-src-string;-fcs-src-b03-jrl-09_nov_2006.jar (or
          optionally the JIUL version),
-         jdk-&jdk-src-string;-fcs-bin-b03-03_may_2006.jar, and
-         jdk-&jdk-src-string;-mozilla_headers-b03-unix-03_may_2006.jar)</para>
+         jdk-&jdk-src-string;-fcs-bin-b03-09_nov_2006.jar, and
+         jdk-&jdk-src-string;-mozilla_headers-b03-unix-09_nov_2006.jar)</para>
       </listitem>
 
       <listitem>
         <para>Download MD5 sums (source):
           <simplelist>
-            <member>267653f0e425b4c8f37b918b73e47027
-                    jdk-&jdk-src-string;-fcs-bin-b03-08_aug_2006.jar
+            <member>09842a4e68040db473e04dbcc284f1d5
+                    jdk-&jdk-src-string;-fcs-bin-b03-09_nov_2006.jar
             </member>
-            <member>f83f8efe9dc82b4e16c382828d490031
-                    jdk-&jdk-src-string;-fcs-src-b03-jrl-08_aug_2006.jar
+            <member>b59335f620e7da524be168b07319fa3b
+                    jdk-&jdk-src-string;-fcs-src-b03-jrl-09_nov_2006.jar
             </member>
-            <member>d75c8dbf3383def458d107f557f95d98
-                    jdk-&jdk-src-string;-mozilla_headers-b03-unix-08_aug_2006.jar
+            <member>f49df1a1e7fe351b7fa9f66db121616e
+                    jdk-&jdk-src-string;-mozilla_headers-b03-unix-09_nov_2006.jar
             </member>
           </simplelist>
         </para>
@@ -247,7 +247,7 @@
 export CLASSPATH_HOLD=${CLASSPATH} &&
 unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS &&
 export ALT_DEVTOOLS_PATH="/usr/bin" &&
-export BUILD_NUMBER="update-8" &&
+export BUILD_NUMBER="update-10" &&
 export DEV_ONLY=true &&
 export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin/ &&
 export INSANE=true &&
@@ -318,7 +318,7 @@
     <para><command>export ALT_DEVTOOLS_PATH="/usr/bin"</command>: This
     changes the location where the build finds the needed executables.</para>
 
-    <para><command>export BUILD_NUMBER="update-8"</command>:
+    <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>
@@ -378,20 +378,23 @@
 # Adjust PATH
 pathappend ${JAVA_HOME}/bin PATH
 
-# Auto Java Classpath Updating
-# Create symlinks to this directory for auto classpath setting
+# Auto Java CLASSPATH
+# Copy jar files to, or create symlinks in this directory
 AUTO_CLASSPATH_DIR=/usr/lib/classpath
-if [ -z ${CLASSPATH} ]; then
+# Check for jar files in AUTO_CLASSPATH_DIR (if empty, don't include)
+if [ `ls ${AUTO_CLASSPATH_DIR}/*.jar &> /dev/null` ]; then
   CLASSPATH=.:${AUTO_CLASSPATH_DIR}
 else
-  CLASSPATH="${CLASSPATH}:.:${AUTO_CLASSPATH_DIR}"
+  # Always have the current directory in the CLASSPATH
+  CLASSPATH=.
 fi
 
-# Check for empty AUTO_CLASSPATH_DIR
-ls ${AUTO_CLASSPATH_DIR}/*.jar &> /dev/null &&
-for i in ${AUTO_CLASSPATH_DIR}/*.jar
+# Add subdirectories
+ls -d ${AUTO_CLASSPATH_DIR}/*/ &> /dev/null &&
+for i in `ls -d ${AUTO_CLASSPATH_DIR}/*/`
   do CLASSPATH=${CLASSPATH}:"${i}"
 done
+
 export CLASSPATH
 
 # End /etc/profile.d/jdk.sh</literal>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2007-01-27 17:36:13 UTC (rev 6473)
+++ trunk/BOOK/general.ent	2007-01-28 07:29:21 UTC (rev 6474)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -183,10 +183,10 @@
 <!ENTITY gcc-version                  "4.0.3">
 <!ENTITY gcc3-version                 "3.3.6">
 <!ENTITY guile-version                "1.6.7">
-<!ENTITY jdk-bin-version              "1.5.0_08">
-<!ENTITY jdk-bin-string               "1_5_0_08">
-<!ENTITY jdk-src-version              "1.5.0_08">
-<!ENTITY jdk-src-string               "1_5_0_08">
+<!ENTITY jdk-bin-version              "1.5.0_10">
+<!ENTITY jdk-bin-string               "1_5_0_10">
+<!ENTITY jdk-src-version              "1.5.0_10">
+<!ENTITY jdk-src-string               "1_5_0_10">
 <!ENTITY librep-version               "0.17">
 <!ENTITY NASM-version                 "0.98.39">
 <!ENTITY pdl-version                  "2.4.2">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2007-01-27 17:36:13 UTC (rev 6473)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2007-01-28 07:29:21 UTC (rev 6474)
@@ -42,6 +42,15 @@
 -->
 
     <listitem>
+      <para>January 28th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to JDK-1.5.0_10.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 27th, 2007</para>
       <itemizedlist>
         <listitem>




More information about the blfs-book mailing list