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 2009/07/20 10:59:01 UTC
svn commit: r795724 - in /harmony/enhanced/classlib/trunk/modules:
accessibility/build.xml annotation/build.xml archive/build.xml
auth/build.xml beans/build.xml crypto/build.xml luni/build.xml
security/build.xml
Author: hindessm
Date: Mon Jul 20 08:59:00 2009
New Revision: 795724
URL: http://svn.apache.org/viewvc?rev=795724&view=rev
Log:
Remove fileset defines that are just used once.
Modified:
harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
harmony/enhanced/classlib/trunk/modules/annotation/build.xml
harmony/enhanced/classlib/trunk/modules/archive/build.xml
harmony/enhanced/classlib/trunk/modules/auth/build.xml
harmony/enhanced/classlib/trunk/modules/beans/build.xml
harmony/enhanced/classlib/trunk/modules/crypto/build.xml
harmony/enhanced/classlib/trunk/modules/luni/build.xml
harmony/enhanced/classlib/trunk/modules/security/build.xml
Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=795724&r1=795723&r2=795724&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Mon Jul 20 08:59:00 2009
@@ -40,8 +40,6 @@
</or>
</fileset>
- <fileset id="tests" dir="bin/test"/>
-
<property file="../../make/depends.properties" />
<property name="tests.hdk.dir" value="${hy.hdk}/build/test/accessibility" />
@@ -138,7 +136,7 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
<jar destfile="${tests.hdk.dir}/accessibility_tests.jar">
- <fileset refid="tests" />
+ <fileset dir="bin/test" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=795724&r1=795723&r2=795724&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Mon Jul 20 08:59:00 2009
@@ -46,7 +46,6 @@
<property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
<property name="annotation.exclude.file"
location="${tests.hdk.dir}/test.exclude" />
- <fileset id="tests" dir="bin/test" />
<target name="build" depends="compile-java, copy-resources, build-jar" />
@@ -135,7 +134,7 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
<jar destfile="${tests.hdk.dir}/annotation_tests.jar">
- <fileset refid="tests" />
+ <fileset dir="bin/test" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=795724&r1=795723&r2=795724&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Mon Jul 20 08:59:00 2009
@@ -48,8 +48,6 @@
<property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
<property name="archive.exclude.file"
location="${tests.hdk.dir}/test.exclude" />
- <fileset id="tests.api" dir="bin/test" />
- <fileset id="tests.internal" dir="bin/test-internal" />
<target name="build" depends="compile-java, copy-resources, build-jar" />
@@ -258,7 +256,7 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
<jar destfile="${tests.hdk.dir}/archive_tests.jar">
- <fileset refid="tests.api" />
+ <fileset dir="bin/test" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
@@ -266,7 +264,7 @@
</jar>
<jar destfile="${tests.hdk.dir}/archive_internal_tests.jar">
- <fileset refid="tests.internal" />
+ <fileset dir="bin/test-internal" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=795724&r1=795723&r2=795724&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Mon Jul 20 08:59:00 2009
@@ -61,7 +61,6 @@
<property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
<property name="auth.exclude.file"
location="${tests.hdk.dir}/test.exclude" />
- <fileset id="tests" dir="bin/test" />
<target name="build" depends="compile-java, copy-resources, build-jar" />
@@ -179,7 +178,7 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
<jar destfile="${tests.hdk.dir}/auth_tests.jar">
- <fileset refid="tests" />
+ <fileset dir="bin/test" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=795724&r1=795723&r2=795724&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Mon Jul 20 08:59:00 2009
@@ -48,9 +48,6 @@
value="${tests.hdk.dir}/resources" />
<property name="beans.exclude.file"
location="${tests.hdk.dir}/test.exclude" />
- <fileset id="tests.support" dir="bin/test_support" />
- <fileset id="tests.api" dir="bin/test" />
- <fileset id="tests.impl" dir="bin/test-internal" />
<target name="build" depends="compile-java, copy-resources, build-jar" />
@@ -142,23 +139,23 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
<jar destfile="${tests.hdk.dir}/beans_test_support.jar">
- <fileset refid="tests.support" />
+ <fileset dir="bin/test_support" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
<metainf refid="hy.required.metainf-files"/>
</jar>
- <jar destfile="${tests.hdk.dir}/beans_impl_tests.jar">
- <fileset refid="tests.impl" />
+ <jar destfile="${tests.hdk.dir}/beans_tests.jar">
+ <fileset dir="bin/test" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
<metainf refid="hy.required.metainf-files"/>
</jar>
- <jar destfile="${tests.hdk.dir}/beans_tests.jar">
- <fileset refid="tests.api" />
+ <jar destfile="${tests.hdk.dir}/beans_impl_tests.jar">
+ <fileset dir="bin/test-internal" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=795724&r1=795723&r2=795724&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Mon Jul 20 08:59:00 2009
@@ -48,11 +48,6 @@
value="${tests.hdk.dir}/resources" />
<property name="crypto.exclude.file"
location="${tests.hdk.dir}/test.exclude" />
- <fileset id="tests.support" dir="bin/test/support" />
- <fileset id="tests.api" dir="bin/test/api" />
- <fileset id="tests.api.boot" dir="bin/test/api.injected" />
- <fileset id="tests.impl" dir="bin/test/impl" />
- <fileset id="tests.impl.boot" dir="bin/test/impl.injected" />
<target name="build" depends="compile-java, copy-resources, build-jar" />
@@ -145,7 +140,7 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
<jar destfile="${tests.hdk.dir}/crypto_test_support.jar">
- <fileset refid="tests.support" />
+ <fileset dir="bin/test/support" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
@@ -153,14 +148,14 @@
</jar>
<jar destfile="${tests.hdk.dir}/crypto_api_tests.jar">
- <fileset refid="tests.api" />
+ <fileset dir="bin/test/api" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
<metainf refid="hy.required.metainf-files"/>
</jar>
<jar destfile="${tests.hdk.dir}/crypto_api_boot_tests.jar">
- <fileset refid="tests.api.boot" />
+ <fileset dir="bin/test/api.injected" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
@@ -168,14 +163,14 @@
</jar>
<jar destfile="${tests.hdk.dir}/crypto_impl_tests.jar">
- <fileset refid="tests.impl" />
+ <fileset dir="bin/test/impl" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
<metainf refid="hy.required.metainf-files"/>
</jar>
<jar destfile="${tests.hdk.dir}/crypto_impl_boot_tests.jar">
- <fileset refid="tests.impl.boot" />
+ <fileset dir="bin/test/impl.injected" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=795724&r1=795723&r2=795724&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Jul 20 08:59:00 2009
@@ -44,14 +44,12 @@
</or>
</fileset>
- <fileset id="tests.api" dir="bin/test/api"/>
- <fileset id="tests.impl" dir="bin/test/impl"/>
+ <property file="../../make/depends.properties" />
<property name="tests.hdk.dir" value="${hy.hdk}/build/test/luni" />
<property name="tests.resources.hdk.dir" value="${tests.hdk.dir}/resources" />
<property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
- <property file="../../make/depends.properties" />
<property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
<property name="luni.exclude.file"
@@ -307,7 +305,7 @@
tofile="${tests.hdk.dir}/build.xml" />
<jar destfile="${tests.hdk.dir}/luni_tests_api.jar">
- <fileset refid="tests.api" />
+ <fileset dir="bin/test/api" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
@@ -315,7 +313,7 @@
</jar>
<jar destfile="${tests.hdk.dir}/luni_tests_impl.jar">
- <fileset refid="tests.impl" />
+ <fileset dir="bin/test/impl" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=795724&r1=795723&r2=795724&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Mon Jul 20 08:59:00 2009
@@ -52,12 +52,6 @@
</or>
</fileset>
- <fileset id="tests.api" dir="bin/test/api"/>
- <fileset id="tests.api.in" dir="bin/test/api.injected"/>
- <fileset id="tests.impl" dir="bin/test/impl"/>
- <fileset id="tests.impl.in" dir="bin/test/impl.injected"/>
- <fileset id="tests.support" dir="bin/test/support"/>
-
<property file="../../make/depends.properties" />
<property name="tests.hdk.dir" value="${hy.hdk}/build/test/security" />
@@ -191,35 +185,35 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
<jar destfile="${tests.hdk.dir}/security_tests_api.jar">
- <fileset refid="tests.api" />
+ <fileset dir="bin/test/api" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
<metainf refid="hy.required.metainf-files"/>
</jar>
<jar destfile="${tests.hdk.dir}/security_tests_api_in.jar">
- <fileset refid="tests.api.in" />
+ <fileset dir="bin/test/api.injected" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
<metainf refid="hy.required.metainf-files"/>
</jar>
<jar destfile="${tests.hdk.dir}/security_tests_impl.jar">
- <fileset refid="tests.impl" />
+ <fileset dir="bin/test/impl" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
<metainf refid="hy.required.metainf-files"/>
</jar>
<jar destfile="${tests.hdk.dir}/security_tests_impl_in.jar">
- <fileset refid="tests.impl.in" />
+ <fileset dir="bin/test/impl.injected" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
<metainf refid="hy.required.metainf-files"/>
</jar>
<jar destfile="${tests.hdk.dir}/security_tests_support.jar">
- <fileset refid="tests.support" />
+ <fileset dir="bin/test/support" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>