From 6dc9fd30efb0cb28c38028bda85fd0f2a50908f7 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Thu, 15 May 2014 16:22:53 +0000 Subject: [PATCH] Update to apache-ant 1.9.4 and rearange java page git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13048 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 7 +-- general/prog/apache-ant.xml | 69 +++++++++++++++++++++++------- general/prog/junit.xml | 24 +++++------ general/prog/openjdk.xml | 1 + general/prog/prog.xml | 2 +- introduction/welcome/changelog.xml | 10 +++++ 6 files changed, 79 insertions(+), 34 deletions(-) diff --git a/general.ent b/general.ent index af06d8bef2..dc6118ba0c 100644 --- a/general.ent +++ b/general.ent @@ -1,12 +1,12 @@ - + - + @@ -406,9 +406,10 @@ export -f as_root - + + diff --git a/general/prog/apache-ant.xml b/general/prog/apache-ant.xml index d8194c93fa..d4df2df3c0 100644 --- a/general/prog/apache-ant.xml +++ b/general/prog/apache-ant.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -63,6 +63,31 @@ + Additional Downloads + + + + Required file: + http://anduin.linuxfromscratch.org/sources/other/junit-&junit-version;.jar + + + + + Required file: + http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz + + + + Optional documentation: + https://archive.apache.org/dist/ant/manual/apache-ant-&apache-ant-version;-manual.tar.bz2 + + + + + Apache Ant Dependencies Required @@ -71,11 +96,11 @@ - Recommended + User Notes: @@ -93,17 +118,24 @@ in lib/optional. - If it is not possible to install the recommended + + Unpack and copy the junit and + hamcrest jar files to the local directory tree. -cp -v /usr/share/java/junit-&junit-version;.jar lib/optional +tar -xvf ../hamcrest-&hamcrest-version;.tgz && +cp -v ../junit-&junit-version;.jar \ + hamcrest-&hamcrest-version;/hamcrest-core-&hamcrest-version;.jar lib/optional + + If you wish to install the documentation, unpack it: + +tar -xvf ../apache-ant-&apache-ant-version;-manual.tar.bz2 Install Apache Ant by running the following commands: @@ -118,19 +150,24 @@ ln -v -sfn ant-&apache-ant-version; /opt/ant Make sure the JAVA_HOME environment variable is set for the root user. + Install the documentation as the + root user: + +install -m755 -d /opt/ant-&apache-ant-version;/docs && +cp -Rv apache-ant-&apache-ant-version;/* /opt/ant-&apache-ant-version;/docs + Command Explanations - sed -i 's/jars...: If the + + cp -v ... lib/optional: + This command copies the JUnit and hamcrest jar files into the directory where + Apache Ant will look for it. ./build.sh -Ddist.dir=/opt/ant-&apache-ant-version; dist: This command does everything. It builds, tests, then diff --git a/general/prog/junit.xml b/general/prog/junit.xml index ba826488c5..70e8a450e2 100644 --- a/general/prog/junit.xml +++ b/general/prog/junit.xml @@ -4,7 +4,7 @@ %general-entities; - + @@ -64,15 +64,8 @@ Required file: - http://anduin.linuxfromscratch.org/sources/other/junit-4.11.jar - - - - - Required file: - http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz + url="http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz"> + http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz @@ -93,7 +86,7 @@ Installation of JUnit - To do a full build of JUnit from source, + + Place the required hamcrest jar files where needed and build the + package: -tar -xf ../hamcrest-1.3.tgz && -cp -v hamcrest-1.3/hamcrest-core-1.3{,-sources}.jar lib/ && +tar -xf ../hamcrest-&hamcrest-version;.tgz && +cp -v hamcrest-&hamcrest-version;/hamcrest-core-&hamcrest-version;{,-sources}.jar lib/ && ant dist Testing is automatically done as a part of the build step. @@ -123,7 +119,7 @@ chown -R root:root . && cp -v -R junit*/javadoc/* /usr/share/doc/junit-&junit-version; && cp -v junit*/junit*.jar /usr/share/java/junit-&junit-version; && -cp -v hamcrest-1.3/hamcrest-core*.jar /usr/share/java/junit-&junit-version; +cp -v hamcrest-&hamcrest-version;/hamcrest-core*.jar /usr/share/java/junit-&junit-version; Finally, update the CLASSPATH variable: diff --git a/general/prog/openjdk.xml b/general/prog/openjdk.xml index 14a86d40d5..96383922f0 100644 --- a/general/prog/openjdk.xml +++ b/general/prog/openjdk.xml @@ -265,6 +265,7 @@ Recommended + and diff --git a/general/prog/prog.xml b/general/prog/prog.xml index 40f6a426e6..757bea5606 100644 --- a/general/prog/prog.xml +++ b/general/prog/prog.xml @@ -62,8 +62,8 @@ $Date$ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index cbcfe857f7..2bd2d0a30c 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,16 @@ --> + + May 15th, 2014 + + + [pierre] - Update to apache-ant-1.9.4 and rearange java pages. + Fixes #5032. + + + + May 14th, 2014