Changeset c084a2a

Timestamp:

01/18/2019 09:10:31 PM (6 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 8.4, 9.0, 9.1, bdubbs/svn, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

7430906c

Parents:

18b9eae

Message:

Archive maven, archive junit, update to ant-1.10.5

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

Files:

• archive/junit.xml (moved) (moved from general/prog/junit.xml )
• archive/maven.xml (moved) (moved from general/prog/maven.xml )
• general/prog/apache-ant.xml (modified) (4 diffs)
• general/prog/prog.xml (modified) (1 diff)
• general/prog/subversion.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• pst/ps/fop.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (2 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>
 

general/prog/prog.xml

@@ -73 +73 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ojdk-conf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maven.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"/>
 
 </chapter>

general/prog/subversion.xml

@@ -126 +126 @@
       <ulink url="http://www.inet.no/dante/">Dante</ulink> or
       <ulink url="http://jikes.sourceforge.net/">Jikes</ulink>,
-      and <xref linkend="junit"/> (to test the Java bindings)
+      and <ulink url="https://junit.org/junit4/">JUnit 4</ulink>
+      (to test the Java bindings).
     </para>
 
@@ -196 +197 @@
       and the location of the JUnit jar has to be specified by passing the
       <option>--with-junit=&lt;path to junit jar&gt;</option> parameter to
-      <command>configure</command>.
+      <command>configure</command>. Note that <application>JUnit</application>
+      is included in <xref linkend="apache-ant"/>, and can be accessed by
+      passing <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option>
+      to <command>configure</command>.
     </para>
 

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>January 18th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Archive maven and junit. Fixes
+          <ulink url="&blfs-ticket-root;10548">#10548</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to apache-ant-1.10.5. Fixes
+          <ulink url="&blfs-ticket-root;11067">#11067</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbbs] - Update to inkscape-0.92.4. Fixes

packages.ent

@@ -351 +351 @@
 <!ENTITY yasm-version                 "1.3.0">
 
-<!ENTITY apache-ant-version           "1.10.4">
-<!ENTITY maven-version                "3.5.4">
+<!ENTITY apache-ant-version           "1.10.5">
+<!--
+<!ENTITY maven-version                "3.6.0">
 <!ENTITY junit-major                  "4">
 <!ENTITY junit-version                "4.12">
 <!ENTITY hamcrest-version             "1.3">
+-->
 <!ENTITY openjdk-version              "11.0.2">
 <!ENTITY openjdk-build                "7">

pst/ps/fop.xml

@@ -122 +122 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="junit"/> (to run tests),
+<!-- Included into ant      <xref linkend="junit"/> (to run tests),-->
       <xref linkend="x-window-system"/> (to run tests),
-      <xref linkend="maven"/> (an alternate build system),
+<!--      <xref linkend="maven"/> (an alternate build system), not funcional
+      with fop-2.3          -->
       <ulink url="https://java.net/projects/jai-imageio">JAI Image I/O Tools</ulink>, and
       <ulink url="http://jeuclid.sourceforge.net/">JEuclid</ulink>

xsoft/office/libreoffice.xml

@@ -220 +220 @@
       <xref linkend="gdb"/>,
       <xref linkend="gnutls"/>,
-      <xref linkend="junit"/>,
+<!-- not anymore in the book, but included in apache-ant
+     <xref linkend="junit"/>, -->
 <!--      <xref linkend="kdelibs"/>, -->
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
@@ -632 +633 @@
       other programs or in earlier versions of libreoffice
       <application>base</application>. You may also need to add:
-      <option>--with-junit=/opt/ant/lib/junit-&junit-version;.jar</option>
+      <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option>
       <option>--with-jdk-home=/opt/jdk</option>
-      <option>--with-hamcrest=/opt/ant/lib/hamcrest-core-&hamcrest-version;.jar</option>
+      <option>--with-hamcrest=/opt/ant/lib/hamcrest-core-1.3.jar</option>
     </para>