debugging and forcing use of the local version of jna for #3800 and #3624

This commit is contained in:
Ben Fry
2015-09-20 11:07:56 -04:00
parent 0bb1cfc01e
commit c4ffdfe68c
3 changed files with 13 additions and 4 deletions

View File

@@ -1036,7 +1036,7 @@
<equals arg1="${sun.arch.data.model}" arg2="64" />
</condition>
<unzip src="../app/lib/jna.jar" dest="windows/work">
<unzip src="../app/lib/jna.jar" dest="windows/work/lib">
<patternset>
<include name="com/sun/jna/${jna.subfolder}/jnidispatch.dll" />
</patternset>

View File

@@ -33,7 +33,7 @@
https://github.com/processing/processing/issues/2239 -->
<opt>-Djna.nosys=true</opt>
<!-- starting in 3.0, require Java 8 -->
<minVersion>1.8.0</minVersion>
<minVersion>1.8.0_51</minVersion>
<!-- increase available per PDE X request -->
<maxHeapSize>256</maxHeapSize>
</jre>

View File

@@ -32,8 +32,17 @@
<path>java</path>
<!-- https://github.com/processing/processing/issues/2239 -->
<opt>-Djna.nosys=true</opt>
<!-- for 2.2, set a minimum version -->
<minVersion>1.7.0_40</minVersion>
<!-- Because nosys is set to true, the DLL in the current working
directory won't be considered. And we can't specify the user's
directory here because that'll get us into encoding trouble.
(See https://github.com/processing/processing/issues/3624)
Instead, set this so that Native.loadNativeLibrary() will use
new File(path, "jnidispatch.dll") which will be relative to the
directory of processing.exe (the current working directory). -->
<opt>-Djna.boot.library.path=lib</opt>
<opt>-Djna.nounpack=true</opt>
<!-- starting in 3.0, require Java 8 -->
<minVersion>1.8.0_51</minVersion>
<!-- increase available per PDE X request -->
<maxHeapSize>256</maxHeapSize>
</jre>