1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
Author: Yulia Novozhilova <Yulia.Novozhilova@sun.com>
Description: dynlink and cflags
--- a/build.xml
+++ b/build.xml
@@ -393,6 +393,19 @@
<arg value="JNA_JNI_VERSION=${jni.version}"/>
<arg value="CHECKSUM=${jni.md5}"/>
</exec>
+ <antcall target="native-mixedjar"/>
+ <!-- For web start, native libraries may be provided in the root of -->
+ <!-- an included jar file -->
+ <jar jarfile="${build}/${native.jar}">
+ <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
+ <manifest>
+ <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
+ <attribute name="Specification-Version" value="${jni.version}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="native-mixedjar" unless="nomixedjar.native">
<mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
<copy todir="${classes}/com/sun/jna/${os.prefix}">
<fileset dir="${build.native}"
@@ -404,15 +417,6 @@
<fileset dir="${build.native}"
includes="jnidispatch.dll,libjnidispatch.*"/>
</copy>
- <!-- For web start, native libraries may be provided in the root of -->
- <!-- an included jar file -->
- <jar jarfile="${build}/${native.jar}">
- <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
- <manifest>
- <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
- <attribute name="Specification-Version" value="${jni.version}"/>
- </manifest>
- </jar>
</target>
<target name="compile-tests" depends="compile,native,jar"
|
