Return-Path:
and the called build file ( will not override as well as will neither override .
8. A few misc spots where HTML entities needed to be tweaked.
Things not addressed by this patch:
How should multi line tags closing /> or > be placed. That is a bit of a
holy war. ;) Same with spacing of name=values on multi-line.
Why this patch was done:
I find it nicer if all the examples follow a consistent style, and found a
few other things to fix while doing this.
Also, if some of this patch is too zealous, let me know, I can submit more
conservative patches for specific problems.
-- Larry
------_=_NextPart_000_01C24A1D.8362C330
Content-Type: application/octet-stream;
name="ant.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="ant.patch"
Index: build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/build.xml,v
retrieving revision 1.314
diff -u -r1.314 build.xml
--- build.xml 5 Aug 2002 08:34:01 -0000 1.314
+++ build.xml 22 Aug 2002 20:04:31 -0000
@@ -13,9 +13,9 @@
=20
-
+40 -> Black
+41 -> Red
+42 -> Green
+43 -> Yellow
+44 -> Blue
+45 -> Magenta
+46 -> Cyan
+47 -> White
=20
<target name=3D"clean" depends=3D"clean-intf, =
clean-impl">
+
=20
If you give targets a description tag, then calling ant
-projecthelp will list all tasks with their description as 'main =
targets', and=20
Index: docs/faq.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/docs/faq.html,v
retrieving revision 1.34
diff -u -r1.34 faq.html
--- docs/faq.html 30 Jul 2002 15:00:39 -0000 1.34
+++ docs/faq.html 22 Aug 2002 20:04:32 -0000
@@ -845,8 +845,8 @@
<target name=3D"clean" depends=3D"clean-intf, =
clean-impl">
</target>
=20
-<target name=3D"clean-intf" >
- <ant dir=3D"intf" target=3D"clean" />
+<target name=3D"clean-intf">
+ <ant dir=3D"intf" target=3D"clean"/>
</target>
=20
<target name=3D"clean-impl">
- <ant dir=3D"impl" target=3D"clean" />
-</target>
+ <ant dir=3D"impl" target=3D"clean"/>
+</target>
<exec executable=3D"cat">
- <arg value=3D"<" />
- <arg value=3D"foo" />
+ <arg value=3D"<"/>
+ <arg value=3D"foo"/>
</exec>
@@ -872,8 +872,8 @@
<exec executable=3D"/bin/sh">
- <arg value=3D"-c" />
- <arg value=3D"cat < foo" />
+ <arg value=3D"-c"/>
+ <arg value=3D"cat < foo"/>
</exec>
@@ -1124,12 +1124,12 @@
<condition property=3D"cond-is-true">
<and>
<not>
- <equals arg1=3D"${prop1}" =
arg2=3D"$${prop1}" />
+ <equals arg1=3D"${prop1}" =
arg2=3D"$${prop1}"/>
</not>
<not>
- <equals arg1=3D"${prop2}" =
arg2=3D"$${prop2}" />
+ <equals arg1=3D"${prop2}" =
arg2=3D"$${prop2}"/>
</not>
- <equals arg1=3D"${prop3}" =
arg2=3D"$${prop3}" />
+ <equals arg1=3D"${prop3}" =
arg2=3D"$${prop3}"/>
</and>
</condition>
</target>
Index: docs/manual/develop.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/docs/manual/develop.html,v
retrieving revision 1.11
diff -u -r1.11 develop.html
--- docs/manual/develop.html 1 Jun 2002 12:26:32 -0000 1.11
+++ docs/manual/develop.html 22 Aug 2002 20:04:33 -0000
@@ -283,7 +283,7 @@
=20
<project name=3D"OwnTaskExample2" =
default=3D"main" basedir=3D".">
=20
- <target name=3D"build" >
+ <target name=3D"build">
<mkdir dir=3D"build"/>
<javac srcdir=3D"source" =
destdir=3D"build"/>
</target>
Index: docs/manual/listeners.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/docs/manual/listeners.html,v
retrieving revision 1.10
diff -u -r1.10 listeners.html
--- docs/manual/listeners.html 8 Aug 2002 19:05:03 -0000 1.10
+++ docs/manual/listeners.html 22 Aug 2002 20:04:33 -0000
@@ -213,33 +213,33 @@
AnsiColorLogger.*=3DAttribute;Foreground;Background
=20
Attribute is one of the following:
-0 -> Reset All Attributes (return to normal mode)
-1 -> Bright (Usually turns on BOLD)
-2 -> Dim
-3 -> Underline
-5 -> link
-7 -> Reverse
-8 -> Hidden
+0 -> Reset All Attributes (return to normal mode)
+1 -> Bright (Usually turns on BOLD)
+2 -> Dim
+3 -> Underline
+5 -> link
+7 -> Reverse
+8 -> Hidden
=20
Foreground is one of the following:
-30 -> Black
-31 -> Red
-32 -> Green
-33 -> Yellow
-34 -> Blue
-35 -> Magenta
-36 -> Cyan
-37 -> White
+30 -> Black
+31 -> Red
+32 -> Green
+33 -> Yellow
+34 -> Blue
+35 -> Magenta
+36 -> Cyan
+37 -> White
=20
Background is one of the following:
-40 -> Black
-41 -> Red
-42 -> Green
-43 -> Yellow
-44 -> Blue
-45 -> Magenta
-46 -> Cyan
-47 -> White
=20
Index: docs/manual/using.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/docs/manual/using.html,v
retrieving revision 1.26
diff -u -r1.26 using.html
--- docs/manual/using.html 9 Aug 2002 08:49:45 -0000 1.26
+++ docs/manual/using.html 22 Aug 2002 20:04:33 -0000
@@ -261,13 +261,13 @@
</target>
=20
<target name=3D"compile" depends=3D"init"
- description=3D"compile the source " >
+ description=3D"compile the source">
<!-- Compile the java code from ${src} into ${build} -->
<javac srcdir=3D"${src}" =
destdir=3D"${build}"/>
</target>
=20
<target name=3D"dist" depends=3D"compile"
- description=3D"generate the distribution" >
+ description=3D"generate the distribution">
<!-- Create the distribution directory -->
<mkdir dir=3D"${dist}/lib"/>
=20
@@ -276,7 +276,7 @@
</target>
=20
<target name=3D"clean"
- description=3D"clean up" >
+ description=3D"clean up">
<!-- Delete the ${build} and ${dist} directory trees -->
<delete dir=3D"${build}"/>
<delete dir=3D"${dist}"/>
@@ -481,7 +481,7 @@
<project ... >
<target ... >
- <rmic ...>
+ <rmic ... >
<classpath>
<pathelement location=3D"lib/"/>
<pathelement path=3D"${java.class.path}/"/>
@@ -491,7 +491,7 @@
</target>
=20
<target ... >
- <javac ...>
+ <javac ... >
<classpath>
<pathelement location=3D"lib/"/>
<pathelement path=3D"${java.class.path}/"/>
@@ -511,13 +511,13 @@
</path>
=20
<target ... >
- <rmic ...>
+ <rmic ... >
<classpath refid=3D"project.class.path"/>
</rmic>
</target>
=20
<target ... >
- <javac ...>
+ <javac ... >
<classpath refid=3D"project.class.path"/>
</javac>
</target>
Index: docs/manual/CoreTasks/ant.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/docs/manual/CoreTasks/ant.html,v
retrieving revision 1.15
diff -u -r1.15 ant.html
--- docs/manual/CoreTasks/ant.html 1 Jun 2002 12:26:33 -0000 1.15
+++ docs/manual/CoreTasks/ant.html 22 Aug 2002 20:04:33 -0000
@@ -172,10 +172,10 @@
<path id=3D"path1">
...
- </>
+ </path>
<path id=3D"path2">
...
- </>
+ </path>
=20
subbuild.xml
) also defines
@@ -183,7 +183,7 @@
path2
is not defined:
- <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"true" />
+ <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"true"/>
=20
subbuild
's definition of
@@ -191,21 +191,21 @@
path2
available in the subbuild.
- <ant antfile=3D"subbuild.xml" />
+ <ant antfile=3D"subbuild.xml"/>
=20
- <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false" />
+ <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false"/>
=20
path1
nor copy
path2
.
- <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false" >
- <reference refid=3D"path1" />
+ <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false">
+ <reference refid=3D"path1"/>
</ant>
=20
@@ -213,8 +213,8 @@
path1
.
- <ant antfile=3D"subbuild.xml" = inheritrefs=3D"false" > - <reference refid=3D"path1" = torefid=3D"path2" /> + <ant antfile=3D"subbuild.xml" = inheritrefs=3D"false"> + <reference refid=3D"path1" = torefid=3D"path2"/> </ant>=20 Index: docs/manual/CoreTasks/antcall.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: = /home/cvspublic/jakarta-ant/docs/manual/CoreTasks/antcall.html,v retrieving revision 1.12 diff -u -r1.12 antcall.html --- docs/manual/CoreTasks/antcall.html 1 Jun 2002 12:26:33 -0000 1.12 +++ docs/manual/CoreTasks/antcall.html 22 Aug 2002 20:04:33 -0000 @@ -105,7 +105,7 @@ =20
<antcall ... > - <reference refid=3D"path1" = torefid=3D"path2" /> + <reference refid=3D"path1" = torefid=3D"path2"/> </antcall>=20 Index: docs/manual/CoreTasks/apply.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: = /home/cvspublic/jakarta-ant/docs/manual/CoreTasks/apply.html,v retrieving revision 1.16 diff -u -r1.16 apply.html --- docs/manual/CoreTasks/apply.html 22 Jun 2002 23:38:27 -0000 1.16 +++ docs/manual/CoreTasks/apply.html 22 Aug 2002 20:04:33 -0000 @@ -157,7 +157,7 @@ description in the section about exec
-<apply executable=3D"ls" > +<apply executable=3D"ls"> <arg value=3D"-l"/> <fileset dir=3D"/tmp"> <patternset> @@ -172,7 +172,7 @@ files of the FileSet withid
other.files
to the command line.-<apply executable=3D"somecommand" = parallel=3D"false" > +<apply executable=3D"somecommand" = parallel=3D"false"> <arg value=3D"arg1"/> <srcfile/> <arg value=3D"arg2"/> Index: docs/manual/CoreTasks/common.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: = /home/cvspublic/jakarta-ant/docs/manual/CoreTasks/common.html,v retrieving revision 1.4 diff -u -r1.4 common.html --- docs/manual/CoreTasks/common.html 3 Feb 2002 22:00:41 -0000 1.4 +++ docs/manual/CoreTasks/common.html 22 Aug 2002 20:04:33 -0000 @@ -36,7 +36,7 @@ =20
-Copyright © 2001 Apache Software Foundation. = All rights +
Copyright © 2001-2002 Apache Software = Foundation. All rights Reserved.
=20