|
 |
67ea67 |
diff -up ./build.xml.junit ./build.xml
|
|
|
67ea67 |
--- ./build.xml.junit 2013-04-29 15:06:12.423790515 +0200
|
|
|
67ea67 |
+++ ./build.xml 2013-04-29 15:07:09.442166774 +0200
|
|
|
67ea67 |
@@ -250,7 +250,7 @@
|
|
|
67ea67 |
<target name="-setup" depends="-dynamic-properties">
|
|
|
67ea67 |
<path id="compile-test.path">
|
|
|
67ea67 |
<path id="test.libs">
|
|
|
67ea67 |
- <fileset dir="lib">
|
|
|
67ea67 |
+ <fileset dir="/usr/share/java">
|
|
|
67ea67 |
<include name="junit.jar"/>
|
|
|
67ea67 |
</fileset>
|
|
|
67ea67 |
<fileset dir="lib/test"/>
|
|
|
67ea67 |
@@ -441,7 +441,7 @@ osname=macosx;processor=x86;processor=x8
|
|
|
67ea67 |
<subant target="jar" failonerror="true">
|
|
|
67ea67 |
<property name="file.reference.jna.build" location="${build}"/>
|
|
|
67ea67 |
<property name="file.reference.jna.jar" location="${build}/${jar}"/>
|
|
|
67ea67 |
- <property name="libs.junit.classpath" location="lib/junit.jar"/>
|
|
|
67ea67 |
+ <property name="libs.junit.classpath" location="/usr/share/java/junit.jar"/>
|
|
|
67ea67 |
<property name="javac.source" value="${platform.compatibility}"/>
|
|
|
67ea67 |
<property name="javac.target" value="${platform.compatibility}"/>
|
|
|
67ea67 |
<fileset dir="${contrib}" includes="platform/build.xml" />
|
|
|
67ea67 |
@@ -456,7 +456,7 @@ osname=macosx;processor=x86;processor=x8
|
|
|
67ea67 |
<subant target="jar" failonerror="true">
|
|
|
67ea67 |
<property name="file.reference.jna.build" location="${build}"/>
|
|
|
67ea67 |
<property name="file.reference.jna.jar" location="${build}/${jar}"/>
|
|
|
67ea67 |
- <property name="libs.junit.classpath" location="lib/junit.jar"/>
|
|
|
67ea67 |
+ <property name="libs.junit.classpath" location="/usr/share/java/junit.jar"/>
|
|
|
67ea67 |
<fileset dir="${contrib}" includes="*/build.xml" excludes="platform/build.xml"/>
|
|
|
67ea67 |
</subant>
|
|
|
67ea67 |
</target>
|
|
|
67ea67 |
@@ -734,7 +734,7 @@ osname=macosx;processor=x86;processor=x8
|
|
|
67ea67 |
<mkdir dir="${build}/jws"/>
|
|
|
67ea67 |
<copy todir="${build}/jws" file="${build}/${jar}"/>
|
|
|
67ea67 |
<copy todir="${build}/jws" file="${build}/${testjar}"/>
|
|
|
67ea67 |
- <copy todir="${build}/jws" file="lib/junit.jar"/>
|
|
|
67ea67 |
+ <copy todir="${build}/jws" file="/usr/share/java/junit.jar"/>
|
|
|
67ea67 |
<copy todir="${build}/jws" file="lib/clover.jar"/>
|
|
|
67ea67 |
<jar jarfile="${build}/jws/jnidispatch.jar">
|
|
|
67ea67 |
<fileset dir="${build.native}" includes="*jnidispatch.*"/>
|
|
|
67ea67 |
@@ -845,7 +845,7 @@ osname=macosx;processor=x86;processor=x8
|
|
|
67ea67 |
<subant target="test" failonerror="true">
|
|
|
67ea67 |
<property name="file.reference.jna.build" location="${build}"/>
|
|
|
67ea67 |
<property name="file.reference.jna.jar" location="${build}/${jar}"/>
|
|
|
67ea67 |
- <property name="libs.junit.classpath" location="lib/junit.jar"/>
|
|
|
67ea67 |
+ <property name="libs.junit.classpath" location="/usr/share/java/junit.jar"/>
|
|
|
67ea67 |
<property name="javac.source" value="${test.compatibility}"/>
|
|
|
67ea67 |
<property name="javac.target" value="${test.compatibility}"/>
|
|
|
67ea67 |
<fileset dir="${contrib}" includes="platform/build.xml"/>
|