Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 20276 invoked from network); 16 May 2002 01:28:48 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 16 May 2002 01:28:48 -0000 Received: (qmail 18457 invoked by uid 97); 16 May 2002 01:28:36 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 18275 invoked by uid 97); 16 May 2002 01:28:35 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 18188 invoked by uid 97); 16 May 2002 01:28:34 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 16 May 2002 01:28:29 -0000 Message-ID: <20020516012829.13604.qmail@icarus.apache.org> From: adammurdoch@apache.org To: jakarta-ant-myrmidon-cvs@apache.org Subject: cvs commit: jakarta-ant-myrmidon/tools/xsl build.xsl X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N adammurdoch 02/05/15 18:28:29 Modified: aut project.xml site/docs project-descriptor.html todo.html site/src/xdocs project-descriptor.xml todo.xml tools/xsl build.xsl Log: Added top-level element to project descriptor, which allows Jars to be built but not included in the project output (test Jars, for example). Revision Changes Path 1.9 +8 -8 jakarta-ant-myrmidon/aut/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- project.xml 10 May 2002 06:27:31 -0000 1.8 +++ project.xml 16 May 2002 01:28:28 -0000 1.9 @@ -16,17 +16,17 @@ + + + + + + src/java - - - - - - 1.3 +87 -38 jakarta-ant-myrmidon/site/docs/project-descriptor.html Index: project-descriptor.html =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/site/docs/project-descriptor.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project-descriptor.html 9 May 2002 07:39:57 -0000 1.2 +++ project-descriptor.html 16 May 2002 01:28:28 -0000 1.3 @@ -59,7 +59,7 @@

My First Task

Extending Ant

Extending Myrmidon

Configuration HOWTO

+ additional-build +

+ The details of how to compile and assemble the project's + additional Jars. These are Jar files that are assembled as + part of the build, but not included as part of the project + output. For example, test Jar files. +

+ yes +

build

The project classpath, used for compiling the project - source, and unit tests. This is an Ant <path> - data-type. + Jars, unit tests, and additional Jars. This is an Ant + <path> data-type. +

+ no +

+ compilePatterns +

+ The include and exclude patterns to use when compiling the + project Jars, unit tests, and additional Jars. This is an + Ant <patternset> data-type.

-
The <build> element describes how to compile the - project and assemble it into Jar files. The <build> - element may contain the following nested elements:
+
The <build> and <additional-build> + elements describes how to compile and assemble a set of Jar files. + The <build> element describes the Jar files + included as part of the project's output. The + <additional-build> describes Jar files that are + not included in the project's output, such as test files. + These elements may contain the following nested elements:
@@ -388,24 +442,21 @@ @@ -413,14 +464,13 @@ @@ -462,7 +513,8 @@ Additional Ant tasks to perform before compiling the source. This can be used, for example, to check for - the availability of various libraries. + the availability of various libraries (<build> + only).

- antlib + classpath - Defines an antlib output file. + The classpath to use for compiling the Jars. + This is appended to the project classpath. This is + an Ant <path> data-type. Note that + the Ant runtime is not included in the compile classpath. + To include the Ant runtime, add an empty <ant-runtime> + element to this <classpath> element. - yes + no
- classpath + compilePatterns - The classpath to use for compiling the project source. - This is appended to the project classpath. This is - an Ant <path> data-type. Note that - the Ant runtime is not included in the compile classpath. - To include the Ant runtime, add an empty <ant-runtime> - element to the <classpath> element. + The patternset to use when compiling the project source. + This is an Ant <patternset>. These are + added to the project compile patterns. - no + yes
- compilePatterns + jar - The patternset to use when compiling the project source. - This is an Ant <patternset>. + Defines a Jar output file. - jar + lib-path - Defines a Jar output file. + Defines the directory to place the assembled Jar files + (<additional-build> only). - yes + no

-
The <antlib> and <jar> elements - define antlib and jar output files, respectively. There is no - difference between these elements, except the output file name. - A manifest and antlib descriptors are generated for the output file. - The <antlib> and <jar> elements - may take the following nested elements:
+
A <jar> element defines a jar file produced by + the build. A manifest and antlib descriptors are generated for the Jar. + A <jar> element may take the following nested elements:
@@ -787,8 +836,8 @@ 1.5 +2 -1 jakarta-ant-myrmidon/site/docs/todo.html Index: todo.html =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/site/docs/todo.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- todo.html 9 May 2002 07:39:57 -0000 1.4 +++ todo.html 16 May 2002 01:28:28 -0000 1.5 @@ -61,7 +61,7 @@
My First Task
-
Extending Ant
+
Extending Myrmidon

Configuration HOWTO
@@ -574,6 +574,7 @@
The Ant 1 Compatibility layer is still in early stages of development.

+
Update ant.jar and optional.jar to ant1.5 beta.

Get a version of <antcall> working.

