r4954 - in trunk: BOOK BOOK/general/sysutils BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Aug 19 13:59:21 PDT 2005


Author: randy
Date: 2005-08-19 14:59:19 -0600 (Fri, 19 Aug 2005)
New Revision: 4954

Added:
   trunk/patches/apache-ant-1.6.5-blfs_install-1.patch
Removed:
   trunk/patches/apache-ant-1.6.2-blfs_install-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/sysutils/apache-ant.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to Apache Ant-1.6.5

Modified: trunk/BOOK/general/sysutils/apache-ant.xml
===================================================================
--- trunk/BOOK/general/sysutils/apache-ant.xml	2005-08-19 18:07:41 UTC (rev 4953)
+++ trunk/BOOK/general/sysutils/apache-ant.xml	2005-08-19 20:59:19 UTC (rev 4954)
@@ -6,10 +6,10 @@
 
   <!ENTITY apache-ant-download-http "http://archive.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        "83c3adefdbf90bcbc4b804d4c55c0778">
+  <!ENTITY apache-ant-md5sum        "80a7ad191c40b7d8c82533524b282b6b">
   <!ENTITY apache-ant-size          "6.2 MB">
-  <!ENTITY apache-ant-buildsize     "92 MB">
-  <!ENTITY apache-ant-time          "0.47 SBU">
+  <!ENTITY apache-ant-buildsize     "94.5 MB">
+  <!ENTITY apache-ant-time          "0.4 SBU">
 ]>
 
 <sect1 id="apache-ant" xreflabel="Apache Ant-&apache-ant-version;">
@@ -112,7 +112,7 @@
     <title>Command Explanations</title>
 
     <para><command>./build.sh -Ddist.dir=/opt/ant-&apache-ant-version;
-    dist</command>: This command does everything. It builds the package, then
+    dist</command>: This command does everything. It builds, then
     installs the package into
     <filename class='directory'>/opt/ant-&apache-ant-version;</filename>.</para>
 
@@ -294,4 +294,3 @@
   </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-08-19 18:07:41 UTC (rev 4953)
+++ trunk/BOOK/general.ent	2005-08-19 20:59:19 UTC (rev 4954)
@@ -133,7 +133,7 @@
 <!ENTITY cpio-version                 "2.6">
 <!ENTITY mc-version                   "4.6.1">
 <!ENTITY sysstat-version              "6.0.0">
-<!ENTITY apache-ant-version           "1.6.2">
+<!ENTITY apache-ant-version           "1.6.5">
 
 <!-- Chapter 12 -->
 <!ENTITY dejagnu-version              "1.4.4">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-08-19 18:07:41 UTC (rev 4953)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-08-19 20:59:19 UTC (rev 4954)
@@ -44,6 +44,9 @@
       <para>August 19th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to Apache Ant-1.6.5.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to Nail-11.25.</para>
         </listitem>
         <listitem>

Deleted: trunk/patches/apache-ant-1.6.2-blfs_install-1.patch
===================================================================
--- trunk/patches/apache-ant-1.6.2-blfs_install-1.patch	2005-08-19 18:07:41 UTC (rev 4953)
+++ trunk/patches/apache-ant-1.6.2-blfs_install-1.patch	2005-08-19 20:59:19 UTC (rev 4954)
@@ -1,65 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2004-11-29
-Initial Package Version: 1.6.2
-Upstream Status:         Not submitted (LFS/FHS specific)
-Origin:                  Randy McMurchy
-Description:             Modifies the installation layout to conform with 
-                         LFS and FHS Guidelines
-
-$LastChangedBy$
-$Date$
-
-diff -Naur apache-ant-1.6.2-orig/build.xml apache-ant-1.6.2/build.xml
---- apache-ant-1.6.2-orig/build.xml	2004-07-16 07:57:30.000000000 +0000
-+++ apache-ant-1.6.2/build.xml	2004-11-30 04:13:56.360978512 +0000
-@@ -121,7 +121,8 @@
-   <property name="dist.bin" value="${dist.dir}/bin"/>
-   <property name="dist.lib" value="${dist.dir}/lib"/>
-   <property name="dist.docs" value="${dist.dir}/docs"/>
--  <property name="dist.etc" value="${dist.dir}/etc"/>
-+  <property name="dist.readme" value="${dist.dir}/readme"/>
-+  <property name="dist.etc" value="/etc/ant"/>
-   <property name="dist.javadocs" value="${dist.dir}/docs/manual/api"/>
- 
-   <property name="src.dist.dir" value="dist-src"/>
-@@ -921,6 +922,7 @@
-     <mkdir dir="${dist.dir}"/>
-     <mkdir dir="${dist.bin}"/>
-     <mkdir dir="${dist.lib}"/>
-+    <mkdir dir="${dist.readme}"/>
- 
-     <copy todir="${dist.lib}">
-       <fileset dir="${build.lib}">
-@@ -999,7 +1001,7 @@
-       </fileset>
-     </copy>
- 
--    <copy todir="${dist.dir}">
-+    <copy todir="${dist.readme}">
-       <fileset dir=".">
-         <include name="README"/>
-         <include name="LICENSE"/>
-
-diff -Naur apache-ant-1.6.2-orig/src/script/ant apache-ant-1.6.2/src/script/ant
---- apache-ant-1.6.2-orig/src/script/ant        2004-07-16 07:56:50.000000000 +0000
-+++ apache-ant-1.6.2/src/script/ant     2004-11-30 07:12:48.328471464 +0000
-@@ -44,8 +44,8 @@
-   usejikes=$use_jikes_default
- else
-   # load system-wide ant configuration
--  if [ -f "/etc/ant.conf" ] ; then
--    . /etc/ant.conf
-+  if [ -f "/etc/ant/ant.conf" ] ; then
-+    . /etc/ant/ant.conf
-   fi
-
-   # load user ant configuration
-@@ -244,7 +244,7 @@
-   echo $0 '[script options] [options] [target [target2 [target3] ..]]'
-   echo 'Script Options:'
-   echo '  --help, --h            print this message and ant help'
--  echo '  --noconfig             suppress sourcing of /etc/ant.conf,'
-+  echo '  --noconfig             suppress sourcing of /etc/ant/ant.conf,'
-   echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
-   echo '                         configuration files'
-   echo '  --usejikes             enable use of jikes by default, unless'

