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/20 23:04:08 UTC
svn commit: r415803 - in /incubator/harmony/enhanced/classlib/trunk:
make/build-java.xml modules/luni/build.xml
Author: hindessm
Date: Tue Jun 20 14:04:07 2006
New Revision: 415803
URL: http://svn.apache.org/viewvc?rev=415803&view=rev
Log:
Delegating copy-resources task to luni module.
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=415803&r1=415802&r2=415803&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Tue Jun 20 14:04:07 2006
@@ -76,7 +76,7 @@
<!-- =================================
target: compile
================================= -->
- <target name="compile" depends="copy-resources, prepare-depends"
+ <target name="compile" depends="prepare-depends"
description="Compile the source">
<mkdir dir="${build.output}" />
@@ -122,20 +122,6 @@
<call-modules target="build" />
- </target>
-
-
- <!-- =================================
- target: copy-resources
- ================================= -->
- <target name="copy-resources" description="Copy non-Java files under src tree to the build output">
- <mkdir dir="${build.output}" />
-
- <copy todir="${build.output}" includeemptydirs="false">
- <fileset dir="modules/luni/src/main/java">
- <exclude name="**/*.java" />
- </fileset>
- </copy>
</target>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=415803&r1=415802&r2=415803&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Tue Jun 20 14:04:07 2006
@@ -111,7 +111,7 @@
</delete>
</target>
- <target name="compile.java" depends="copy.resources">
+ <target name="compile.java">
<echo message="Compiling LUNI classes" />
<mkdir dir="${hy.build}" />
@@ -243,8 +243,8 @@
</target>
<target name="copy.resources">
- <mkdir dir="${hy.luni.bin.main}" />
- <copy todir="${hy.luni.bin.main}" includeemptydirs="false">
+ <mkdir dir="${hy.build}" />
+ <copy todir="${hy.build}" includeemptydirs="false">
<fileset dir="${hy.luni.src.main.java}">
<exclude name="**/*.java" />
</fileset>