|
 |
f9fdbdf |
From d3695f95a95e834ed13c8f02f21feaf22ce51627 Mon Sep 17 00:00:00 2001
|
|
|
f9fdbdf |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
f9fdbdf |
Date: Thu, 8 Mar 2012 14:54:23 +0100
|
|
|
f9fdbdf |
Subject: [PATCH] Fix JNI
|
|
|
f9fdbdf |
|
|
|
f9fdbdf |
Prefer JNI and poved JNI files per Java Fedora packaging guidelines
|
|
|
f9fdbdf |
---
|
|
|
f9fdbdf |
packages/jpl/jpl.pl | 5 +++--
|
|
|
f9fdbdf |
packages/jpl/src/java/jpl/JPL.java | 2 +-
|
|
|
f9fdbdf |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
f9fdbdf |
|
|
|
f9fdbdf |
diff --git a/packages/jpl/jpl.pl b/packages/jpl/jpl.pl
|
|
|
f9fdbdf |
index 83b8aee..f614d9e 100644
|
|
|
95321f0 |
--- a/packages/jpl/jpl.pl
|
|
|
95321f0 |
+++ b/packages/jpl/jpl.pl
|
|
|
95321f0 |
@@ -4390,7 +4390,8 @@ prolog:error_message(java_exception(Ex)) -->
|
|
 |
c811996 |
:- multifile user:file_search_path/2.
|
|
|
c811996 |
:- dynamic user:file_search_path/2.
|
|
|
c811996 |
|
|
|
c811996 |
-user:file_search_path(jar, swi(lib)).
|
|
|
95321f0 |
+user:file_search_path(jar, 'LIBDIR/swipl-jpl').
|
|
|
95321f0 |
+user:file_search_path(jni, 'LIBDIR/swipl-jpl').
|
|
|
c811996 |
|
|
|
c811996 |
%% add_search_path(+Var, +Value) is det.
|
|
|
c811996 |
%
|
|
|
c811996 |
@@ -4534,7 +4535,7 @@ add_jpl_to_classpath :-
|
|
|
c811996 |
|
|
|
c811996 |
libjpl(File) :-
|
|
|
c811996 |
( current_prolog_flag(unix, true)
|
|
|
c811996 |
- -> File = foreign(libjpl)
|
|
|
c811996 |
+ -> File = jni(libjpl)
|
|
|
c811996 |
; File = foreign(jpl)
|
|
|
c811996 |
).
|
|
|
c811996 |
|
|
|
f9fdbdf |
diff --git a/packages/jpl/src/java/jpl/JPL.java b/packages/jpl/src/java/jpl/JPL.java
|
|
|
f9fdbdf |
index 1c82d83..311355c 100644
|
|
|
f9fdbdf |
--- a/packages/jpl/src/java/jpl/JPL.java
|
|
|
f9fdbdf |
+++ b/packages/jpl/src/java/jpl/JPL.java
|
|
|
f9fdbdf |
@@ -97,7 +97,7 @@ public class JPL {
|
|
|
f9fdbdf |
} else if (nativeLibraryDir != null) {
|
|
|
f9fdbdf |
System.load((new File(nativeLibraryDir, System.mapLibraryName(nativeLibraryName))).getAbsolutePath());
|
|
|
f9fdbdf |
} else {
|
|
|
f9fdbdf |
- System.loadLibrary(nativeLibraryName); // as resolved somewhere on system property 'java.library.path'
|
|
|
f9fdbdf |
+ System.load((new File(LIBDIR, System.mapLibraryName(nativeLibraryName))).getAbsolutePath());
|
|
|
f9fdbdf |
}
|
|
|
f9fdbdf |
}
|
|
|
f9fdbdf |
// setDTMMode
|
|
|
f9fdbdf |
--
|
|
|
f9fdbdf |
1.7.7.6
|
|
|
f9fdbdf |
|