adammurdoch 02/04/21 23:52:32
Modified: . build.xml
ant1compat project.xml
antlib project.xml
api project.xml
aut project.xml
buildtools project.xml
container project.xml
framework project.xml
myrmidon project.xml
myrmidon/src/samples sample.ant
tools/xsl build.xsl
Removed: ant1compat build.xml project.properties
ant1compat/src/conf ant1compat.mf
antlib build.xml project.properties
antlib/src/conf archive.mf empty-manifest.mf empty-roles.xml
selftest-extension1.mf selftest.mf tools.mf
api build.xml project.properties
api/src/conf ant-descriptor.xml ant-roles.xml
aut build.xml project.properties
aut/src/conf ant-descriptor.xml ant-roles.xml
buildtools build.xml project.properties
container build.xml project.properties
container/src/conf ant-descriptor.xml myrmidon-launcher.mf
framework build.xml project.properties
Log:
- Replaced old build system with generated build files.
- Now generates manifests into build/conf.
- Renamed a few elements in the descriptor.
Revision Changes Path
1.10 +1 -1 jakarta-ant-myrmidon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 21 Apr 2002 01:45:04 -0000 1.9
+++ build.xml 22 Apr 2002 06:52:30 -0000 1.10
@@ -1,7 +1,7 @@
<project name="Myrmidon" default="main">
<property name="build.xsl" location="tools/xsl/build.xsl"/>
- <property name="buildfile.name" value="sample-build.xml"/>
+ <property name="buildfile.name" value="build.xml"/>
<target name="main">
<ant dir="buildtools" antfile="${buildfile.name}"
inheritAll="false"/>
1.4 +1 -1 jakarta-ant-myrmidon/ant1compat/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Apr 2002 12:29:17 -0000 1.3
+++ project.xml 22 Apr 2002 06:52:30 -0000 1.4
@@ -2,7 +2,7 @@
<name>Myrmidon Ant1 Compatibility</name>
<id>myrmidon-ant1-compat</id>
<currentVersion>1.0</currentVersion>
- <inceptionYear>2002</inceptionYear>
+ <copyrightYear>2002</copyrightYear>
<package>org.apache.tools.ant</package>
<property name="build.ant1classes" value="${build.dir}/ant1classes"/>
1.4 +1 -1 jakarta-ant-myrmidon/antlib/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Apr 2002 12:29:17 -0000 1.3
+++ project.xml 22 Apr 2002 06:52:31 -0000 1.4
@@ -2,7 +2,7 @@
<name>Myrmidon Task Libraries</name>
<id>myrmidon-antlibs</id>
<currentVersion>1.0</currentVersion>
- <inceptionYear>2000-2002</inceptionYear>
+ <copyrightYear>2000-2002</copyrightYear>
<package>org.apache.antlib</package>
<classpath>
1.5 +1 -1 jakarta-ant-myrmidon/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/api/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 18 Apr 2002 13:03:00 -0000 1.4
+++ project.xml 22 Apr 2002 06:52:31 -0000 1.5
@@ -9,7 +9,7 @@
<currentVersion>1.0</currentVersion>
<!-- Copyright year(s) -->
- <inceptionYear>2000-2002</inceptionYear>
+ <copyrightYear>2000-2002</copyrightYear>
<!-- Java packages for the project -->
<package>org.apache.myrmidon.api</package>
1.5 +17 -18 jakarta-ant-myrmidon/aut/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/aut/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 18 Apr 2002 13:03:00 -0000 1.4
+++ project.xml 22 Apr 2002 06:52:31 -0000 1.5
@@ -9,7 +9,7 @@
<currentVersion>1.0</currentVersion>
<!-- Copyright year(s) -->
- <inceptionYear>2000-2002</inceptionYear>
+ <copyrightYear>2000-2002</copyrightYear>
<!-- Java packages for the project -->
<package>org.apache.aut</package>
@@ -49,23 +49,6 @@
classname="com.oroinc.net.ftp.FTPClient"
classpathref="project.class.path" />
</prepare>
-
- <additionalTargets>
- <target name="mktestdata" description="Regenerate test data">
- <!-- Regenerate the Zip VFS test data -->
- <property name="test.vfs.dir"
location="src/test/org/apache/aut/vfs/test"/>
- <property name="test.zip.dir"
location="src/test/org/apache/aut/vfs/provider/zip/test"/>
-
- <mkdir dir="${test.vfs.dir}/basedir/emptydir"/>
- <zip zipfile="${test.zip.dir}/test.zip">
- <fileset dir="${test.vfs.dir}" includes="basedir/**"/>
- </zip>
- <zip zipfile="${test.zip.dir}/nested.zip">
- <fileset dir="${test.zip.dir}" includes="test.zip"/>
- </zip>
-
- </target>
- </additionalTargets>
</build>
<unitTest>
@@ -77,4 +60,20 @@
<exclude name="**/FtpFileSystemTestCase.class"
unless="test.ftp"/>
</unitTestPatterns>
</unitTest>
+
+ <target name="mktestdata" description="Regenerate test data">
+ <!-- Regenerate the Zip VFS test data -->
+ <property name="test.vfs.dir"
location="src/test/org/apache/aut/vfs/test"/>
+ <property name="test.zip.dir"
location="src/test/org/apache/aut/vfs/provider/zip/test"/>
+
+ <mkdir dir="${test.vfs.dir}/basedir/emptydir"/>
+ <zip zipfile="${test.zip.dir}/test.zip">
+ <fileset dir="${test.vfs.dir}" includes="basedir/**"/>
+ </zip>
+ <zip zipfile="${test.zip.dir}/nested.zip">
+ <fileset dir="${test.zip.dir}" includes="test.zip"/>
+ </zip>
+
+ </target>
+
</project>
1.4 +1 -1 jakarta-ant-myrmidon/buildtools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 17 Apr 2002 07:23:53 -0000 1.3
+++ project.xml 22 Apr 2002 06:52:31 -0000 1.4
@@ -2,7 +2,7 @@
<name>Myrmidon Build Tools</name>
<id>myrmidon-buildtools</id>
<currentVersion>1.0</currentVersion>
- <inceptionYear>2000-2002</inceptionYear>
+ <copyrightYear>2000-2002</copyrightYear>
<package>org.apache.myrmidon.build</package>
<build>
1.6 +3 -3 jakarta-ant-myrmidon/container/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 19 Apr 2002 12:29:17 -0000 1.5
+++ project.xml 22 Apr 2002 06:52:31 -0000 1.6
@@ -2,7 +2,7 @@
<name>Myrmidon Container</name>
<id>myrmidon-container</id>
<currentVersion>1.0</currentVersion>
- <inceptionYear>2000-2002</inceptionYear>
+ <copyrightYear>2000-2002</copyrightYear>
<package>org.apache.myrmidon</package>
@@ -59,7 +59,7 @@
<exclude name="**/DependencyMetricsTestCase*"/>
</unitTestPatterns>
- <test-prepare>
+ <prepare>
<!-- Prepare deployer tests -->
<property name="test.deployer.dir"
value="${test.working.dir}/org/apache/myrmidon/components/deployer/test"/>
@@ -112,7 +112,7 @@
manifest="src/test/${test.classloader.pkg}/cycle-extension-1.mf" />
<jar jarfile="${test.classloader.dir}/ext/cycle-extension-2.jar"
manifest="src/test/${test.classloader.pkg}/cycle-extension-2.mf" />
- </test-prepare>
+ </prepare>
</unitTest>
</project>
1.4 +1 -1 jakarta-ant-myrmidon/framework/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/framework/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Apr 2002 12:29:17 -0000 1.3
+++ project.xml 22 Apr 2002 06:52:31 -0000 1.4
@@ -2,7 +2,7 @@
<name>Myrmidon Task Framework</name>
<id>myrmidon-framework</id>
<currentVersion>1.0</currentVersion>
- <inceptionYear>2000-2002</inceptionYear>
+ <copyrightYear>2000-2002</copyrightYear>
<package>org.apache.myrmidon.framework</package>
<package>org.apache.tools.todo</package>
1.2 +49 -53 jakarta-ant-myrmidon/myrmidon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/myrmidon/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Apr 2002 12:29:17 -0000 1.1
+++ project.xml 22 Apr 2002 06:52:31 -0000 1.2
@@ -2,60 +2,56 @@
<name>Myrmidon Distribution</name>
<id>myrmidon-distribution</id>
<currentVersion>1.0</currentVersion>
- <inceptionYear>2000-2002</inceptionYear>
+ <copyrightYear>2000-2002</copyrightYear>
- <build>
+ <dist>
+ <!-- lib/ dir -->
+ <mkdir dir="${dist.dir}/lib"/>
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="../aut/build/lib" includes="*.jar, *.atl"/>
+ <fileset dir="../api/build/lib" includes="*.jar, *.atl"/>
+ <fileset dir="../container/build/lib"
includes="myrmidon-container-api-*.jar"/>
+ <fileset dir="../framework/build/lib" includes="*.jar, *.atl"/>
+ <fileset dir="../antlib/build/lib" includes="*.jar, *.atl"
excludes="selftest*"/>
+ <fileset dir="../ant1compat/build/lib" includes="*.jar, *.atl"/>
+ <fileset dir="../lib" includes="*.jar"/>
+ <fileset dir="../tools/xalan" includes="*.jar"/>
+ </copy>
+
+ <!-- bin/ dir -->
+ <property name="dist.bin" value="${dist.dir}/bin"/>
+ <mkdir dir="${dist.bin}"/>
+ <copy todir="${dist.bin}">
+ <fileset dir="../container/build/lib"
includes="myrmidon-launcher.jar"/>
+ <fileset dir="src/script"/>
+ </copy>
+ <chmod dir="${dist.dir}" perm="go-rwx" />
+ <chmod file="${dist.bin}/ant" perm="u+x"/>
+ <chmod file="${dist.bin}/antRun" perm="u+x"/>
+ <fixcrlf srcdir="${dist.bin}" eol="crlf" includes="*.bat" />
+ <fixcrlf srcdir="${dist.bin}" eol="lf" includes="*.sh, ant, antRun"
/>
+
+ <!-- bin/lib/ dir -->
+ <mkdir dir="${dist.bin}/lib"/>
+ <copy todir="${dist.bin}/lib"
file="../container/build/lib/myrmidon-container-1.0.jar">
+ <fileset dir="../lib/bin/lib" includes="*.jar"/>
+ </copy>
+
+ <!-- ext/ dir -->
+ <mkdir dir="${dist.dir}/ext"/>
+ <copy todir="${dist.dir}/ext">
+ <fileset dir="../antlib/build/lib" includes="selftest*"/>
+ <fileset dir="../lib/ext" includes="*.jar"/>
+ </copy>
+
+ <!-- Samples and docs -->
+ <copy todir="${dist.dir}/samples">
+ <fileset dir="src/samples"/>
+ </copy>
+ <copy todir="${dist.dir}/docs">
+ <fileset dir="../site/docs"/>
+ </copy>
- <dist-prepare>
- <!-- lib/ dir -->
- <mkdir dir="${dist.dir}/lib"/>
- <copy todir="${dist.dir}/lib">
- <fileset dir="../aut/build/lib" includes="*.jar, *.atl"/>
- <fileset dir="../api/build/lib" includes="*.jar, *.atl"/>
- <fileset dir="../container/build/lib"
includes="myrmidon-container-api-*.jar"/>
- <fileset dir="../framework/build/lib" includes="*.jar,
*.atl"/>
- <fileset dir="../antlib/build/lib" includes="*.jar, *.atl"
excludes="selftest*"/>
- <fileset dir="../ant1compat/build/lib" includes="*.jar,
*.atl"/>
- <fileset dir="../lib" includes="*.jar"/>
- <fileset dir="../tools/xalan" includes="*.jar"/>
- </copy>
-
- <!-- bin/ dir -->
- <property name="dist.bin" value="${dist.dir}/bin"/>
- <mkdir dir="${dist.bin}"/>
- <copy todir="${dist.bin}">
- <fileset dir="../container/build/lib"
includes="myrmidon-launcher.jar"/>
- <fileset dir="src/script"/>
- </copy>
- <chmod dir="${dist.dir}" perm="go-rwx" />
- <chmod file="${dist.bin}/ant" perm="u+x"/>
- <chmod file="${dist.bin}/antRun" perm="u+x"/>
- <fixcrlf srcdir="${dist.bin}" eol="crlf" includes="*.bat" />
- <fixcrlf srcdir="${dist.bin}" eol="lf" includes="*.sh, ant,
antRun" />
-
- <!-- bin/lib/ dir -->
- <mkdir dir="${dist.bin}/lib"/>
- <copy todir="${dist.bin}/lib"
file="../container/build/lib/myrmidon-container-1.0.jar">
- <fileset dir="../lib/bin/lib" includes="*.jar"/>
- </copy>
-
- <!-- ext/ dir -->
- <mkdir dir="${dist.dir}/ext"/>
- <copy todir="${dist.dir}/ext">
- <fileset dir="../antlib/build/lib" includes="selftest*"/>
- <fileset dir="../lib/ext" includes="*.jar"/>
- </copy>
-
- <!-- Samples and docs -->
- <copy todir="${dist.dir}/samples">
- <fileset dir="src/samples"/>
- </copy>
- <copy todir="${dist.dir}/docs">
- <fileset dir="../site/docs"/>
- </copy>
-
- </dist-prepare>
-
- </build>
+ </dist>
</project>
1.2 +1 -1 jakarta-ant-myrmidon/myrmidon/src/samples/sample.ant
Index: sample.ant
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/myrmidon/src/samples/sample.ant,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sample.ant 19 Apr 2002 12:13:30 -0000 1.1
+++ sample.ant 22 Apr 2002 06:52:32 -0000 1.2
@@ -166,7 +166,7 @@
<exec dir="../.." executable="java">
<arg value="-version"/>
</exec>
- <log message="exec cvs done!"/>
+ <log message="exec java done!"/>
</target>
<target name="cvs-test">
1.2 +9 -7 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xsl 21 Apr 2002 01:45:04 -0000 1.1
+++ build.xsl 22 Apr 2002 06:52:32 -0000 1.2
@@ -84,7 +84,9 @@
<target name="clean" description="Cleans up the project">
<delete file="checkstyle.cache"/>
- <delete dir="${{build.dir}}" />
+ <delete includeEmptyDirs="true">
+ <fileset dir="${{build.dir}}"
excludes="conf/*/manifest.mf" />
+ </delete>
<delete dir="${{dist.dir}}" />
<delete>
<fileset dir="." includes="**/*~" defaultexcludes="no"/>
@@ -198,7 +200,7 @@
</target>
<target name="test-prepare">
- <xsl:copy-of select="unitTest/test-prepare/*"/>
+ <xsl:copy-of select="unitTest/prepare/*"/>
</target>
<target name="run-tests" depends="jars, compile-tests,
test-prepare" if="junit.present">
@@ -282,7 +284,7 @@
<param name="-link"
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
<param name="-link"
value="http://jakarta.apache.org/avalon/api/"/>
<param name="-bottom"
- value=""Copyright ©
{inceptionYear} Apache Jakarta Project. All Rights Reserved.""/>
+ value=""Copyright ©
{copyrightYear} Apache Jakarta Project. All Rights Reserved.""/>
</doclet>
</javadoc>
</xsl:if>
@@ -299,7 +301,7 @@
<fileset dir="." includes="README.txt"/>
</copy>
- <xsl:copy-of select="build/dist-prepare/*"/>
+ <xsl:copy-of select="dist/*"/>
</target>
@@ -342,14 +344,14 @@
</target>
<!-- Extra targets -->
- <xsl:copy-of select="build/additionalTargets/*"/>
+ <xsl:copy-of select="target"/>
</project>
</xsl:template>
<xsl:template match="jar|antlib">
<!-- Generate the manifest -->
- <redirect:write file="src/conf/{id}.mf">
+ <redirect:write file="build/conf/{id}/manifest.mf">
<xsl:text>Manifest-Version: 1.0
Created-By: Apache Ant Project
</xsl:text>
@@ -409,7 +411,7 @@
<jar jarfile="${{build.lib}}/{$jarName}"
basedir="${{build.classes}}"
compress="${{build.compress}}"
- manifest="src/conf/{id}.mf">
+ manifest="${{build.dir}}/conf/{id}/manifest.mf">
<metainf dir="${{build.conf}}/{id}" />
<xsl:copy-of select="patternset"/>
<xsl:copy-of select="fileset"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
