Changeset debb88bf


Ignore:
Timestamp:
07/17/2013 02:09:25 PM (11 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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:
32d4980
Parents:
5b24455
Message:

Update to apache-ant-1.9.2

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

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r5b24455 rdebb88bf  
    329329<!-- Chapter 12 -->
    330330<!ENTITY acpid-version                "2.0.19">
    331 <!ENTITY apache-ant-version           "1.8.4">
     331<!ENTITY apache-ant-version           "1.9.2">
    332332<!ENTITY at-version                   "3.1.13">
    333333<!ENTITY autofs-version               "5.0.7">
    … …  
    380380<!ENTITY icedtea-version              "2.3.3">
    381381<!ENTITY openjdk-version              "1.7.0.40">
    382 <!ENTITY junit-version                "4.10">
     382<!ENTITY junit-version                "4.11">
    383383<!ENTITY librep-version               "0.92.2.1">
    384384<!ENTITY llvm-version                 "3.3">

  • general/prog/apache-ant.xml

    r5b24455 rdebb88bf  
    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        "c474fa9d0c35a24037c23b6e476862c1">
     9  <!ENTITY apache-ant-md5sum        "8f610c1a0183507c2beebbf230f456af">
    1010  <!ENTITY apache-ant-size          "3.2 MB">
    11   <!ENTITY apache-ant-buildsize     "66 MB">
    12   <!ENTITY apache-ant-time          "0.4 SBU">
     11  <!ENTITY apache-ant-buildsize     "120 MB">
     12  <!ENTITY apache-ant-time          "0.5 SBU">
    1313]>
    1414
    … …  
    2929  <sect2 role="package">
    3030    <title>Introduction to Apache Ant</title>
    31 
    32     <warning><para>Under revison do not use for now.</para></warning>
    33 
    3431
    3532    <para>The <application>Apache Ant</application> package is a
    … …  
    4340    that implements a particular task interface.</para>
    4441
    45     &lfs72_checked;
     42    &lfs73_checked;
    4643
    4744    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7168    <bridgehead renderas="sect4">Required</bridgehead>
    7269    <para role="required">
    73       <xref linkend="openjdk"/> <!-- or <xref linkend="jdk"/> -->
     70      A JDK (<xref linkend="java-bin"/> or <xref linkend="openjdk"/>)
    7471    </para>
    7572
    … …  
    9289      <application>Apache Ant</application>. Review the table at
    9390      <ulink url="http://ant.apache.org/manual/install.html#librarydependencies"/>
    94       for any prerequisite libraries you may need.</para>
     91      for any prerequisite libraries you may need. Place any needed libraries
     92      in <filename>lib/optional</filename>.</para>
    9593    </note>
    9694
    … …  
    10098    instructions (note that the tests will not be performed):</para>
    10199
    102 <screen><userinput>sed -i 's;jars,test-jar;jars;' build.xml</userinput></screen>
     100<screen><userinput>sed -i 's/jars,test-jar/jars/' build.xml</userinput></screen>
    103101
    104102    <para>otherwise copy the <application>junit</application> jar file to the
    105103    local directory tree.</para>
    106104
    107 <screen><userinput>cp -v /usr/share/junit-&junit-version;/junit-&junit-version;.jar lib/optional/junit.jar</userinput></screen>
     105<screen><userinput>cp -v /usr/share/java/junit-&junit-version;.jar lib/optional</userinput></screen>
    108106
    109107    <para>Install <application>Apache Ant</application> by running the following
    … …  
    125123    <title>Command Explanations</title>
    126124
    127     <para><command>sed -i 's;jars...</command>: If the
     125    <para><command>sed -i 's/jars...</command>: If the
    128126    <application>JUnit</application> package is not installed, the regression
    129127    tests cannot be performed.</para>
    130128
    131129    <para><command>cp -v
    132     /usr/share/junit-&junit-version;/&junit-version;.jar ...</command>:
     130    /usr/share/java/junit-&junit-version;.jar ...</command>:
    133131    This command copies the JUnit jar file into the directory where Apache Ant
    134132    will look for it.</para>

  • general/prog/java.xml

    r5b24455 rdebb88bf  
    77  <!ENTITY anduin-download             "http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-&openjdk-version;">
    88  <!ENTITY openjdk-download-binary-x86 "&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
    9   <!ENTITY openjdk-bin-md5sum-x86      "099f50edbd6b0f83b746c907032d5c">
     9  <!ENTITY openjdk-bin-md5sum-x86      "5a099f50edbd6b0f83b746c907032d5c">
    1010  <!ENTITY openjdk-bin-size-x86        "163 MB">
    11   <!ENTITY openjdk-bin-buildsize-x86   "464 MB">
     11  <!ENTITY openjdk-bin-buildsize-x86   "499 MB">
    1212
    1313  <!ENTITY openjdk-download-binary-x64 "&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz">
    1414  <!ENTITY openjdk-bin-md5sum-x64      "506ca98b2f4064c350ee08ab8f8f5416">
    1515  <!ENTITY openjdk-bin-size-x64        "146 MB">
    16   <!ENTITY openjdk-bin-buildsize-x64   "358 MB">
     16  <!ENTITY openjdk-bin-buildsize-x64   "421 MB">
    1717
    1818]>
    … …  
    6060
    6161  <para>The JVM can search for and use classes in jar files automatically.  It
    62   uses the <envar>CLASSPATH</envar> envronment variable to search for jar files.
    63   This a a standard list of colon-separated directory namesi similar to
    64   the <envar>PATH</envar> envronment variable.</para>
     62  uses the <envar>CLASSPATH</envar> environment variable to search for jar files.
     63  This is a standard list of colon-separated directory names similar to
     64  the <envar>PATH</envar> environment variable.</para>
    6565 
    6666  &lfs73_checked;
    6767
    68   <sect2 id="java-bin">
     68  <sect2 id="java-bin" xreflabel="Java Binary">
    6969    <title>Installing a binary JDK</title>
    7070
    … …  
    113113 
    114114    <para>Begin by extracting the appropriate binary tarball for your
    115     architeciture and changing to the extracted directory. Install the binary
     115    architecture and changing to the extracted directory. Install the binary
    116116    <application>OpenJDK</application> with the following commands as the
    117117    <systemitem class="username">root</systemitem> user:</para>

  • general/prog/junit.xml

    r5b24455 rdebb88bf  
    55  %general-entities;
    66
    7   <!ENTITY junit-download-http "&sourceforge-repo;/junit/junit&junit-version;.zip">
     7  <!ENTITY junit-download-http "https://launchpad.net/debian/+archive/primary/+files/junit4_4.11.orig.tar.gz">
    88  <!ENTITY junit-download-ftp  " ">
    9   <!ENTITY junit-md5sum        "0666bd1b9a7296ff2b6ee478c82a516b">
     9  <!ENTITY junit-md5sum        " ">
    1010  <!ENTITY junit-size          "1.7 MB">
    1111  <!ENTITY junit-buildsize     "15 MB">
    … …  
    3939    test data, and test runners for running tests.</para>
    4040
    41     &lfs72_checked;
     41<!--    &lfs73_checked; -->
    4242
    4343    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    6363    </itemizedlist>
    6464
     65    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
     66    <itemizedlist spacing="compact">
     67      <listitem>
     68        <para>
     69          <ulink url="http://anduin.linuxfromscratch.org/sources/other/junit-4.11.jar">junit-4.11.jar
     70          (http//anduin.linuxfromscratch.org/sources/other/junit-4.11.jar)
     71          </ulink>
     72        </para>
     73      </listitem>
     74      <listitem>
     75        <para>
     76          <ulink url="http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz">hamcrest-1.3.tgz
     77          (http//hamcrest.googlecode.com/files/hamcrest-1.3.tgz)
     78          </ulink>
     79        </para>
     80      </listitem>
     81    </itemizedlist>
     82 
    6583    <bridgehead renderas="sect3">JUnit Dependencies</bridgehead>
    6684
    6785    <bridgehead renderas="sect4">Required</bridgehead>
    68     <para role="required"><xref linkend="unzip"/></para>
     86    <para role="required">
     87      <xref linkend="unzip"/>
     88    </para>
    6989
    7090    <para condition="html" role="usernotes">User Notes:
    … …  
    7696    <title>Installation of JUnit</title>
    7797
    78     <para>Install <application>JUnit</application> by running the following
     98    <para>To do a full build of JUnit from source, <xref linkend='apache-ant'/>
     99    is required.  However JUnit is a circular depedency of Apache Ant.  Copy
     100    the JUnit jar file to get started.  Then come back to build from source, if
     101    desired.</para>
     102
     103    <para>Install the <application>JUnit</application> jar file by running the following
    79104    commands as the <systemitem class="username">root</systemitem> user:</para>
    80105
    81 <screen role="root"><userinput>install -v -m755 -d /usr/share/{,doc/}junit-&junit-version; &amp;&amp;
    82 chown -R root:root .                             &amp;&amp;
    83 cp -v -R junit* org  /usr/share/junit-&junit-version;       &amp;&amp;
    84 cp -v -R *.html *doc /usr/share/doc/junit-&junit-version;</userinput></screen>
     106<screen role="root"><userinput>install -v -m755 -d /usr/share/java &amp;&amp;
     107cp -v junit.jar  /usr/share/java</userinput></screen>
     108
     109    <para>Now install the required hamcrest jar files.  Extract the hamcrest-1.3.tgz
     110    files change to the extracted directory.  Then, as the
     111    <systemitem class="username">root</systemitem> user:</para>
     112
     113<screen role="root"><userinput>install -v -m755 -d /usr/share/java/hamcrest        &amp;&amp;
     114cp -v hamcrest-all-1.3.jar /usr/share/java/hamcrest &amp;&amp;
     115ln -sv  hamcrest/hamcrest-all-1.3.jar /usr/share/java/hamcrest.jar </userinput></screen>
    85116
    86117    <para>Add the <filename
    … …  
    90121
    91122<screen><userinput>export CLASSPATH=$CLASSPATH:\
    92    /usr/share/junit-&junit-version;/junit-&junit-version;.jar:/usr/share/junit-&junit-version;</userinput></screen>
    93 
     123/usr/share/java/junit-&junit-version;.jar:/usr/share/java/hamcrest.jar</userinput></screen>
     124<!--
    94125    <para>To run the <application>JUnit</application> regression self-tests,
    95     you'll need to have <xref linkend="openjdk"/>,<!-- <xref linkend="jdk"/>,--> or
     126    you'll need to have <xref linkend="openjdk"/>,<!- - <xref linkend="jdk"/>,- -> or
    96127    <ulink url="http://jikes.sourceforge.net/">Jikes</ulink> installed and the
    97128    <envar>CLASSPATH</envar> environment variable updated. Then, as an
    … …  
    99130
    100131<screen><userinput>java org.junit.runner.JUnitCore org.junit.tests.AllTests</userinput></screen>
    101 
     132-->
    102133  </sect2>
    103 
     134<!--
    104135  <sect2 role="content">
    105136    <title>Contents</title>
    … …  
    137168
    138169  </sect2>
    139 
     170-->
    140171</sect1>

  • introduction/welcome/changelog.xml

    r5b24455 rdebb88bf  
    4848      <itemizedlist>
    4949        <listitem>
     50          <para>[bdubbs] - Update to apache-ant-1.9.2.</para>
     51        </listitem>
     52        <listitem>
    5053          <para>[igor] - Bazaar-2.5.1.</para>
    5154        </listitem>
Note: See TracChangeset for help on using the changeset viewer.