Changeset 6dc9fd3 for general


Ignore:
Timestamp:
05/15/2014 04:22:53 PM (10 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 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:
19cc928
Parents:
231d5eb
Message:

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

Location:
general/prog
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general/prog/apache-ant.xml

    r231d5eb r6dc9fd3  
    77  <!ENTITY apache-ant-download-http "http://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.bz2">
    88  <!ENTITY apache-ant-download-ftp  " ">
    9   <!ENTITY apache-ant-md5sum        "995f21618acdf35beacc465c84d79534">
    10   <!ENTITY apache-ant-size          "3.3 MB">
    11   <!ENTITY apache-ant-buildsize     "105 MB">
    12   <!ENTITY apache-ant-time          "0.2 SBU">
     9  <!ENTITY apache-ant-md5sum        "7a7253ec047195d755c5318a4de8a3a4">
     10  <!ENTITY apache-ant-size          "3.6 MB">
     11  <!ENTITY apache-ant-buildsize     "108 MB">
     12  <!ENTITY apache-ant-time          "0.3 SBU">
    1313]>
    1414
    … …  
    6464    </itemizedlist>
    6565
     66    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     67    <itemizedlist spacing="compact">
     68      <listitem>
     69        <para>
     70          Required file: <ulink
     71             url="http://anduin.linuxfromscratch.org/sources/other/junit-&junit-version;.jar">
     72                  http://anduin.linuxfromscratch.org/sources/other/junit-&junit-version;.jar</ulink>
     73        </para>
     74      </listitem>
     75      <listitem>
     76        <para>
     77          Required file: <ulink
     78             url="http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz">
     79                  http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz </ulink>
     80        </para>
     81      </listitem>
     82      <listitem>
     83        <para>Optional documentation: <ulink
     84      url="https://archive.apache.org/dist/ant/manual/apache-ant-&apache-ant-version;-manual.tar.bz2">
     85           https://archive.apache.org/dist/ant/manual/apache-ant-&apache-ant-version;-manual.tar.bz2
     86                                      </ulink>
     87        </para>
     88      </listitem>
     89    </itemizedlist>
     90
    6691    <bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
    6792
    … …  
    7297    </para>
    7398
    74     <bridgehead renderas="sect4">Recommended</bridgehead>
     99<!--    <bridgehead renderas="sect4">Recommended</bridgehead>
    75100    <para role="recommended">
    76101      <xref linkend="junit"/>
    77102    </para>
    78 
     103-->
    79104    <para condition="html" role="usernotes">User Notes:
    80105    <ulink url="&blfs-wiki;/apache-ant"/></para>
    … …  
    94119    </note>
    95120
    96     <para>If it is not possible to install the recommended
     121<!--    <para>If it is not possible to install the recommended
    97122    <application>JUnit</application> package, install
    98123    <application>Apache Ant</application> by removing the reference to the test
    … …  
    100125
    101126<screen><userinput>sed -i 's/jars,test-jar/jars/' build.xml</userinput></screen>
    102 
    103     <para>otherwise copy the <application>junit</application> jar file to the
     127-->
     128    <para>Unpack and copy the <application>junit</application> and
     129    <application>hamcrest</application> jar files to the
    104130    local directory tree.</para>
    105131
    106 <screen><userinput>cp -v /usr/share/java/junit-&junit-version;.jar lib/optional</userinput></screen>
     132<screen><userinput>tar -xvf ../hamcrest-&hamcrest-version;.tgz &amp;&amp;
     133cp -v ../junit-&junit-version;.jar \
     134      hamcrest-&hamcrest-version;/hamcrest-core-&hamcrest-version;.jar lib/optional</userinput></screen>
     135
     136    <para>If you wish to install the documentation, unpack it:</para>
     137
     138<screen><userinput>tar -xvf ../apache-ant-&apache-ant-version;-manual.tar.bz2</userinput></screen>
    107139
    108140    <para>Install <application>Apache Ant</application> by running the following
    … …  
    119151  <systemitem class="username">root</systemitem> user.</para></note>
    120152
     153    <para>Install the documentation as the
     154    <systemitem class="username">root</systemitem> user:</para>
     155
     156<screen role="root"><userinput>install -m755 -d /opt/ant-&apache-ant-version;/docs &amp;&amp;
     157cp -Rv apache-ant-&apache-ant-version;/* /opt/ant-&apache-ant-version;/docs</userinput></screen>
     158
    121159  </sect2>
    122160
    … …  
    124162    <title>Command Explanations</title>
    125163
    126     <para><command>sed -i 's/jars...</command>: If the
     164<!--    <para><command>sed -i 's/jars...</command>: If the
    127165    <application>JUnit</application> package is not installed, the regression
    128166    tests cannot be performed.</para>
    129 
    130     <para><command>cp -v
    131     /usr/share/java/junit-&junit-version;.jar ...</command>:
    132     This command copies the JUnit jar file into the directory where Apache Ant
    133     will look for it.</para>
     167-->
     168    <para><command>cp -v ... lib/optional</command>:
     169    This command copies the JUnit and hamcrest jar files into the directory where
     170    Apache Ant will look for it.</para>
    134171
    135172    <para><command>./build.sh -Ddist.dir=/opt/ant-&apache-ant-version;

  • general/prog/junit.xml

    r231d5eb r6dc9fd3  
    55  %general-entities;
    66
    7   <!ENTITY junit-download-http "https://launchpad.net/debian/+archive/primary/+files/junit4_4.11.orig.tar.gz">
     7  <!ENTITY junit-download-http "https://launchpad.net/debian/+archive/primary/+files/junit4_&junit-version;.orig.tar.gz">
    88  <!ENTITY junit-download-ftp  " ">
    99  <!ENTITY junit-md5sum        "b4d163832583dcec8bedb5427c795cc4">
    … …  
    6565        <para>
    6666          Required file: <ulink
    67              url="http://anduin.linuxfromscratch.org/sources/other/junit-4.11.jar">
    68                   http://anduin.linuxfromscratch.org/sources/other/junit-4.11.jar</ulink>
    69         </para>
    70       </listitem>
    71       <listitem>
    72         <para>
    73           Required file: <ulink
    74              url="http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz">
    75                   http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz </ulink>
     67             url="http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz">
     68                  http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz </ulink>
    7669        </para>
    7770      </listitem>
    … …  
    9487    <title>Installation of JUnit</title>
    9588
    96     <para>To do a full build of JUnit from source, <xref linkend='apache-ant'/>
     89<!--    <para>To do a full build of JUnit from source, <xref linkend='apache-ant'/>
    9790    is required.  However JUnit is useful in building Apache Ant.  Copy the
    9891    JUnit-&junit-version; jar file to get started.  Then come back to build
    … …  
    109102    extracting the JUnit sources, place the required hamcrest jar files where
    110103    needed and build the package:</para>
     104-->
     105    <para>Place the required hamcrest jar files where needed and build the
     106    package:</para>
    111107
    112 <screen><userinput>tar -xf ../hamcrest-1.3.tgz                              &amp;&amp;
    113 cp -v hamcrest-1.3/hamcrest-core-1.3{,-sources}.jar lib/ &amp;&amp;
     108<screen><userinput>tar -xf ../hamcrest-&hamcrest-version;.tgz                              &amp;&amp;
     109cp -v hamcrest-&hamcrest-version;/hamcrest-core-&hamcrest-version;{,-sources}.jar lib/ &amp;&amp;
    114110ant dist</userinput></screen>
    115111
    … …  
    124120cp -v -R junit*/javadoc/*             /usr/share/doc/junit-&junit-version;  &amp;&amp;
    125121cp -v junit*/junit*.jar               /usr/share/java/junit-&junit-version; &amp;&amp;
    126 cp -v hamcrest-1.3/hamcrest-core*.jar /usr/share/java/junit-&junit-version;</userinput></screen>
     122cp -v hamcrest-&hamcrest-version;/hamcrest-core*.jar /usr/share/java/junit-&junit-version;</userinput></screen>
    127123   
    128124    <para>Finally, update the <envar>CLASSPATH</envar> variable:</para>

  • general/prog/openjdk.xml

    r231d5eb r6dc9fd3  
    266266    <bridgehead renderas="sect4">Recommended</bridgehead>
    267267    <para role="recommended">
     268      <xref linkend="junit"/> and
    268269      <xref linkend="nss"/>
    269270    </para>

  • general/prog/prog.xml

    r231d5eb r6dc9fd3  
    6363  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-java.xml"/>
    6464  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="java.xml"/>
     65  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-ant.xml"/>
    6566  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="junit.xml"/>
    66   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-ant.xml"/>
    6767  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
    6868
Note: See TracChangeset for help on using the changeset viewer.