You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/03/20 18:43:37 UTC
cvs commit: avalon/buildsystem maven-common-gump-build.xml
mcconnell 2004/03/20 09:43:37
Modified: buildsystem maven-common-gump-build.xml
Log:
Remove all content that assumes an api/impl subproject structure - keeping only a standard [project]/src/java and [project]/src/test assumption.
Revision Changes Path
1.6 +8 -147 avalon/buildsystem/maven-common-gump-build.xml
Index: maven-common-gump-build.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/maven-common-gump-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven-common-gump-build.xml 26 Jun 2003 15:03:55 -0000 1.5
+++ maven-common-gump-build.xml 20 Mar 2004 17:43:37 -0000 1.6
@@ -58,36 +58,6 @@
</echo>
</target>
- <target name="avalon:warn-avail-api-src" unless="api.src.present">
- <echo>
-=======================================================================
- NOTE!
-
- The directory
-
- ${maven.src.dir}/api
-
- does not exist. This means the api jar that will be created will be
- empty.
-=======================================================================
- </echo>
- </target>
-
- <target name="avalon:warn-avail-impl-src" unless="impl.src.present">
- <echo>
-=======================================================================
- NOTE!
-
- The directory
-
- ${maven.src.dir}/impl
-
- does not exist. This means the impl jar that will be created will be
- empty.
-=======================================================================
- </echo>
- </target>
-
<target name="avalon:warn-avail-test-src" unless="test.src.present">
<echo>
=======================================================================
@@ -109,8 +79,6 @@
This project does not contain any java source files in
- ${maven.src.dir}/api or
- ${maven.src.dir}/impl or
${maven.src.dir}/java or
${maven.src.dir}/test or
@@ -122,8 +90,6 @@
<target name="avalon:warn-avail">
<antcall target="avalon:warn-avail-no-sources"/>
- <antcall target="avalon:warn-avail-api-src"/>
- <antcall target="avalon:warn-avail-impl-src"/>
<antcall target="avalon:warn-avail-test-src"/>
</target>
@@ -152,15 +118,11 @@
</condition>
<antcall target="avalon:warn-project.name"/>
- <available file="${basedir}/src/api" property="api.src.present"/>
- <available file="${basedir}/src/impl" property="impl.src.present"/>
<available file="${basedir}/src/java" property="java.src.present"/>
<available file="${basedir}/src/test" property="test.src.present"/>
<condition property="no.sources.available">
<and>
- <not><isset property="api.src.present"/></not>
- <not><isset property="impl.src.present"/></not>
<not><isset property="java.src.present"/></not>
<not><isset property="test.src.present"/></not>
</and>
@@ -170,10 +132,10 @@
</target>
<target name="avalon:jar"
- depends="avalon:init, avalon:api-compile, avalon:impl-compile, avalon:java-compile, avalon:test, avalon:api-jar, avalon:impl-jar, avalon:regular-jar"/>
+ depends="avalon:init, avalon:java-compile, avalon:test, avalon:regular-jar"/>
<target name="avalon:java-compile" if="java.src.present"
- depends="avalon:init,avalon:api-compile,avalon:impl-compile">
+ depends="avalon:init">
<echo>
=======================================================================
Compiling Sources
@@ -181,8 +143,6 @@
</echo>
<mkdir dir="${maven.build.dir}"/>
<mkdir dir="${maven.build.dir}/classes"/>
- <mkdir dir="${maven.build.dir}/api-classes"/><!-- to ensure <classpath/> works -->
- <mkdir dir="${maven.build.dir}/impl-classes"/><!-- to ensure <classpath/> works -->
<javac
destdir="${maven.build.dir}/classes"
excludes="**/package.html"
@@ -192,8 +152,6 @@
<src>
<pathelement path="${maven.src.dir}/java"/>
- <pathelement path="${maven.build.dir}/api-classes"/>
- <pathelement path="${maven.build.dir}/impl-classes"/>
</src>
</javac>
@@ -203,83 +161,15 @@
</copy>
</target>
- <target name="avalon:api-compile" if="api.src.present"
- depends="avalon:init">
- <echo>
-=======================================================================
- Compiling API Sources
-=======================================================================
- </echo>
- <mkdir dir="${maven.build.dir}"/>
- <mkdir dir="${maven.build.dir}/api-classes"/>
- <javac
- destdir="${maven.build.dir}/api-classes"
- excludes="**/package.html"
- debug="${maven.compile.debug}"
- deprecation="${maven.compile.deprecation}"
- optimize="${maven.compile.optimize}">
-
- <src>
- <pathelement path="${maven.src.dir}/api"/>
- </src>
- </javac>
-
- <mkdir dir="${maven.build.dir}/classes"/>
- <copy todir="${maven.build.dir}/classes">
- <fileset dir="${maven.build.dir}/api-classes"/>
- </copy>
- <mkdir dir="${maven.build.dir}/src"/>
- <copy todir="${maven.build.dir}/src">
- <fileset dir="${maven.src.dir}/api"/>
- </copy>
- </target>
-
- <target name="avalon:impl-compile" if="impl.src.present"
- depends="avalon:init,avalon:api-compile">
- <echo>
-=======================================================================
- Compiling Implementation Sources
-=======================================================================
- </echo>
- <mkdir dir="${maven.build.dir}"/>
- <mkdir dir="${maven.build.dir}/impl-classes"/>
- <mkdir dir="${maven.build.dir}/api-classes"/><!-- to ensure <classpath/> works -->
- <javac
- destdir="${maven.build.dir}/impl-classes"
- excludes="**/package.html"
- debug="${maven.compile.debug}"
- deprecation="${maven.compile.deprecation}"
- optimize="${maven.compile.optimize}">
-
- <src>
- <pathelement path="${maven.src.dir}/impl"/>
- </src>
- <classpath>
- <pathelement path="${maven.build.dir}/api-classes"/>
- </classpath>
- </javac>
-
- <mkdir dir="${maven.build.dir}/classes"/>
- <copy todir="${maven.build.dir}/classes">
- <fileset dir="${maven.build.dir}/impl-classes"/>
- </copy>
- <mkdir dir="${maven.build.dir}/src"/>
- <copy todir="${maven.build.dir}/src">
- <fileset dir="${maven.src.dir}/impl"/>
- </copy>
- </target>
-
<target name="avalon:test" if="test.src.present"
- depends="avalon:init,avalon:api-compile,avalon:impl-compile,avalon:java-compile">
+ depends="avalon:init,avalon:java-compile">
<echo>
=======================================================================
Compiling Tests
======================================================================
</echo>
<mkdir dir="${maven.build.dir}/test-classes"/>
- <mkdir dir="${maven.build.dir}/classes"/><!-- to ensure <classpath/> works -->
- <mkdir dir="${maven.build.dir}/api-classes"/><!-- to ensure <classpath/> works -->
- <mkdir dir="${maven.build.dir}/impl-classes"/><!-- to ensure <classpath/> works -->
+ <mkdir dir="${maven.build.dir}/classes"/>
<javac
destdir="${maven.build.dir}/test-classes"
excludes="**/package.html"
@@ -292,8 +182,6 @@
</src>
<classpath>
<pathelement path="${maven.build.dir}/classes"/>
- <pathelement path="${maven.build.dir}/api-classes"/>
- <pathelement path="${maven.build.dir}/impl-classes"/>
</classpath>
</javac>
@@ -302,6 +190,7 @@
Running tests
=======================================================================
</echo>
+
<taskdef
name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
@@ -318,8 +207,6 @@
<formatter type="plain" usefile="${maven.junit.usefile}"/>
<classpath>
<pathelement location="${maven.build.dir}/classes"/>
- <pathelement path="${maven.build.dir}/api-classes"/>
- <pathelement path="${maven.build.dir}/impl-classes"/>
<pathelement location="${maven.build.dir}/test-classes"/>
</classpath>
<batchtest todir="${maven.build.dir}/test-reports">
@@ -350,9 +237,9 @@
</junitreport>
</target>
-
+
<target name="avalon:regular-jar"
- depends="avalon:init,avalon:api-compile,avalon:impl-compile,avalon:java-compile">
+ depends="avalon:init,avalon:java-compile">
<echo>
=======================================================================
Building jar
@@ -362,34 +249,10 @@
<jar destfile="${maven.build.dir}/${project.name}-${project.version}.jar" basedir="${maven.build.dir}/classes"/>
</target>
- <target name="avalon:api-jar"
- depends="avalon:init,avalon:api-compile">
- <echo>
-=======================================================================
- Building API jar
-=======================================================================
- </echo>
- <mkdir dir="${maven.build.dir}/api-classes"/>
- <jar destfile="${maven.build.dir}/${project.name}-${project.version}-api.jar" basedir="${maven.build.dir}/api-classes"/>
- </target>
-
- <target name="avalon:impl-jar"
- depends="avalon:init,avalon:impl-compile">
- <echo>
-=======================================================================
- Building Implementation jar
-=======================================================================
- </echo>
- <mkdir dir="${maven.build.dir}/impl-classes"/>
- <jar destfile="${maven.build.dir}/${project.name}-${project.version}-impl.jar" basedir="${maven.build.dir}/impl-classes"/>
- </target>
-
<target name="avalon:javadocs" depends="avalon:init,avalon:jar">
<mkdir dir="${maven.build.dir}/docs"/>
<mkdir dir="${maven.build.dir}/docs/apidocs"/>
- <mkdir dir="${maven.build.dir}/classes"/><!-- to ensure <classpath/> works -->
- <mkdir dir="${maven.build.dir}/api-classes"/><!-- to ensure <classpath/> works -->
- <mkdir dir="${maven.build.dir}/impl-classes"/><!-- to ensure <classpath/> works -->
+ <mkdir dir="${maven.build.dir}/classes"/>
<property name="copyright"
value="Copyright &copy; ${project.copyright.year} Apache Software Foundation. All Rights Reserved." />
@@ -408,8 +271,6 @@
<link href="http://avalon.apache.org/framework/api/"/>
<classpath>
<path location="${maven.build.dir}/classes"/>
- <path location="${maven.build.dir}/api-classes"/>
- <path location="${maven.build.dir}/impl-classes"/>
</classpath>
</javadoc>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org