9530e77100
Upgrade from 6.1.5 to 6.2.31. Based on: PR: 156251 Submitted by: pi Now that the test-target fully works, add "regression-test" alias to it so it can be used for that purpose.
39 lines
1.3 KiB
Text
39 lines
1.3 KiB
Text
--- build.xml 2014-12-17 02:30:51 UTC
|
|
+++ build.xml 2015-05-12 12:14:56 -0400
|
|
@@ -132,6 +132,9 @@
|
|
</path>
|
|
|
|
+ <property environment="env"/>
|
|
<path id="unittest.classpath">
|
|
<path refid="class.path"/>
|
|
+ <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
|
|
+ <pathelement location="${env.JAVALIBDIR}/hamcrest.jar"/>
|
|
<pathelement location="${unittest.destdir}"/>
|
|
<pathelement path="${junit.jarfile}"/>
|
|
@@ -872,5 +875,5 @@
|
|
</target>
|
|
|
|
- <target name="compile-unittest" depends="compile-src, get-junit-jar">
|
|
+ <target name="compile-unittest" depends="compile-src">
|
|
<ant antfile="ant/compile.xml" dir="." inheritall="false">
|
|
<property name="srcdir" value="${unittest.srcdir}"/>
|
|
@@ -917,4 +920,5 @@
|
|
<property name="destdir" value="${unittest.testserialdir}"/>
|
|
<reference refid="class.path" torefid="compile.classpath"/>
|
|
+ <reference refid="unittest.classpath" torefid="compile.classpath"/>
|
|
</ant>
|
|
|
|
@@ -2127,5 +2131,4 @@
|
|
<mkdir dir="${installdir}"/>
|
|
<mkdir dir="${installdir}/docs"/>
|
|
- <mkdir dir="${installdir}/bin"/>
|
|
<mkdir dir="${installdir}/lib"/>
|
|
<copy todir="${installdir}/docs">
|
|
@@ -2137,7 +2140,4 @@
|
|
<fileset dir="lib"/>
|
|
</copy>
|
|
- <copy todir="${installdir}/bin">
|
|
- <fileset dir="bin"/>
|
|
- </copy>
|
|
</target>
|
|
|