37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
--- build.xml.orig 2019-04-12 05:55:47.000000000 +0800
|
|
+++ build.xml 2023-09-28 15:19:49.685986300 +0800
|
|
@@ -83,7 +83,7 @@
|
|
<property name="maven.doc.base.dir" value="${out.dir}/mavendoc"/>
|
|
<property name="cldr.util.out.dir" value="${out.dir}/cldr_util"/>
|
|
<property name="cldr.release.dir" value="release_cldr"/>
|
|
- <property name="external-jars" value="lib"/>
|
|
+ <property name="external-jars" value="/usr/share/java"/>
|
|
|
|
<!-- Java version check -->
|
|
<condition property="is.java7">
|
|
@@ -228,7 +228,7 @@
|
|
<ivy:retrieve/>
|
|
</target>
|
|
|
|
- <target name="init" depends="test-init-junit-dependency"
|
|
+ <target name="init"
|
|
description="Initialize the environment for build and test. May require internet access."/>
|
|
|
|
<target name="_classifytests">
|
|
@@ -350,13 +350,11 @@
|
|
</macrodef>
|
|
|
|
<property name="junit.out.dir" value="${out.dir}/junit-results"/>
|
|
- <property name="junit.core.jar" value="${external-jars}/junit-4.12.jar"/>
|
|
- <property name="junit.hamcrest.jar" value="${external-jars}/hamcrest-core-1.3.jar"/>
|
|
- <property name="junit.junitparams.jar" value="${external-jars}/JUnitParams-1.0.5.jar"/>
|
|
+ <property name="junit.core.jar" value="${external-jars}/junit.jar"/>
|
|
+ <property name="junit.hamcrest.jar" value="${external-jars}/hamcrest/hamcrest.jar"/>
|
|
<path id="junit.jars">
|
|
<pathelement path="${junit.core.jar}"/>
|
|
<pathelement path="${junit.hamcrest.jar}"/>
|
|
- <pathelement path="${junit.junitparams.jar}"/>
|
|
</path>
|
|
|
|
<path id="junit.icu.jars">
|