Merging some changes tested in mrh branch. As mentioned on dev list.

git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk@1027390 13f79535-47bb-0310-9956-ffa450edef68
master
Mark Hindess 14 years ago
parent bfb16e3dc4
commit 02faa11ed0
  1. 18
      build.xml
  2. 2
      make/depends.properties
  3. 4
      make/run-test.xml

@ -19,10 +19,10 @@
<project name="PACK200 Build" default="build" basedir="."> <project name="PACK200 Build" default="build" basedir=".">
<description>Build for PACK200 component</description> <description>Build for PACK200 component</description>
<property name="hy.component" value="classlib" />
<property name="hy.module" value="pack200" /> <property name="hy.module" value="pack200" />
<property name="hy.hdk" location="${basedir}/../../deploy" /> <property name="hy.target" location="${basedir}/../../target" />
<property name="depends.dir" location="${basedir}/../../depends" /> <import file="${hy.target}/hdk/build/ant/properties.xml" />
<import file="${hy.hdk}/build/ant/properties.xml" />
<import file="${hy.hdk}/build/ant/depends.xml" /> <import file="${hy.hdk}/build/ant/depends.xml" />
<property file="../../make/depends.properties" /> <property file="../../make/depends.properties" />
@ -75,18 +75,18 @@
<target name="-clean-test" unless="skip.test.build"> <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" /> <delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/> <delete failonerror="false" dir="${hy.build.mod}/test"/>
</target> </target>
<target name="-compile-java" unless="skip.java.build"> <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" /> <echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" /> <mkdir dir="${hy.build.top}/java" />
<!-- Ordinary classes --> <!-- Ordinary classes -->
<hy.javac sourcepath="" <hy.javac sourcepath=""
srcdir="src/main/java" srcdir="src/main/java"
destdir="../../build/classes" destdir="${hy.build.top}/java"
source="1.4" source="1.4"
target="1.4"> target="1.4">
@ -140,7 +140,7 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" /> <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
<hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar"> <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" /> <fileset dir="${hy.build.mod}/test/api" />
</hy.jar.bin> </hy.jar.bin>
<mkdir dir="${tests.excludes.hdk.dir}"/> <mkdir dir="${tests.excludes.hdk.dir}"/>
@ -159,7 +159,7 @@
</target> </target>
<target name="-compile-tests" unless="skip.test.build"> <target name="-compile-tests" unless="skip.test.build">
<mkdir dir="bin/test" /> <mkdir dir="${hy.build.mod}/test/api" />
<mkdir dir="${hy.hdk}/build/test" /> <mkdir dir="${hy.hdk}/build/test" />
<copy file="${junit.jar}" <copy file="${junit.jar}"
@ -169,7 +169,7 @@
<echo message="Compiling ${hy.module} tests" /> <echo message="Compiling ${hy.module} tests" />
<hy.javac srcdir="src/test/java" <hy.javac srcdir="src/test/java"
destdir="bin/test" destdir="${hy.build.mod}/test/api"
sourcepath="" sourcepath=""
source="1.4" source="1.4"
target="1.4"> target="1.4">

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
depends.jars=${depends.dir}/jars depends.jars=${hy.depends}/jars
asm.ver=asm-3.1 asm.ver=asm-3.1
asm.dir=${depends.jars}/${asm.ver} asm.dir=${depends.jars}/${asm.ver}
asm.jar=${asm.dir}/${asm.ver}.jar asm.jar=${asm.dir}/${asm.ver}.jar

@ -23,7 +23,9 @@
<property file="../test.properties" /> <property file="../test.properties" />
<property name="work.dir" value=".." /> <property name="work.dir" value=".." />
<property name="target.dir" value=".." /> <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="pack200" />
<property name="tests.output" location="../report" /> <property name="tests.output" location="../report" />
<property name="junit.jar" location="../junit.jar" /> <property name="junit.jar" location="../junit.jar" />

Loading…
Cancel
Save