jna/jna-3.5.0-junit.patch

62 lines
3.0 KiB
Diff
Raw Normal View History

2012-03-07 11:20:26 +00:00
diff -up ./build.xml.junit ./build.xml
2012-10-26 11:31:17 +00:00
--- ./build.xml.junit 2012-10-26 11:42:01.192000696 +0200
+++ ./build.xml 2012-10-26 11:44:42.912125221 +0200
@@ -239,9 +239,6 @@
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">
2012-10-26 11:31:17 +00:00
- <include name="junit.jar"/>
2012-03-07 11:20:26 +00:00
- </fileset>
<pathelement path="${classes}"/>
</path>
</path>
2012-10-26 11:31:17 +00:00
@@ -429,7 +426,6 @@ osname=macos
<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"/>
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" />
2012-10-26 11:31:17 +00:00
@@ -447,7 +443,6 @@ osname=macos
<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"/>
<fileset dir="${contrib}" includes="*/build.xml" excludes="platform/build.xml"/>
</subant>
</target>
2012-10-26 11:31:17 +00:00
@@ -711,13 +706,12 @@ osname=macos
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"/>
<copy todir="${build}/jws" file="lib/clover.jar"/>
<jar jarfile="${build}/jws/jnidispatch.jar">
<fileset dir="${build.native}" includes="*jnidispatch.*"/>
</jar>
2012-10-26 11:31:17 +00:00
<signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
- <fileset dir="${build}/jws" includes="${jar},${testjar},junit.jar,jnidispatch.jar,clover.jar"/>
+ <fileset dir="${build}/jws" includes="${jar},${testjar},jnidispatch.jar,clover.jar"/>
2012-03-07 11:20:26 +00:00
</signjar>
</target>
2012-10-26 11:31:17 +00:00
@@ -822,7 +816,6 @@ osname=macos
<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"/>
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"/>
2012-10-26 11:31:17 +00:00
@@ -930,7 +923,7 @@ osname=macos
2012-03-07 11:20:26 +00:00
<!-- Full sources required to build and test everything -->
<zip zipfile="${dist}/src-full.zip">
<zipfileset src="${dist}/src.zip"/>
- <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
+ <zipfileset dir="lib" includes="clover.jar" prefix="lib"/>
<zipfileset dir="." includes=".classpath,.project"/>
<zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
</zip>