You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2003/05/18 19:03:06 UTC
cvs commit: cocoon-2.1/src/targets compile-build.xml docs-build.xml test-build.xml
vgritsenko 2003/05/18 10:03:06
Modified: src/targets compile-build.xml docs-build.xml test-build.xml
Log:
move compile-test target from test into main compile so not only gamp notices
broken tests
Revision Changes Path
1.10 +37 -9 cocoon-2.1/src/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/compile-build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compile-build.xml 14 May 2003 15:21:44 -0000 1.9
+++ compile-build.xml 18 May 2003 17:03:06 -0000 1.10
@@ -1,16 +1,10 @@
<!-- === Compilation Targets =================================================== -->
<!-- compiles everything -->
- <target name="compile" depends="compile-core, compile-scratchpad, compile-deprecated"/>
-
- <!-- Prepare the build directories -->
- <target name="prepare-core" depends="prepare">
- <mkdir dir="${build.dest}"/>
- <mkdir dir="${build.mocks}"/>
- </target>
+ <target name="compile" depends="compile-core, compile-scratchpad, compile-deprecated, compile-tests"/>
<!-- compiles the core -->
- <target name="compile-core" depends="prepare-core">
+ <target name="compile-core" depends="prepare">
<!-- copy those files that need to be in the classpath -->
<copy todir="${build.dest}">
@@ -22,6 +16,7 @@
</copy>
<!-- compile mock classes -->
+ <mkdir dir="${build.mocks}"/>
<javac srcdir="${mocks}"
destdir="${build.mocks}"
debug="${compiler.debug}"
@@ -42,7 +37,6 @@
nowarn="${compiler.nowarn}"
compiler="${compiler}"
classpathref="classpath"/>
-
</target>
<!-- compiles the scratchpad -->
@@ -88,6 +82,40 @@
target="${target.vm}"
compiler="${compiler}"
classpathref="classpath"/>
+ </target>
+
+ <target name="compile-tests" depends="compile-core, compile-deprecated">
+ <mkdir dir="${build.test}"/>
+
+ <!-- Copy test files to build test dir -->
+ <copy todir="${build.test}" filtering="on">
+ <fileset dir="${test}" excludes="**/*.java"/>
+ </copy>
+
+ <path id="test.classpath">
+ <path refid="classpath"/>
+ <pathelement location="${build.dest}" />
+ <!-- FIXME Resolver tests depend on deprecated stuff -->
+ <pathelement location="${build.deprecated}" />
+ <pathelement location="${build.test}" />
+ <fileset dir="${tools.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Compile tests -->
+ <javac srcdir="${test}"
+ destdir="${build.test}"
+ debug="${compiler.debug}"
+ optimize="${compiler.optimize}"
+ deprecation="${compiler.deprecation}"
+ target="${target.vm}"
+ compiler="${compiler}"
+ classpathref="test.classpath"/>
+
+ <jar jarfile="${build}/${name}-tests.jar">
+ <fileset dir="${build.test}" includes="**/*.class"/>
+ </jar>
</target>
<!-- === Package Targets ======================================================= -->
1.13 +2 -2 cocoon-2.1/src/targets/docs-build.xml
Index: docs-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/docs-build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- docs-build.xml 15 May 2003 14:07:36 -0000 1.12
+++ docs-build.xml 18 May 2003 17:03:06 -0000 1.13
@@ -135,7 +135,7 @@
<!-- === Javadoc/IDLDoc Targets ================================================ -->
<!-- Create IDL API documentation -->
- <target name="idldocs" depends="prepare-core" unless="unless.exclude.idldocs" description="Builds the IDL API documentation for non-java language bindings">
+ <target name="idldocs" depends="prepare" unless="unless.exclude.idldocs" description="Builds the IDL API documentation for non-java language bindings">
<mkdir dir="${build.idldocs}"/>
<java classname="org.openorb.compiler.doc.IdlDoc">
<arg value="-I${idl}"/>
@@ -161,7 +161,7 @@
</target>
<!-- Creates Javadocs -->
- <target name="javadocs" depends="prepare-core, javadocs-check" unless="javadocs.notrequired" description="Builds the API documentation (javadocs)">
+ <target name="javadocs" depends="prepare, javadocs-check" unless="javadocs.notrequired" description="Builds the API documentation (javadocs)">
<condition property="javadoc.additionalparam" value="-breakiterator -tag todo:all:Todo:">
<equals arg1="1.4" arg2="${ant.java.version}"/>
1.15 +0 -38 cocoon-2.1/src/targets/test-build.xml
Index: test-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/test-build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- test-build.xml 17 Apr 2003 14:01:42 -0000 1.14
+++ test-build.xml 18 May 2003 17:03:06 -0000 1.15
@@ -3,44 +3,6 @@
<!-- Runs all tests -->
<target name="test" depends="junit-tests, anteater-tests, block-tests" description="Runs all tests"/>
- <target name="compile-tests" depends="compile-core, compile-deprecated">
- <mkdir dir="${build.test}"/>
-
- <!-- Copy test files to build test dir -->
- <copy todir="${build.test}" filtering="on">
- <fileset dir="${test}" excludes="**/*.java"/>
- </copy>
-
- <path id="test.classpath">
- <path refid="classpath"/>
-
- <pathelement location="${build.dest}" />
- <!-- FIXME Resolver tests depend on deprecated stuff -->
- <pathelement location="${build.deprecated}" />
-
- <pathelement location="${build.test}" />
-
- <fileset dir="${tools.lib}">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- Compile tests -->
- <javac srcdir="${test}"
- destdir="${build.test}"
- debug="${compiler.debug}"
- optimize="${compiler.optimize}"
- deprecation="${compiler.deprecation}"
- target="${target.vm}"
- fork="true">
- <classpath refid="test.classpath"/>
- </javac>
-
- <jar jarfile="${build}/${name}-tests.jar">
- <fileset dir="${build.test}" includes="**/*.class"/>
- </jar>
- </target>
-
<!-- Runs JUnit tests -->
<target name="junit-tests" depends="compile-tests">
<junit printsummary="yes" haltonfailure="yes" fork="yes">