52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
---
|
|
build.xml | 24 +++---------------------
|
|
1 file changed, 3 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/build.xml b/build.xml
|
|
index 3fe9f5a..89ced77 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -147,7 +147,7 @@
|
|
<target name="-do-compile" depends="-init">
|
|
<mkdir dir="${build.classes.dir}"/>
|
|
<!-- Compile the java code from ${src} into ${build} -->
|
|
- <javac srcdir="${src.dir}" destdir="${build.classes.dir}" includeantruntime="false"/>
|
|
+ <javac srcdir="${src.dir}" destdir="${build.classes.dir}" nativeheaderdir="${build.native.dir}" includeantruntime="false"/>
|
|
</target>
|
|
|
|
<target name="-compile-java" depends="-do-compile"/>
|
|
@@ -275,28 +275,10 @@
|
|
|
|
|
|
<target name="-generate-version" depends="-init,-init-vars,-generate-version-source">
|
|
- <javac target="${ant.build.javac.target}" destdir="${build.classes.dir}" srcdir="${build.dir}/java" includeantruntime="false"/>
|
|
+ <javac target="1.6" destdir="${build.classes.dir}" srcdir="${build.dir}/java" nativeheaderdir="${build.native.dir}" includeantruntime="false"/>
|
|
</target>
|
|
|
|
- <target name="-generate-native-headers" depends="-init-vars,-generate-version,-compile-java">
|
|
- <mkdir dir="${build.native.dir}"/>
|
|
- <mkdir dir="${build.classes.dir}"/>
|
|
- <javac destdir="${build.native.dir}" nativeheaderdir="${build.native.dir}">
|
|
- <src path="${src.dir}"/>
|
|
- <src path="${build.dir}/java"/>
|
|
- <include name="com/kenai/jffi/Foreign.java"/>
|
|
- <include name="com/kenai/jffi/ObjectBuffer.java"/>
|
|
- <include name="com/kenai/jffi/Version.java"/>
|
|
- </javac>
|
|
- <!--
|
|
- <exec executable="javah" failonerror="true">
|
|
- <arg line="-d ${build.native.dir}"/>
|
|
- <arg line="-classpath ${build.classes.dir}"/>
|
|
- <arg line="com.kenai.jffi.Foreign"/>
|
|
- <arg line="com.kenai.jffi.ObjectBuffer"/>
|
|
- </exec>
|
|
- -->
|
|
- </target>
|
|
+ <target name="-generate-native-headers" depends="-init-vars,-generate-version,-compile-java" />
|
|
|
|
<target name="-build-native-library" depends="-init-vars, -generate-native-headers, -generate-version">
|
|
<mkdir dir="${build.native.dir}"/>
|
|
--
|
|
2.33.0
|
|
|