Changeset 915403df for general

Timestamp:

03/23/2007 03:28:50 PM (17 years ago)

Author:

Randy McMurchy <randy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

be713ab

Parents:

2876fbf

Message:

Updated to Apache Ant-1.7.0

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6685 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/sysutils/apache-ant.xml (modified) (8 diffs)

general/sysutils/apache-ant.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY apache-ant-download-http "http://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.bz2">
+  <!ENTITY apache-ant-download-http "http://apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.bz2">
   <!ENTITY apache-ant-download-ftp  "ftp://ftp.oregonstate.edu/pub/apache/ant/source/apache-ant-&apache-ant-version;-src.tar.bz2">
-  <!ENTITY apache-ant-md5sum        "80a7ad191c40b7d8c82533524b282b6b">
-  <!ENTITY apache-ant-size          "6.2 MB">
-  <!ENTITY apache-ant-buildsize     "94.5 MB">
+  <!ENTITY apache-ant-md5sum        "22b378e27ab300e4d73bf09d91c7e2a6">
+  <!ENTITY apache-ant-size          "6.8 MB">
+  <!ENTITY apache-ant-buildsize     "109 MB">
   <!ENTITY apache-ant-time          "0.4 SBU">
 ]>
@@ -61 +61 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -67 +67 @@
         url="&patch-root;/apache-ant-&apache-ant-version;-blfs_install-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="jdk"/></para>
+    <para role="required"><xref linkend="jdk"/> and
+    <xref linkend="junit"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -87 +88 @@
       <application>Apache Ant</application>. Review the table at
       <ulink url="http://ant.apache.org/manual/install.html#librarydependencies"/>
-      for any prerequisite libraries you may need. One such library is the
+      for any prerequisite libraries you may need.</para>
+
+      <!-- <para>One such library is the
       <application>JUnit</application>-3.8.1 testing framework library. Many
       Ant-installed packages will use this library to perform the unit tests
@@ -96 +99 @@
       into the <filename class='directory'>lib</filename> subdirectory of the
       <application>Apache Ant</application> source tree before beginning the
-      <application>Apache Ant</application> build.</para>
+      <application>Apache Ant</application> build.</para> -->
     </note>
 
@@ -102 +105 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../apache-ant-&apache-ant-version;-blfs_install-1.patch</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
+<screen><userinput>sed -i 's|${dist.dir}/etc|/etc/ant|'        build.xml
+sed -i 's|/etc/ant.conf|/etc/ant/ant.conf|' src/script/ant</userinput></screen>
+
+    <para>The unit regression tests are performed in the build step below.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -117 +121 @@
     <title>Command Explanations</title>
 
+    <para><command>sed ...</command>: These commands change the configuration
+    directory to <filename class='directory'>/etc/ant</filename> to conform
+    with FHS guidelines.</para>
+
     <para><command>./build.sh -Ddist.dir=/opt/ant-&apache-ant-version;
-    dist</command>: This command does everything. It builds, then
+    dist</command>: This command does everything. It builds, tests, then
     installs the package into
     <filename class='directory'>/opt/ant-&apache-ant-version;</filename>.</para>
 
     <para><command>ln -v -sf /etc/ant /opt/ant-&apache-ant-version;/etc</command>:
-    The patch changes the configuration directory to
-    <filename class='directory'>/etc/ant</filename> to conform with
-    FHS guidelines. This command creates a symlink from the
-    configuration directory back to the installation directory as the package is
-    expecting to find the files there.</para>
+    The <command>sed</command> commands change the configuration directory to
+    <filename class='directory'>/etc/ant</filename> and this command creates a
+    symlink from the configuration directory back to the installation directory
+    as the package is expecting to find some files there.</para>
 
     <para><command>ln -v -sf ant-&apache-ant-version; /opt/ant</command>: This
@@ -184 +191 @@
       <seglistitem>
         <seg>ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py</seg>
-        <seg>ant-*.jar, xercesImpl.jar, and xml-apis.jar</seg>
+        <seg>ant.jar, ant-*.jar, xercesImpl.jar, and xml-apis.jar</seg>
         <seg>/etc/ant and /opt/ant-&apache-ant-version;</seg>
       </seglistitem>