WolfSSL
/
wolfcrypt-jni
mirror of https://github.com/wolfSSL/wolfcrypt-jni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

use nativeheaderdir on supported platforms instead of javah

pull/18/head
Chris Conlon 2020-08-26 09:42:02 -07:00
parent a207478ee0
commit 3657875f5f
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
build.xml
View File

@ -41,6 +41,20 @@
<property environment="env" /> <property environment="env" />
<!-- check if javac nativeheaderdir is available -->
<condition property="have-nativeheaderdir">
<and>
<antversion atleast="1.9.8"/>
<not>
<or>
<equals arg1="${ant.java.version}" arg2="1.5"/>
<equals arg1="${ant.java.version}" arg2="1.6"/>
<equals arg1="${ant.java.version}" arg2="1.7"/>
</or>
</not>
</and>
</condition>
<!-- classpath to compiled wolfcrypt-jni.jar, for running tests --> <!-- classpath to compiled wolfcrypt-jni.jar, for running tests -->
<path id="classpath"> <path id="classpath">
<fileset dir="${lib.dir}" includes="*.jar"> <fileset dir="${lib.dir}" includes="*.jar">
@ -89,7 +103,23 @@
</target> </target>
<!-- compile all JNI and JCE source files --> <!-- compile all JNI and JCE source files -->
<target name="compile" depends="init"> <target name="compile-nativeheaderdir" if="have-nativeheaderdir" depends="init">
<javac
srcdir="${src.dir}"
destdir="${build.dir}"
nativeheaderdir="${jni.dir}"
debug="${java.debug}"
debuglevel="${java.debuglevel}"
deprecation="${java.deprecation}"
optimize="${java.optimize}"
source="${java.source}"
target="${java.target}"
classpathref="classpath"
includeantruntime="false">
<compilerarg value="-Xlint:-options" />
</javac>
</target>
<target name="compile-javah" unless="have-nativeheaderdir" depends="init">
<javac <javac
srcdir="${src.dir}" srcdir="${src.dir}"
destdir="${build.dir}" destdir="${build.dir}"
@ -106,7 +136,7 @@
</target> </target>
<!-- create JAR with ONLY JNI classes, not to be used with JCE --> <!-- create JAR with ONLY JNI classes, not to be used with JCE -->
<target name="jar-jni" depends="compile"> <target name="jar-jni" depends="compile-nativeheaderdir, compile-javah">
<jar jarfile="${lib.dir}/wolfcrypt-jni.jar"> <jar jarfile="${lib.dir}/wolfcrypt-jni.jar">
<manifest> <manifest>
<attribute name="Implementation-Title" <attribute name="Implementation-Title"
@ -123,7 +153,7 @@
</target> </target>
<!-- create JAR with JNI and JCE classes, use this when wanting JCE --> <!-- create JAR with JNI and JCE classes, use this when wanting JCE -->
<target name="jar-jce" depends="compile"> <target name="jar-jce" depends="compile-nativeheaderdir, compile-javah">
<jar jarfile="${lib.dir}/wolfcrypt-jni.jar" basedir="${build.dir}"> <jar jarfile="${lib.dir}/wolfcrypt-jni.jar" basedir="${build.dir}">
<manifest> <manifest>
<attribute name="Implementation-Title" <attribute name="Implementation-Title"
@ -172,7 +202,8 @@
</target> </target>
<!-- NOTE: depends on either jar-jni or jar-jce targets --> <!-- NOTE: depends on either jar-jni or jar-jce targets -->
<target name="javah" if="jni.classes.present" depends="jni-class-detect" <target name="javah" if="jni.classes.present" unless="have-nativeheaderdir"
depends="jni-class-detect"
description="Generate javah headers"> description="Generate javah headers">
<javah destdir="${jni.dir}" force="yes" classpathref="classpath"> <javah destdir="${jni.dir}" force="yes" classpathref="classpath">
<class name="com.wolfssl.wolfcrypt.WolfCrypt" /> <class name="com.wolfssl.wolfcrypt.WolfCrypt" />