leosimons 2003/12/02 11:24:24
Modified: . maven-common-gump-build.xml
Log:
a little cleanup, and allow for disabling of unit test to fix the
testcase<->component dependency loops in gump
Revision Changes Path
1.5 +8 -41 avalon-excalibur/maven-common-gump-build.xml
Index: maven-common-gump-build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/maven-common-gump-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven-common-gump-build.xml 13 Nov 2003 12:41:08 -0000 1.4
+++ maven-common-gump-build.xml 2 Dec 2003 19:24:24 -0000 1.5
@@ -57,37 +57,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 +78,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 +89,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,20 +117,22 @@
</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>
</condition>
+ <condition property="run.tests">
+ <and>
+ <not><isset property="do.not.test"/></not>
+ <isset property="test.src.present"/>
+ </and>
+ </condition>
<antcall target="avalon:warn-avail"/>
</target>
@@ -269,7 +236,7 @@
</copy>
</target>
- <target name="avalon:test" if="test.src.present"
+ <target name="avalon:test" if="run.tests"
depends="avalon:init,avalon:api-compile,avalon:impl-compile,avalon:java-compile">
<echo>
=======================================================================
@@ -467,4 +434,4 @@
prefix="${project.name}-${project.version}"/>
</zip>
</target>
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
