49 lines
2.7 KiB
Diff
49 lines
2.7 KiB
Diff
diff -up ./build.xml.junit ./build.xml
|
|
--- ./build.xml.junit 2014-03-07 12:52:05.899899902 +0100
|
|
+++ ./build.xml 2014-03-07 12:58:14.956255306 +0100
|
|
@@ -290,7 +290,7 @@
|
|
<target name="-setup" depends="-dynamic-properties">
|
|
<path id="compile-test.path">
|
|
<path id="test.libs">
|
|
- <fileset dir="lib">
|
|
+ <fileset dir="/usr/share/java">
|
|
<include name="junit.jar"/>
|
|
</fileset>
|
|
<fileset dir="lib/test"/>
|
|
@@ -486,7 +486,7 @@ osname=macosx;processor=x86;processor=x8
|
|
<subant target="jar" failonerror="true">
|
|
<property name="file.reference.jna.build" location="${build}"/>
|
|
<property name="file.reference.jna.jar" location="${build}/${jar}"/>
|
|
- <property name="libs.junit.classpath" location="lib/junit.jar"/>
|
|
+ <property name="libs.junit.classpath" location="/usr/share/java/junit.jar"/>
|
|
<property name="javac.source" value="${platform.compatibility}"/>
|
|
<property name="javac.target" value="${platform.compatibility}"/>
|
|
<!-- OSGi manifest properties -->
|
|
@@ -509,7 +509,7 @@ osname=macosx;processor=x86;processor=x8
|
|
<subant target="jar" failonerror="true">
|
|
<property name="file.reference.jna.build" location="${build}"/>
|
|
<property name="file.reference.jna.jar" location="${build}/${jar}"/>
|
|
- <property name="libs.junit.classpath" location="lib/junit.jar"/>
|
|
+ <property name="libs.junit.classpath" location="/usr/share/java/junit.jar"/>
|
|
<fileset dir="${contrib}" includes="*/build.xml" excludes="platform/build.xml"/>
|
|
</subant>
|
|
</target>
|
|
@@ -822,7 +822,7 @@ osname=macosx;processor=x86;processor=x8
|
|
<mkdir dir="${build}/jws"/>
|
|
<copy todir="${build}/jws" file="${build}/${jar}"/>
|
|
<copy todir="${build}/jws" file="${build}/${testjar}"/>
|
|
- <copy todir="${build}/jws" file="lib/junit.jar"/>
|
|
+ <copy todir="${build}/jws" file="/usr/share/java/junit.jar"/>
|
|
<copy todir="${build}/jws" file="lib/clover.jar"/>
|
|
<jar jarfile="${build}/jws/jnidispatch.jar">
|
|
<fileset dir="${build.native}" includes="*jnidispatch.*"/>
|
|
@@ -933,7 +933,7 @@ osname=macosx;processor=x86;processor=x8
|
|
<subant target="test" failonerror="true" inheritall="true" inheritrefs="true">
|
|
<property name="file.reference.jna.build" location="${build}"/>
|
|
<property name="file.reference.jna.jar" location="${build}/${jar}"/>
|
|
- <property name="libs.junit.classpath" location="lib/junit.jar"/>
|
|
+ <property name="libs.junit.classpath" location="/usr/share/java/junit.jar"/>
|
|
<property name="javac.source" value="${test.compatibility}"/>
|
|
<property name="javac.target" value="${test.compatibility}"/>
|
|
<fileset dir="${contrib}" includes="platform/build.xml"/>
|