linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 14:47:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to apache-ant 1.9.4 and rearange java page

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13048 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Pierre Labastie 2014-05-15 16:22:53 +00:00
parent 231d5eb11c
commit 6dc9fd30ef
6 changed files with 79 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "14"> <!-- Always 2 digits -->
<!ENTITY day "15"> <!-- Always 2 digits -->
<!ENTITY month "05"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "May 13th, &year;">
<!ENTITY releasedate "May 15th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development] -->
@ -406,9 +406,10 @@ export -f as_root</userinput></screen>
<!ENTITY valgrind-version "3.9.0">
<!ENTITY yasm-version "1.2.0">
<!ENTITY apache-ant-version "1.9.3">
<!ENTITY apache-ant-version "1.9.4">
<!ENTITY icedtea-version "2.4.7">
<!ENTITY junit-version "4.11">
<!ENTITY hamcrest-version "1.3">
<!ENTITY openjdk-version "1.7.0.55">
<!ENTITY python2-majorver "2.7">

69
general/prog/apache-ant.xml
View File

@ -6,10 +6,10 @@
<!ENTITY apache-ant-download-http "http://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.bz2">
<!ENTITY apache-ant-download-ftp " ">
<!ENTITY apache-ant-md5sum "995f21618acdf35beacc465c84d79534">
<!ENTITY apache-ant-size "3.3 MB">
<!ENTITY apache-ant-buildsize "105 MB">
<!ENTITY apache-ant-time "0.2 SBU">
<!ENTITY apache-ant-md5sum "7a7253ec047195d755c5318a4de8a3a4">
<!ENTITY apache-ant-size "3.6 MB">
<!ENTITY apache-ant-buildsize "108 MB">
<!ENTITY apache-ant-time "0.3 SBU">
]>
<sect1 id="apache-ant" xreflabel="apache-ant-&apache-ant-version;">
@ -63,6 +63,31 @@
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
Required file: <ulink
url="http://anduin.linuxfromscratch.org/sources/other/junit-&junit-version;.jar">
http://anduin.linuxfromscratch.org/sources/other/junit-&junit-version;.jar</ulink>
</para>
</listitem>
<listitem>
<para>
Required file: <ulink
url="http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz">
http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz </ulink>
</para>
</listitem>
<listitem>
<para>Optional documentation: <ulink
url="https://archive.apache.org/dist/ant/manual/apache-ant-&apache-ant-version;-manual.tar.bz2">
https://archive.apache.org/dist/ant/manual/apache-ant-&apache-ant-version;-manual.tar.bz2
</ulink>
</para>
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@ -71,11 +96,11 @@
<xref linkend="glib2"/>
</para>
<bridgehead renderas="sect4">Recommended</bridgehead>
<!-- <bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="junit"/>
</para>
-->
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/apache-ant"/></para>
@ -93,17 +118,24 @@
in <filename>lib/optional</filename>.</para>
</note>
<para>If it is not possible to install the recommended
<!-- <para>If it is not possible to install the recommended
<application>JUnit</application> package, install
<application>Apache Ant</application> by removing the reference to the test
instructions (note that the tests will not be performed):</para>
<screen><userinput>sed -i 's/jars,test-jar/jars/' build.xml</userinput></screen>
<para>otherwise copy the <application>junit</application> jar file to the
-->
<para>Unpack and copy the <application>junit</application> and
<application>hamcrest</application> jar files to the
local directory tree.</para>
<screen><userinput>cp -v /usr/share/java/junit-&junit-version;.jar lib/optional</userinput></screen>
<screen><userinput>tar -xvf ../hamcrest-&hamcrest-version;.tgz &amp;&amp;
cp -v ../junit-&junit-version;.jar \
hamcrest-&hamcrest-version;/hamcrest-core-&hamcrest-version;.jar lib/optional</userinput></screen>
<para>If you wish to install the documentation, unpack it:</para>
<screen><userinput>tar -xvf ../apache-ant-&apache-ant-version;-manual.tar.bz2</userinput></screen>
<para>Install <application>Apache Ant</application> by running the following
commands:</para>
@ -118,19 +150,24 @@ ln -v -sfn ant-&apache-ant-version; /opt/ant</userinput></screen>
<note><para>Make sure the JAVA_HOME environment variable is set for the
<systemitem class="username">root</systemitem> user.</para></note>
<para>Install the documentation as the
<systemitem class="username">root</systemitem> user:</para>
<screen role="root"><userinput>install -m755 -d /opt/ant-&apache-ant-version;/docs &amp;&amp;
cp -Rv apache-ant-&apache-ant-version;/* /opt/ant-&apache-ant-version;/docs</userinput></screen>
</sect2>
<sect2 role="commands">
<title>Command Explanations</title>
<para><command>sed -i 's/jars...</command>: If the
<!-- <para><command>sed -i 's/jars...</command>: If the
<application>JUnit</application> package is not installed, the regression
tests cannot be performed.</para>
<para><command>cp -v
/usr/share/java/junit-&junit-version;.jar ...</command>:
This command copies the JUnit jar file into the directory where Apache Ant
will look for it.</para>
-->
<para><command>cp -v ... lib/optional</command>:
This command copies the JUnit and hamcrest jar files into the directory where
Apache Ant will look for it.</para>
<para><command>./build.sh -Ddist.dir=/opt/ant-&apache-ant-version;
dist</command>: This command does everything. It builds, tests, then

24
general/prog/junit.xml
View File

@ -4,7 +4,7 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!ENTITY junit-download-http "https://launchpad.net/debian/+archive/primary/+files/junit4_4.11.orig.tar.gz">
<!ENTITY junit-download-http "https://launchpad.net/debian/+archive/primary/+files/junit4_&junit-version;.orig.tar.gz">
<!ENTITY junit-download-ftp " ">
<!ENTITY junit-md5sum "b4d163832583dcec8bedb5427c795cc4">
<!ENTITY junit-size "1.7 MB">
@ -64,15 +64,8 @@
<listitem>
<para>
Required file: <ulink
url="http://anduin.linuxfromscratch.org/sources/other/junit-4.11.jar">
http://anduin.linuxfromscratch.org/sources/other/junit-4.11.jar</ulink>
</para>
</listitem>
<listitem>
<para>
Required file: <ulink
url="http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz">
http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz </ulink>
url="http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz">
http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz </ulink>
</para>
</listitem>
</itemizedlist>
@ -93,7 +86,7 @@
<sect2 role="installation">
<title>Installation of JUnit</title>
<para>To do a full build of JUnit from source, <xref linkend='apache-ant'/>
<!-- <para>To do a full build of JUnit from source, <xref linkend='apache-ant'/>
is required. However JUnit is useful in building Apache Ant. Copy the
JUnit-&junit-version; jar file to get started. Then come back to build
from source, if desired.</para>
@ -108,9 +101,12 @@ cp -v junit-&junit-version;.jar /usr/share/java</userinput></screen>
with the source build and installation. From the directory created when
extracting the JUnit sources, place the required hamcrest jar files where
needed and build the package:</para>
-->
<para>Place the required hamcrest jar files where needed and build the
package:</para>
<screen><userinput>tar -xf ../hamcrest-1.3.tgz &amp;&amp;
cp -v hamcrest-1.3/hamcrest-core-1.3{,-sources}.jar lib/ &amp;&amp;
<screen><userinput>tar -xf ../hamcrest-&hamcrest-version;.tgz &amp;&amp;
cp -v hamcrest-&hamcrest-version;/hamcrest-core-&hamcrest-version;{,-sources}.jar lib/ &amp;&amp;
ant dist</userinput></screen>
<para>Testing is automatically done as a part of the build step.</para>
@ -123,7 +119,7 @@ chown -R root:root . &amp;&amp;
cp -v -R junit*/javadoc/* /usr/share/doc/junit-&junit-version; &amp;&amp;
cp -v junit*/junit*.jar /usr/share/java/junit-&junit-version; &amp;&amp;
cp -v hamcrest-1.3/hamcrest-core*.jar /usr/share/java/junit-&junit-version;</userinput></screen>
cp -v hamcrest-&hamcrest-version;/hamcrest-core*.jar /usr/share/java/junit-&junit-version;</userinput></screen>
<para>Finally, update the <envar>CLASSPATH</envar> variable:</para>

1
general/prog/openjdk.xml
View File

@ -265,6 +265,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="junit"/> and
<xref linkend="nss"/>
</para>

2
general/prog/prog.xml
View File

@ -62,8 +62,8 @@ $Date$
<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="junit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
</chapter>

10
introduction/welcome/changelog.xml
View File

@ -44,6 +44,16 @@
-->
<listitem>
<para>May 15th, 2014</para>
<itemizedlist>
<listitem>
<para>[pierre] - Update to apache-ant-1.9.4 and rearange java pages.
Fixes <ulink url="&blfs-ticket-root;5032">#5032</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>May 14th, 2014</para>
<itemizedlist>