jna/jna-3.5.2-junit.patch

49 lines
2.7 KiB
Diff
Raw Normal View History

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