Provide hooks between Ant 1 references and Myrmidon properties. 1.4 +44 -13 jakarta-ant-myrmidon/site/src/xdocs/project-descriptor.xml Index: project-descriptor.xml =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/site/src/xdocs/project-descriptor.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project-descriptor.xml 10 May 2002 06:27:32 -0000 1.3 +++ project-descriptor.xml 16 May 2002 01:28:28 -0000 1.4 @@ -24,6 +24,15 @@
+ + + + + + @@ -33,8 +42,16 @@ + Jars, unit tests, and additional Jars. This is an Ant + <path> data-type. + + + + + + @@ -97,28 +114,34 @@

- Additional files to include in the output file. This + Additional files to include in the Jar. This is an Ant <fileset> datatype. - A unique short name for the output file. This is used - in the output file name, and the names of generated files. + A unique short name for the Jar. This is used + in the file name, and the names of generated files. Controls whether antlib descriptors are generated for - the output file. Descriptors are generated by default. + the Jar. Descriptors are generated by default. - See the <jar> Ant task. + See the Ant <jar> task. - Specifies the name of the output file. By default, the - name is generated from the id and current version. + Specifies the name of the Jar. By default, the + name is generated from the Jar Id and current project version. - Specifies which classes to include in the output file. + Specifies which classes to include in the Jar. This is an Ant <patternset>.
Element Description Multivalued

additional-build The details of how to compile and assemble the project's + additional Jars. These are Jar files that are assembled as + part of the build, but not included as part of the project + output. For example, test Jar files. yes
build The details of how to compile the project and assemble it into jar files.
classpath The project classpath, used for compiling the project - source, and unit tests. This is an Ant <path> - data-type. no
compilePatterns The include and exclude patterns to use when compiling the + project Jars, unit tests, and additional Jars. This is an + Ant <patternset> data-type. no
-
The <build> element describes how to compile the - project and assemble it into Jar files. The <build> - element may contain the following nested elements:
+
The <build> and <additional-build> + elements describes how to compile and assemble a set of Jar files. + The <build> element describes the Jar files + included as part of the project's output. The + <additional-build> describes Jar files that are + not included in the project's output, such as test files. + These elements may contain the following nested elements:
- + + This is an Ant <patternset> data-type. + This patternset is added to the project compile patternset. @@ -129,10 +152,18 @@ + + + + + + + the availability of various libraries (<build> + only). 1.3 +1 -0 jakarta-ant-myrmidon/site/src/xdocs/todo.xml Index: todo.xml =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/site/src/xdocs/todo.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- todo.xml 9 May 2002 07:39:23 -0000 1.2 +++ todo.xml 16 May 2002 01:28:28 -0000 1.3 @@ -290,6 +290,7 @@
The Ant 1 Compatibility layer is still in early stages of development.
+
Update ant.jar and optional.jar to ant1.5 beta.

Get a version of <antcall> working.

Provide hooks between Ant 1 references and Myrmidon properties. 1.18 +111 -75 jakarta-ant-myrmidon/tools/xsl/build.xsl Index: build.xsl =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/tools/xsl/build.xsl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- build.xsl 15 May 2002 10:11:55 -0000 1.17 +++ build.xsl 16 May 2002 01:28:28 -0000 1.18 @@ -58,12 +58,9 @@ - - - - - - + + + @@ -73,16 +70,6 @@ - - - - - - - - - - @@ -120,8 +107,9 @@ - - + + @@ -135,37 +123,34 @@ - - - - - - - - false - - - - - - - - - - - - - - + + + main-compile + , + , compile-tests + + - + + + compile, main-jars + , + + + + main + ${build.classes} + ${build.lib} + + + + + + + + @@ -175,13 +160,11 @@ - - Could not find JUnit in the project classpath. Cannot compile the unit tests. - + @@ -264,40 +247,22 @@ - + This project has no unit tests. - - - - - - - - , jar- - - - - - - - - - - + - + @@ -370,7 +335,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + , jar- + + + + + + + + + + + + + @@ -382,7 +417,7 @@ property="{id}-xdoclet.omit"> - + @@ -400,12 +435,12 @@ rolesDescriptorName="ant-roles.xml"> - + - + @@ -414,6 +449,7 @@ + @@ -464,8 +500,8 @@ - -- To unsubscribe, e-mail: For additional commands, e-mail:

Element Description Multivalued

classpath The classpath to use for compiling the project source. - This is appended to the project classpath. This is - an Ant <path> data-type. Note that - the Ant runtime is not included in the compile classpath. - To include the Ant runtime, add an empty <ant-runtime> - element to the <classpath> element. The classpath to use for compiling the Jars. This is + an Ant <path> data-type. This classpath + is appended to the project classpath. Note that the Ant + runtime is not included in the compile classpath. To + include the Ant runtime, add an empty + <ant-runtime> element to this + <classpath> element. no

compilePatterns The patternset to use when compiling the project source. - This is an Ant <patternset>. yes

lib-path Defines the directory to place the assembled Jar files + (<additional-build> only). no
prepare Additional Ant tasks to perform before compiling the source. This can be used, for example, to check for - the availability of various libraries. no