Changeset d60cd837 for general/prog/apache-ant.xml

Timestamp:

02/03/2019 06:37:53 PM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

4d176c4f

Parents:

8f6f10e

Message:

Merge to HEAD 21080.

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

File:

• general/prog/apache-ant.xml (modified) (4 diffs)

general/prog/apache-ant.xml

@@ -7 +7 @@
   <!ENTITY apache-ant-download-http "https://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.xz">
   <!ENTITY apache-ant-download-ftp  " ">
-  <!ENTITY apache-ant-md5sum        "a8297467f7d13873897ff4418ff1e932">
+  <!ENTITY apache-ant-md5sum        "0e52ab84fdfae1c3a675d2746409a52c">
   <!ENTITY apache-ant-size          "4.0 MB">
-  <!ENTITY apache-ant-buildsize     "264 MB">
-  <!ENTITY apache-ant-time          "0.2 SBU (excluding download time)">
+  <!ENTITY apache-ant-buildsize     "186 MB">
+  <!ENTITY apache-ant-time          "0.4 SBU (excluding download time)">
 ]>
 
@@ -112 +112 @@
   <sect2 role="installation">
     <title>Installation of Apache Ant</title>
-<!--
-    <note><para>Several dependent packages have moved since the packaging of
-    <application>Ant</application> requiring download of the above extra files.
-    Copy those files into the source tree with the following
-    commands:</para></note>
-
-<screen><userinput>cp -v ../jai-core-1.1.3.jar  \
-      ../jai-codec-1.1.3.jar \
-      ../xz-1.0.jar  lib     &amp;&amp;
-unzip -p ../NetRexx-3.06-GA.zip lib/NetRexxC.jar > lib/NetRexxC.jar</userinput></screen>
--->
+
+    <para>
+      First fix an incompatibility issue between the documentation standard
+      used in the build tree, and the one expected by <xref
+      linkend="openjdk"/>:
+    </para>
+
+<screen><userinput>sed -i 's/--add-modules java.activation/-html4/' build.xml</userinput></screen>
+
     <para>
       Build a limited bootstrap version of <application>Apache
@@ -135 +133 @@
     </para>
 
-<screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=system &amp;&amp;
-cp -v lib/*.jar lib/optional/</userinput></screen>
+<screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=optional</userinput></screen>
 
     <para>
@@ -159 +156 @@
 
     <para>
-      <command>bootstrap/bin/ant -f fetch.xml -Ddest=system</command>:
+      <command>bootstrap/bin/ant -f fetch.xml -Ddest=optional</command>:
       Downloads the missing dependencies to user's home directory, and copy
-      them into the source tree (in the <filename>lib/</filename> directory).
-    </para>
-
-    <para>
-      <command>cp -v ... lib/optional</command>: This command copies the
-      previously downloaded jar files to the expected place in the source
-      tree so that <command>ant</command> picks them up at buld time.
+      them into the source tree (in the <filename>lib/optional</filename>
+      directory, where <command>ant</command> picks them up at build time).
     </para>