Added: trunk/patches/apache-ant-1.6.5-blfs_install-1.patch
===================================================================
--- trunk/patches/apache-ant-1.6.5-blfs_install-1.patch	2005-08-19 18:07:41 UTC (rev 4953)
+++ trunk/patches/apache-ant-1.6.5-blfs_install-1.patch	2005-08-19 20:59:19 UTC (rev 4954)
@@ -0,0 +1,66 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-19
+Initial Package Version: 1.6.5 (modified version of the 1.6.2 patch - more than a rediff)
+Upstream Status:         Not submitted (LFS/FHS specific)
+Origin:                  Randy McMurchy
+Description:             Modifies the installation layout to conform with 
+                         LFS and FHS Guidelines
+
+$LastChangedBy$
+$Date$
+
+
+diff -Naur apache-ant-1.6.5-orig/build.xml apache-ant-1.6.5/build.xml
+--- apache-ant-1.6.5-orig/build.xml	2005-06-02 13:19:54.000000000 +0000
++++ apache-ant-1.6.5/build.xml	2005-08-19 18:55:55.000000000 +0000
+@@ -125,7 +125,8 @@
+   <property name="dist.bin" value="${dist.dir}/bin"/>
+   <property name="dist.lib" value="${dist.dir}/lib"/>
+   <property name="dist.docs" value="${dist.dir}/docs"/>
+-  <property name="dist.etc" value="${dist.dir}/etc"/>
++  <property name="dist.readme" value="${dist.dir}/docs/readme"/>
++  <property name="dist.etc" value="/etc/ant"/>
+   <property name="dist.javadocs" value="${dist.dir}/docs/manual/api"/>
+ 
+   <property name="src.dist.dir" value="dist-src"/>
+@@ -902,6 +903,7 @@
+     <mkdir dir="${dist.dir}"/>
+     <mkdir dir="${dist.bin}"/>
+     <mkdir dir="${dist.lib}"/>
++    <mkdir dir="${dist.readme}"/>
+ 
+     <copy todir="${dist.lib}">
+       <fileset dir="${build.lib}">
+@@ -980,7 +982,7 @@
+       </fileset>
+     </copy>
+ 
+-    <copy todir="${dist.dir}">
++    <copy todir="${dist.readme}">
+       <fileset dir=".">
+         <include name="README"/>
+         <include name="INSTALL"/>
+
+diff -Naur apache-ant-1.6.5-orig/src/script/ant apache-ant-1.6.5/src/script/ant
+--- apache-ant-1.6.5-orig/src/script/ant	2005-06-02 13:19:04.000000000 +0000
++++ apache-ant-1.6.5/src/script/ant	2005-08-19 18:55:55.000000000 +0000
+@@ -44,8 +44,8 @@
+   usejikes=$use_jikes_default
+ else
+   # load system-wide ant configuration
+-  if [ -f "/etc/ant.conf" ] ; then
+-    . /etc/ant.conf
++  if [ -f "/etc/ant/ant.conf" ] ; then
++    . /etc/ant/ant.conf
+   fi
+ 
+   # load user ant configuration
+@@ -241,7 +241,7 @@
+   echo $0 '[script options] [options] [target [target2 [target3] ..]]'
+   echo 'Script Options:'
+   echo '  --help, --h            print this message and ant help'
+-  echo '  --noconfig             suppress sourcing of /etc/ant.conf,'
++  echo '  --noconfig             suppress sourcing of /etc/ant/ant.conf,'
+   echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
+   echo '                         configuration files'
+   echo '  --usejikes             enable use of jikes by default, unless'


Property changes on: trunk/patches/apache-ant-1.6.5-blfs_install-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list