You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/06/27 09:52:49 UTC
svn commit: r417365 - in /incubator/harmony/enhanced/classlib/trunk:
make/build-test.xml modules/archive/build.xml modules/nio_char/build.xml
Author: hindessm
Date: Tue Jun 27 00:52:48 2006
New Revision: 417365
URL: http://svn.apache.org/viewvc?rev=417365&view=rev
Log:
Move module copy.test.resources target to module build.xml files.
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=417365&r1=417364&r2=417365&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Tue Jun 27 00:52:48 2006
@@ -103,27 +103,11 @@
target: copy-test-resources
================================= -->
<target name="copy-test-resources"
- description="Copy non-Java files from unit test trees to the bin output">
+ description="Copy non-Java files from test support tree to the support output tree">
<mkdir dir="${tests.support.output}" />
<copy todir="${tests.support.output}" includeemptydirs="false">
<fileset dir="${support.dir}/src/test/java">
- <exclude name="**/*.java" />
- </fileset>
- </copy>
-
- <mkdir dir="${tests.build.output}" />
- <copy todir="${tests.build.output}" includeemptydirs="false">
- <fileset dir="modules/archive/src/test/java">
- <exclude name="**/*.java" />
- </fileset>
- <fileset dir="modules/luni/src/test/java">
- <exclude name="**/*.java" />
- </fileset>
- <fileset dir="modules/nio_char/src/test/java">
- <exclude name="**/*.java" />
- </fileset>
- <fileset dir="modules/text/src/test/java">
<exclude name="**/*.java" />
</fileset>
</copy>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=417365&r1=417364&r2=417365&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Tue Jun 27 00:52:48 2006
@@ -90,7 +90,7 @@
</jar>
</target>
- <target name="compile.tests">
+ <target name="compile.tests" depends="copy.test.resources">
<echo message="Compiling ARCHIVE tests" />
<mkdir dir="${hy.archive.bin.test}" />
@@ -165,6 +165,15 @@
<echo file="${hy.tests.reports}/test.errors"
append="true" >archive
</echo>
+ </target>
+
+ <target name="copy.test.resources">
+ <mkdir dir="${hy.archive.bin.test}" />
+ <copy todir="${hy.archive.bin.test}" includeemptydirs="false">
+ <fileset dir="${hy.archive.src.test.resources}">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=417365&r1=417364&r2=417365&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Tue Jun 27 00:52:48 2006
@@ -65,13 +65,15 @@
</bootclasspath>
</javac>
</target>
+
<target name="build.jar">
<jar destfile="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar"
manifest="${hy.nio_char}/META-INF/MANIFEST.MF">
<fileset refid="classes" />
</jar>
</target>
- <target name="compile.tests">
+
+ <target name="compile.tests" depends="copy.test.resources">
<echo message="Compiling NIO_CHAR tests" />
<mkdir dir="${hy.nio_char.bin.test}" />
@@ -158,6 +160,15 @@
<echo file="${hy.tests.reports}/test.errors"
append="true" >nio_char
</echo>
+ </target>
+
+ <target name="copy.test.resources">
+ <mkdir dir="${hy.nio_char.bin.test}" />
+ <copy todir="${hy.nio_char.bin.test}" includeemptydirs="false">
+ <fileset dir="${hy.nio_char.src.test.resources}">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
</target>
</project>