diff options
| author | Sven Gothel <[email protected]> | 2013-01-30 15:35:40 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-01-30 15:35:40 +0100 |
| commit | 00c9fa8f2d69d15a2e4183e127b543a92fb5f4b8 (patch) | |
| tree | 87645915a69c3c585cad008e0eee52ecf88b4524 /make/build-test.xml | |
| parent | be6c4158cf901af01be370b31e5bec368a51b2d5 (diff) | |
GlueGen: NativeLibrary Fix, JNILibLoaderBase Enhancement
- NativeLibrary Fix
- enumerateLibraryPaths(..):
- Properly iterate through all prefix _and_ suffix.
- Make public for JNILibLoaderBase.loadLibraryInternal(..)
- isValidNativeLibraryName(..):
- Stop iterating through prefix, if previously found
but suffix doesn't match.
- JNILibLoaderBase.loadLibraryInternal(..) Enhancement
- Mark customLibLoader FIXME: remove (we will get rid of jnlp.launcher.class)
- If System.load(TempJarCache) and System.loadLibrary(plainLibName) fails,
use NativeLibrary.enumerateLibraryPaths() w/ System.load(..) as last resort.
Tested on Linux x86_64 Java6 and OSX Java7 manually, no regressions expected.
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 9810f06..7f2c521 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -417,7 +417,7 @@ chmod 644 ${results}/* \${line.separator} <mkdir dir="${build}/test/results"/> </target> - <target name="junit.run.local.d32" if="isOSX"> + <target name="junit.run.local.osx.d32" if="isOSX"> <var name="jvmDataModel.arg" unset="true"/> <var name="jvmDataModel.arg" value="-d32"/> @@ -433,7 +433,7 @@ chmod 644 ${results}/* \${line.separator} <var name="jvmDataModel.arg" value="-d64"/> </target> - <target name="junit.run.tests" depends="junit.run.local.d32, junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/> + <target name="junit.run.tests" depends="junit.run.local.osx.d32, junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/> <target name="junit.run.if.enabled" unless="junit.is.disabled"> <antcall target="junit.run.tests" inheritRefs="true" inheritAll="true"/> |