Author: bdubbs
Date: Tue Jul 16 13:07:29 2013
New Revision: 11441
Log:
Moved apache-ant to programming section.
Created sub-section in programming for java.
Added a separate section intorducing java and
doing the binary install. Marked junit, apache-ant
and openjdk as undergoing revision.
Added:
trunk/BOOK/general/prog/apache-ant.xml
- copied, changed from r11440, trunk/BOOK/general/sysutils/apache-ant.xml
trunk/BOOK/general/prog/dummy-java.xml
- copied, changed from r11440,
trunk/BOOK/gnome/platform/dummy-platform.xml
trunk/BOOK/general/prog/java.xml
- copied, changed from r11440,
trunk/BOOK/postlfs/filesystems/initramfs.xml
Deleted:
trunk/BOOK/general/sysutils/apache-ant.xml
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/prog/junit.xml
trunk/BOOK/general/prog/openjdk.xml
trunk/BOOK/general/prog/prog.xml
trunk/BOOK/general/sysutils/sysutils.xml
trunk/BOOK/general/sysutils/unrar.xml
trunk/BOOK/introduction/welcome/changelog.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Tue Jul 16 03:41:57 2013 (r11440)
+++ trunk/BOOK/general.ent Tue Jul 16 13:07:29 2013 (r11441)
@@ -378,7 +378,7 @@
<!ENTITY git-version "1.8.3.3">
<!ENTITY guile-version "2.0.9">
<!ENTITY icedtea-version "2.3.3">
-<!ENTITY openjdk-version "1.7.0.9">
+<!ENTITY openjdk-version "1.7.0.40">
<!ENTITY junit-version "4.10">
<!ENTITY librep-version "0.92.2.1">
<!ENTITY llvm-version "3.3">
Copied and modified: trunk/BOOK/general/prog/apache-ant.xml (from r11440,
trunk/BOOK/general/sysutils/apache-ant.xml)
==============================================================================
--- trunk/BOOK/general/sysutils/apache-ant.xml Tue Jul 16 03:41:57 2013
(r11440, copy source)
+++ trunk/BOOK/general/prog/apache-ant.xml Tue Jul 16 13:07:29 2013
(r11441)
@@ -29,6 +29,9 @@
<sect2 role="package">
<title>Introduction to Apache Ant</title>
+ <warning><para>Under revison do not use for now.</para></warning>
+
+
<para>The <application>Apache Ant</application> package is a
<application>Java</application>-based build tool. In theory, it is kind of
like <command>make</command>, but without <command>make</command>'s
Copied and modified: trunk/BOOK/general/prog/dummy-java.xml (from r11440,
trunk/BOOK/gnome/platform/dummy-platform.xml)
==============================================================================
--- trunk/BOOK/gnome/platform/dummy-platform.xml Tue Jul 16 03:41:57
2013 (r11440, copy source)
+++ trunk/BOOK/general/prog/dummy-java.xml Tue Jul 16 13:07:29 2013
(r11441)
@@ -9,7 +9,7 @@
<date>$Date$</date>
</sect1info>
- <title>Platform</title>
+ <title>Java</title>
<para/>
</sect1>
Copied and modified: trunk/BOOK/general/prog/java.xml (from r11440,
trunk/BOOK/postlfs/filesystems/initramfs.xml)
==============================================================================
--- trunk/BOOK/postlfs/filesystems/initramfs.xml Tue Jul 16 03:41:57
2013 (r11440, copy source)
+++ trunk/BOOK/general/prog/java.xml Tue Jul 16 13:07:29 2013 (r11441)
@@ -3,399 +3,134 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
+
+ <!ENTITY anduin-download
"http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-&openjdk-version;";>
+ <!ENTITY openjdk-download-binary-x86
"&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
+ <!ENTITY openjdk-bin-md5sum-x86 "099f50edbd6b0f83b746c907032d5c">
+ <!ENTITY openjdk-bin-size-x86 "163 MB">
+ <!ENTITY openjdk-bin-buildsize-x86 "464 MB">
+
+ <!ENTITY openjdk-download-binary-x64
"&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz">
+ <!ENTITY openjdk-bin-md5sum-x64 "506ca98b2f4064c350ee08ab8f8f5416">
+ <!ENTITY openjdk-bin-size-x64 "146 MB">
+ <!ENTITY openjdk-bin-buildsize-x64 "358 MB">
+
]>
-<sect1 id="initramfs">
- <?dbhtml filename="initramfs.html"?>
+<sect1 id="java">
+ <?dbhtml filename="java.html"?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
- <title>About initramfs</title>
-
- <para>The only purpose of an initramfs is to mount the root filesystem. The
- initramfs is a complete set of directories that you would find on a normal
- root filesystem. It is bundled into a single cpio archive and compressed
- with one of several compression algorithms.</para>
-
- <para>At boot time, the boot loader loads the kernel and the initramfs image
- into memory and starts the kernel. The kernel checks for the presence of the
- initramfs and, if found, mounts it as / and runs /init. The init program is
- typically a shell script. Note that the boot process takes longer, possibly
- significantly longer, if an initramfs is used.</para>
-
- <para>For most distributions, kernel modules are the biggest reason to have
an
- initramfs. In a general distribution, there are many unknowns such as file
- system types and disk layouts. In a way, this is the opposite of LFS where
- the system capabilities and layout are known and a custom kernel is normally
- built. In this situation, an initramfs is rarely needed.</para>
-
- <para>There are only four primary reasons to have an initramfs in the LFS
- environment: loading the rootfs from a network, loading it from an LVM
- logical volume, having an encrypted rootfs where a password is required, or
- for the convenience of specifying the rootfs as a LABEL or UUID. Anything
- else usually means that the kernel was not configured properly.</para>
-
- <sect2 id="initramfs-build">
- <title>Building an initramfs</title>
-
- <para>If you do decide to build an initramfs, the following scripts
- will provide a basis to do it. The scripts will allow specifying a
- rootfs via partition UUID or partition LABEL or a rootfs on an
- LVM logical volume. They do not support an encrypted root file system
- or mounting the rootfs over a network card. For a more complete
- capability see <ulink
url="http://www.linuxfromscratch.org/hints/read.html";>
- the LFS Hints</ulink> or <ulink url="http://fedoraproject.org/wiki/Dracut";>
- dracut</ulink>.</para>
+ <title>About Java</title>
- <para>To install these scripts, run the following commands as the
+ <indexterm zone="java">
+ <primary sortas="a-java">JDK Binary</primary>
+ </indexterm>
+
+
+ <para>Java is different from most of the packages in LFS and BLFS. It
+ is a programming language that works with files of byte codes to obtain
+ instructions and executes then in a Java Virtual Machine (JVM). An
+ introductory java program looks like:</para>
+
+<screen><literal>public class HelloWorld
+{
+ public static void main(String[] args)
+ {
+ System.out.println("Hello, World");
+ }
+}</literal></screen>
+
+ <para>This program is saved as <filename>HelloWorld.java</filename>. The
file
+ name, <emphasis>HelloWorld</emphasis>, must match the class name. It
+ is then converted into byte code with <command>javac
HelloWorld.java</command>.
+ The output file is <filename>HelloWorld.class</filename>. The program is
+ executed with <command>java HelloWorld</command>. This creates a JVM and
+ runs the code. The 'class' extention must not be specified.</para>
+
+ <para>Several class files can be combined into one file with the
+ <command>jar</command> command. This is similar to the standard
+ <command>tar</command> command. For instance, the command <command>jar cf
myjar.jar
+ *.class</command> will combine all class files in a directory into one jar
+ file. These act as library files.</para>
+
+ <para>The JVM can search for and use classes in jar files automatically. It
+ uses the <envar>CLASSPATH</envar> envronment variable to search for jar
files.
+ This a a standard list of colon-separated directory namesi similar to
+ the <envar>PATH</envar> envronment variable.</para>
+
+ &lfs73_checked;
+
+ <sect2 id="java-bin">
+ <title>Installing a binary JDK</title>
+
+ <para>Creating a JVM from source requires a set of circular dependencies.
+ The first thing that's needed is a set of programs called a Java
Development
+ Kit (JDK). This set of programs includes <command>java</command>,
+ <command>javac</command>, <command>jar</command>, and severl others. It
+ also includes several base <emphasis>jar</emphasis> files.</para>
+
+ <para>To start, we set up a binary installation of the JDK created
+ by the BLFS editors. It is installed in the <filename>/opt</filename>
+ directory to allow for multiple installations, including a source based
+ version.</para>
+
+ <bridgehead renderas="sect3">Binary Package Information</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>Binary download (x86):
+ <ulink url="&openjdk-download-binary-x86;"/></para>
+ </listitem>
+ <listitem>
+ <para>Download MD5 sum: &openjdk-bin-md5sum-x86;</para>
+ </listitem>
+ <listitem>
+ <para>Download size (binary): &openjdk-bin-size-x86;</para>
+ </listitem>
+ <listitem>
+ <para>Estimated disk space required: &openjdk-bin-buildsize-x86;</para>
+ </listitem>
+ </itemizedlist>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>Binary download (x86_64):
+ <ulink url="&openjdk-download-binary-x64;"/></para>
+ </listitem>
+ <listitem>
+ <para>Download MD5 sum: &openjdk-bin-md5sum-x64;</para>
+ </listitem>
+ <listitem>
+ <para>Download size (binary): &openjdk-bin-size-x64;</para>
+ </listitem>
+ <listitem>
+ <para>Estimated disk space required: &openjdk-bin-buildsize-x64;</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Begin by extracting the appropriate binary tarball for your
+ architeciture and changing to the extracted directory. Install the binary
+ <application>OpenJDK</application> with the following commands as the
<systemitem class="username">root</systemitem> user:</para>
- <screen role="root"><userinput>cat > /sbin/mkinitramfs << "EOF"
-#!/bin/bash
-# This file based in part on the mkinitrafms script for the LFS LiveCD
-# written by Alexander E. Patrakov and Jeremy Huntwork.
-
-copy()
-{
- local file
-
- if [ "$2" == "lib" ]; then
- file=$(PATH=/lib:/usr/lib type -p $1)
- else
- file=$(type -p $1)
- fi
-
- if [ -n $file ] ; then
- cp $file $WDIR/$2
- else
- echo "Missing required file: $1 for directory $2"
- rm -rf $WDIR
- exit 1
- fi
-}
-
-if [ -z $1 ] ; then
- INITRAMFS_FILE=initrd.img-no-kmods
-else
- KERNEL_VERSION=$1
- INITRAMFS_FILE=initrd.img-$KERNEL_VERSION
-fi
-
-if [ -n "$KERNEL_VERSION" ] && [ ! -d "/lib/modules/$1" ] ; then
- echo "No modules directory named $1"
- exit 1
-fi
-
-printf "Creating $INITRAMFS_FILE... "
-
-binfiles="sh cat cp dd killall ls mkdir mknod mount "
-binfiles="$binfiles umount sed sleep ln rm uname"
-
-sbinfiles="udevadm modprobe blkid switch_root"
-
-#Optional files and locations
-for f in mdadm udevd; do
- if [ -x /sbin/$f ] ; then sbinfiles="$sbinfiles $f"; fi
-done
-
-unsorted=$(mktemp /tmp/unsorted.XXXXXXXXXX)
-
-DATADIR=/usr/share/mkinitramfs
-INITIN=init.in
-
-# Create a temporrary working directory
-WDIR=$(mktemp -d /tmp/initrd-work.XXXXXXXXXX)
-
-# Create base directory structure
-mkdir -p $WDIR/{bin,dev,lib/firmware,run,sbin,sys,proc}
-mkdir -p $WDIR/etc/{modprobe.d,udev/rules.d}
-touch $WDIR/etc/modprobe.d/modprobe.conf
-ln -s lib $WDIR/lib64
-
-# Create necessary device nodes
-mknod -m 640 $WDIR/dev/console c 5 1
-mknod -m 664 $WDIR/dev/null c 1 3
-
-# Install the udev configuration files
-cp /etc/udev/udev.conf $WDIR/etc/udev/udev.conf
-
-for file in $(find /etc/udev/rules.d/ -type f) ; do
- cp $file $WDIR/etc/udev/rules.d
-done
-
-# Install any firmware present
-cp -a /lib/firmware $WDIR/lib
-
-# Copy the RAID configureation file if present
-if [ -f /etc/mdadm.conf ] ; then
- cp /etc/mdadm.conf $WDIR/etc
-fi
-
-# Install the init file
-install -m0755 $DATADIR/$INITIN $WDIR/init
-
-if [ -n "$KERNEL_VERSION" ] ; then
- if [ -x /bin/kmod ] ; then
- binfiles="$binfiles kmod"
- else
- binfiles="$binfiles lsmod"
- sbinfiles="$sbinfiles insmod"
- fi
-fi
-
-# Install basic binaries
-for f in $binfiles ; do
- ldd /bin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
- copy $f bin
-done
-
-# Add lvm if present
-if [ -x /sbin/lvm ] ; then sbinfiles="$sbinfiles lvm"; fi
-
-for f in $sbinfiles ; do
- ldd /sbin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
- copy $f sbin
-done
-
-# Add udevd libraries if not in /sbin
-if [ -x /lib/udev/udevd ] ; then
- ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
-fi
-
-# Add module symlinks if appropriate
-if [ -n "$KERNEL_VERSION" ] && [ -x /bin/kmod ] ; then
- ln -s kmod $WDIR/bin/lsmod
- ln -s kmod $WDIR/bin/insmod
-fi
-
-# Add lvm symlinks if appropriate
-if [ -x /sbin/lvm ] ; then
- ln -s lvm $WDIR/sbin/lvchange
- ln -s lvm $WDIR/sbin/lvrename
- ln -s lvm $WDIR/sbin/lvextend
- ln -s lvm $WDIR/sbin/lvcreate
- ln -s lvm $WDIR/sbin/lvdisplay
- ln -s lvm $WDIR/sbin/lvscan
-
- ln -s lvm $WDIR/sbin/pvchange
- ln -s lvm $WDIR/sbin/pvck
- ln -s lvm $WDIR/sbin/pvcreate
- ln -s lvm $WDIR/sbin/pvdisplay
- ln -s lvm $WDIR/sbin/pvscan
-
- ln -s lvm $WDIR/sbin/vgchange
- ln -s lvm $WDIR/sbin/vgcreate
- ln -s lvm $WDIR/sbin/vgscan
- ln -s lvm $WDIR/sbin/vgrename
- ln -s lvm $WDIR/sbin/vgck
-fi
-
-# Install libraries
-sort $unsorted | uniq | while read library ; do
- if [ "$library" == "linux-vdso.so.1" ] ||
- [ "$library" == "linux-gate.so.1" ]; then
- continue
- fi
-
- copy $library lib
-done
-
-cp -a /lib/udev $WDIR/lib
-
-# Install the kernel modules if requested
-if [ -n "$KERNEL_VERSION" ]; then
- find \
- /lib/modules/$KERNEL_VERSION/kernel/{crypto,fs,lib} \
- /lib/modules/$KERNEL_VERSION/kernel/drivers/{block,ata,md,firewire} \
- /lib/modules/$KERNEL_VERSION/kernel/drivers/{scsi,message,pcmcia,virtio} \
- /lib/modules/$KERNEL_VERSION/kernel/drivers/usb/{host,storage} \
- -type f 2> /dev/null | cpio --make-directories -p --quiet $WDIR
-
- cp /lib/modules/$KERNEL_VERSION/modules.{builtin,order} \
- $WDIR/lib/modules/$KERNEL_VERSION
-
- depmod -b $WDIR $KERNEL_VERSION
-fi
-
-( cd $WDIR ; find . | cpio -o -H newc --quiet | gzip -9 ) > $INITRAMFS_FILE
-
-# Remove the temporary directory and file
-rm -rf $WDIR $unsorted
-printf "done.\n"
-
-EOF
-
-<command>chmod 0755 /sbin/mkinitramfs</command></userinput></screen>
-
- <screen role="root"><userinput>mkdir -p /usr/share/mkinitramfs &&
-cat > /usr/share/mkinitramfs/init.in << "EOF"
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-export PATH
-
-problem()
-{
- printf "Encountered a problem!\n\nDropping you to a shell.\n\n"
- sh
-}
-
-no_device()
-{
- printf "The device %s, which is supposed to contain the\n" $1
- printf "root file system, does not exist.\n"
- printf "Please fix this problem and exit this shell.\n\n"
-}
-
-no_mount()
-{
- printf "Could not mount device %s\n" $1
- printf "Sleeping forever. Please reboot and fix the kernel command
line.\n\n"
- printf "Maybe the device is formatted with an unsupported file system?\n\n"
- printf "Or maybe filesystem type autodetection went wrong, in which case\n"
- printf "you should add the rootfstype=... parameter to the kernel command
line.\n\n"
- printf "Available partitions:\n"
-}
-
-do_mount_root()
-{
- mkdir /.root
- [ -n "$rootflags" ] && rootflags="$rootflags,"
- rootflags="$rootflags$ro"
-
- case "$root" in
- /dev/* ) device=$root ;;
- UUID=* ) eval $root; device="/dev/disk/by-uuid/$UUID" ;;
- LABEL=*) eval $root; device="/dev/disk/by-label/$LABEL" ;;
- "" ) echo "No root device specified." ; problem ;;
- esac
-
- while [ ! -b "$device" ] ; do
- no_device $device
- problem
- done
-
- if ! mount -n -t "$rootfstype" -o "$rootflags" "$device" /.root ; then
- no_mount $device
- cat /proc/partitions
- while true ; do sleep 10000 ; done
- else
- echo "Successfully mounted device $root"
- fi
-}
-
-init=/sbin/init
-root=
-rootdelay=
-rootfstype=auto
-ro="ro"
-rootflags=
-device=
-
-mount -n -t devtmpfs devtmpfs /dev
-mount -n -t proc proc /proc
-mount -n -t sysfs sysfs /sys
-mount -n -t tmpfs tmpfs /run
-
-read -r cmdline < /proc/cmdline
-
-for param in $cmdline ; do
- case $param in
- init=* ) init=${param#init=} ;;
- root=* ) root=${param#root=} ;;
- rootdelay=* ) rootdelay=${param#rootdelay=} ;;
- rootfstype=*) rootfstype=${param#rootfstype=} ;;
- rootflags=* ) rootflags=${param#rootflags=} ;;
- ro ) ro="ro" ;;
- rw ) ro="rw" ;;
- esac
-done
-
-# udevd location depends on version
-if [ -x /sbin/udevd ]; then
- UDEV_PATH=/sbin
-else
- UDEV_PATH=/lib/udev
-fi
-
-${UDEV_PATH}/udevd --daemon --resolve-names=never
-udevadm trigger
-udevadm settle
-
-if [ -f /etc/mdadm.conf ] ; then mdadm -As
; fi
-if [ -x /sbin/vgchange ] ; then /sbin/vgchange --noudevsync -a y >
/dev/null ; fi
-if [ -n "$rootdelay" ] ; then sleep "$rootdelay"
; fi
-
-do_mount_root
-
-killall -w ${UDEV_PATH}/udevd
-
-exec switch_root /.root "$init" "$@"
-
-EOF</userinput></screen>
-
- </sect2>
-
- <sect2 id="initramfs-install">
- <title>Using an initramfs</title>
-
- <bridgehead renderas="sect3">Required Runtime Dependency</bridgehead>
-
- <para role="required">
- <xref linkend="cpio"/>
- </para>
-
- <para condition="html" role="usernotes">User Notes:
- <ulink url="&blfs-wiki;/initramfs"/>
- </para>
-
-
- <para>To build an initramfs, run the following as the <systemitem
- class="username">root</systemitem> user:</para>
-
- <screen><userinput>mkinitramfs [KERNEL VERSION]</userinput></screen>
-
- <para>The optional argument is the directory where the appropriate kernel
- modules are located. This must be a subdirectory of <filename
- class='directory'> /lib/modules</filename>. If no modules are specified,
- then the initramfs is named <emphasis>initrd.img-no-kmods</emphasis>. If a
- kernel version is specified, the initrd is named
- <emphasis>initrd.img-$KERNEL_VERSION</emphasis> and is only appropriate for
- the specific kernel specified. The output file will be placed in the
- current directory.</para>
-
- <para>After generating the initrd, copy it to the <filename
- class='directory'>/boot</filename> directory.</para>
-
- <para>Now edit <filename>/boot/grub/grub.cfg</filename> and add a new
- menuentry. Below are several examples.</para>
-
- <screen><userinput># Generic initramfs and root fs identified by UUID
-menuentry "LFS Dev (LFS-7.0-Feb14) initrd, Linux 3.0.4"
-{
- linux /vmlinuz-3.0.4-lfs-20120214
root=UUID=54b934a9-302d-415e-ac11-4988408eb0a8 ro
- initrd /initrd.img-no-kmods
-}</userinput></screen>
-
- <screen><userinput># Generic initramfs and root fs on LVM partition
-menuentry "LFS Dev (LFS-7.0-Feb18) initrd lvm, Linux 3.0.4"
-{
- linux /vmlinuz-3.0.4-lfs-20120218 root=/dev/mapper/myroot ro
- initrd /initrd.img-no-kmods
-}</userinput></screen>
-
- <screen><userinput># Specific initramfs and root fs identified by LABEL
-menuentry "LFS Dev (LFS-7.1-Feb20) initrd label, Linux 3.2.6"
-{
- linux /vmlinuz-3.2.6-lfs71-120220 root=LABEL=lfs71 ro
- initrd /initrd.img-3.2.6-lfs71-120220
-}</userinput></screen>
-
- <para>Finally, reboot the system and select the desired system.</para>
-
+<screen role="root"><userinput>install -vdm755
/opt/OpenJDK-&openjdk-version;-bin &&
+mv -v * /opt/OpenJDK-&openjdk-version;-bin &&
+chown -R root:root /opt/OpenJDK-&openjdk-version;-bin</userinput></screen>
+
+ <para>Configure the temporary <application>OpenJDK</application>
+ installation with the following commands:</para>
+
+<screen><userinput>export CLASSPATH=.:/usr/share/java &&
+export PATH="$PATH:/opt/OpenJDK-&openjdk-version;-bin/bin"</userinput></screen>
+
+ <para>The binary version is now installed. If you don't want to compile the
+ sources, skip ahead to the <xref linkend='openjdk-config'/> section.
+ Otherwise, continue to the <xref linkend='junit'/>, <xref
+ linkend='apache-ant'/>, and <xref linkend='openjdk'/> sections.</para>
+
</sect2>
</sect1>
Modified: trunk/BOOK/general/prog/junit.xml
==============================================================================
--- trunk/BOOK/general/prog/junit.xml Tue Jul 16 03:41:57 2013 (r11440)
+++ trunk/BOOK/general/prog/junit.xml Tue Jul 16 13:07:29 2013 (r11441)
@@ -29,6 +29,9 @@
<sect2 role="package">
<title>Introduction to JUnit</title>
+ <warning><para>Under revison do not use for now.</para></warning>
+
+
<para>The <application>JUnit</application> package contains a simple, open
source framework to write and run repeatable tests. It is an instance of
the xUnit architecture for unit testing frameworks. JUnit features include
Modified: trunk/BOOK/general/prog/openjdk.xml
==============================================================================
--- trunk/BOOK/general/prog/openjdk.xml Tue Jul 16 03:41:57 2013 (r11440)
+++ trunk/BOOK/general/prog/openjdk.xml Tue Jul 16 13:07:29 2013 (r11441)
@@ -74,6 +74,8 @@
<sect2 role="package">
<title>Introduction to OpenJDK and IcedTea</title>
+ <warning><para>Under revison do not use for now.</para></warning>
+
<para><application>IcedTea</application> provides a build harness for the
<application>OpenJDK</application> package, Oracle's open-sourced
<application>Java</application> development environment. In order to
@@ -444,7 +446,7 @@
</sect2>
- <sect2 role="configuration">
+ <sect2 role="configuration" id="openjdk-config" xreflabel="Configuring
OpenJDK" >
<title>Configuring OpenJDK</title>
<sect3>
@@ -604,14 +606,14 @@
</listitem>
</varlistentry>
- <varlistentry id="java">
+ <varlistentry id="java-prog">
<term><command>java</command></term>
<listitem>
<para>launches a Java application by starting a Java runtime
environment, loading a specified class and invoking its main
method.</para>
- <indexterm zone="openjdk java">
- <primary sortas="b-java">java</primary>
+ <indexterm zone="openjdk java-prog">
+ <primary sortas="b-java-prog">java</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: trunk/BOOK/general/prog/prog.xml
==============================================================================
--- trunk/BOOK/general/prog/prog.xml Tue Jul 16 03:41:57 2013 (r11440)
+++ trunk/BOOK/general/prog/prog.xml Tue Jul 16 13:07:29 2013 (r11441)
@@ -35,8 +35,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gdb.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="git.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="guile.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="openjdk.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="junit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="librep.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="llvm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="lua.xml"/>
@@ -58,4 +56,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="yasm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="other-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="dummy-java.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="java.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="junit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="apache-ant.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="openjdk.xml"/>
+
</chapter>
Modified: trunk/BOOK/general/sysutils/sysutils.xml
==============================================================================
--- trunk/BOOK/general/sysutils/sysutils.xml Tue Jul 16 03:41:57 2013
(r11440)
+++ trunk/BOOK/general/sysutils/sysutils.xml Tue Jul 16 13:07:29 2013
(r11441)
@@ -20,7 +20,6 @@
installation or configuration purposes.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="acpid.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="apache-ant.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="at.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="autofs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="bluez.xml"/>
Modified: trunk/BOOK/general/sysutils/unrar.xml
==============================================================================
--- trunk/BOOK/general/sysutils/unrar.xml Tue Jul 16 03:41:57 2013
(r11440)
+++ trunk/BOOK/general/sysutils/unrar.xml Tue Jul 16 13:07:29 2013
(r11441)
@@ -5,7 +5,7 @@
%general-entities;
<!ENTITY unrar-download-http
"http://www.rarlab.com/rar/unrarsrc-&unrar-version;.tar.gz";>
- <!ENTITY unrar-download-ftp "">
+ <!ENTITY unrar-download-ftp " ">
<!ENTITY unrar-md5sum "54fa097a9b91ab32c010fbcbdc51cda5">
<!ENTITY unrar-size "208 KB">
<!ENTITY unrar-buildsize "3.2 MB">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Tue Jul 16 03:41:57
2013 (r11440)
+++ trunk/BOOK/introduction/welcome/changelog.xml Tue Jul 16 13:07:29
2013 (r11441)
@@ -47,6 +47,11 @@
<para>July 16th, 2013</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Reorganized the Programming chapter to
+ put all Java related packages together in a sub-section.
+ Moved Apache-ant to this sub-section.</para>
+ </listitem>
+ <listitem>
<para>[igor] - Git-1.8.3.3.</para>
</listitem>
</itemizedlist>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
