diff options
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 62 |
1 files changed, 40 insertions, 22 deletions
@@ -1,18 +1,19 @@ <?xml version="1.0"?> <!-- -Copyright 2001-2006 The Ant-Contrib project + Licensed to the Ant-Contrib Project under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The Ant-Contrib Project licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> <project default="jars" basedir="."> @@ -22,7 +23,7 @@ Copyright 2001-2006 The Ant-Contrib project <property name="Name" value="cpptasks"/> <property name="name" value="cpptasks"/> - <property name="version" value="1.0b4"/> + <property name="version" value="1.0b5"/> <property name="debug" value="true" /> <property name="deprecation" value="false" /> @@ -41,16 +42,18 @@ Copyright 2001-2006 The Ant-Contrib project Set the properties related to the source tree =================================================================== --> - <property name="src.dir" value="src"/> - <property name="java.dir" value="src"/> - <property name="tests.java.dir" value="test/junit"/> + <property name="src.dir" value="src/main/java"/> + <property name="resources.dir" value="src/main/resources"/> + <property name="java.dir" value="src/main/java"/> + <property name="tests.java.dir" value="src/test/java"/> + <property name="tests.resources.dir" value="src/test/resources"/> <!-- =================================================================== Set the properties for the build area =================================================================== --> - <property name="build.dir" value="build"/> + <property name="build.dir" value="target"/> <property name="build.classes" value="${build.dir}/classes"/> <property name="tests.build.classes" value="${build.dir}/tests"/> <property name="tests.build.lib" value="${build.dir}/lib"/> @@ -65,7 +68,7 @@ Copyright 2001-2006 The Ant-Contrib project =================================================================== --> <property name="dist.name" value="${name}-${version}"/> - <property name="dist.base" value="dist"/> + <property name="dist.base" value="target"/> <property name="dist.dir" value="${dist.base}/${dist.name}"/> <property name="dist.javadocs" value="${dist.dir}/docs/manual/api"/> @@ -145,10 +148,17 @@ Copyright 2001-2006 The Ant-Contrib project depends="build" description="--> creates the jar"> <mkdir dir="${build.lib}"/> - <jar jarfile="${build.lib}/${name}.jar" manifest="${src.dir}/cpptasks.mf"> - <fileset dir="." includes="LICENSE NOTICE"/> + <jar jarfile="${build.lib}/${name}.jar"> <fileset dir="${build.classes}"/> - <fileset dir="${src.dir}" includes="cpptasks.tasks,cpptasks.types,net/sf/antcontrib/cpptasks/antlib.xml"/> + <fileset dir="${resources.dir}" excludes="META-INF"/> + <manifest> + <section name="net.sf.antcontrib.cpptasks"> + <attribute name="Implementation-Title" value="cpptasks: Compiler Tasks for Apache Ant."/> + <attribute name="Implementation-Vendor" value="Ant-Contrib Project"/> + <attribute name="Implementation-Version" value="${version}"/> + </section> + </manifest> + <metainf dir="${resources.dir}/META-INF"/> </jar> </target> @@ -177,7 +187,7 @@ Copyright 2001-2006 The Ant-Contrib project <target name="run-tests" depends="build-tests" description="Run tests"> <junit printsummary="false" fork="true" - dir="${tests.java.dir}"> + dir="${tests.resources.dir}"> <classpath> <pathelement location="${tests.build.lib}/${name}_test.jar" /> <pathelement location="${build.lib}/${name}.jar" /> @@ -194,7 +204,7 @@ Copyright 2001-2006 The Ant-Contrib project <target name="run-coverage-tests" depends="build-tests"> <junit printsummary="false" fork="true" - dir="${tests.java.dir}"> + dir="${tests.resources.dir}"> <classpath> <pathelement location="${tests.build.lib}/${name}_test.jar" /> <pathelement location="${build.lib}/${name}.jar" /> @@ -742,4 +752,12 @@ Copyright 2001-2006 The Ant-Contrib project </target> + <target name="style"> + <mkdir dir="src/site/xdoc"/> + <xslt style="src/taskdocs/resources/net/sf/antcontrib/taskdocs/type.xslt" + baseDir="target/site/antdocs" includes="*.xml" processor="trax" + destDir="src/site/xdoc" extension=".xml" force="true"/> + + </target> + </project> |