Author: nextgens
Date: 2006-11-11 01:16:11 +0000 (Sat, 11 Nov 2006)
New Revision: 10876
Modified:
trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
trunk/contrib/fec/lib/native.properties
Log:
Contrib: FEC: maybe fix the native libraries not loading on x86_64 problem
Modified:
trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
===================================================================
--- trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
2006-11-11 00:51:29 UTC (rev 10875)
+++ trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
2006-11-11 01:16:11 UTC (rev 10876)
@@ -48,12 +48,21 @@
public class NativeDeployer {
- public final static String OS_ARCH =
- (System.getProperty("os.name").startsWith("Windows ")) ? "win32" :
- System.getProperty("os.name").toLowerCase()+"-"+
- (System.getProperty("os.arch").toLowerCase().indexOf("86") != -1 ?
- "x86" : System.getProperty("os.arch").toLowerCase());
+ public final static String OS_ARCH;
+ static {
+ if(System.getProperty("os.name").startsWith("Windows "))
+ OS_ARCH="win32";
+ else{
+
if(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)"))
+
OS_ARCH=System.getProperty("os.name").toLowerCase()+"-x86_64";
+ else
if(System.getProperty("os.arch").toLowerCase().indexOf("86") != -1)
+
OS_ARCH=System.getProperty("os.name").toLowerCase()+"-x86";
+ else
+
OS_ARCH=System.getProperty("os.name").toLowerCase()+"-"+System.getProperty("os.arch").toLowerCase();
+ }
+ }
+
public final static String NATIVE_PROPERTIES_PATH =
"lib/native.properties";
Modified: trunk/contrib/fec/lib/native.properties
===================================================================
--- trunk/contrib/fec/lib/native.properties 2006-11-11 00:51:29 UTC (rev
10875)
+++ trunk/contrib/fec/lib/native.properties 2006-11-11 01:16:11 UTC (rev
10876)
@@ -1,4 +1,4 @@
-com.onionnetworks.native.keys=fec8-linux-x86,fec16-linux-x86,fec8-linux-x86-64,fec16-linux-x86-64,fec8-win32,fec16-win32
+com.onionnetworks.native.keys=fec8-linux-x86,fec16-linux-x86,fec8-linux-x86_64,fec16-linux-x86_64,fec8-win32,fec16-win32
com.onionnetworks.native.fec8-linux-x86.name=fec8
com.onionnetworks.native.fec8-linux-x86.osarch=linux-x86
@@ -9,11 +9,11 @@
com.onionnetworks.native.fec16-linux-x86.path=lib/linux/x86/libfec16.so
com.onionnetworks.native.fec8-linux-x86_64.name=fec8
-com.onionnetworks.native.fec8-linux-x86_64.osarch=linux-x86-64
+com.onionnetworks.native.fec8-linux-x86_64.osarch=linux-x86_64
com.onionnetworks.native.fec8-linux-x86_64.path=lib/linux/x86_64/libfec8.so
com.onionnetworks.native.fec16-linux-x86_64.name=fec16
-com.onionnetworks.native.fec16-linux-x86_64.osarch=linux-x86-64
+com.onionnetworks.native.fec16-linux-x86_64.osarch=linux-x86_64
com.onionnetworks.native.fec16-linux-x86_64.path=lib/linux/x86_64/libfec16.so
com.onionnetworks.native.fec8-win32.name=fec8
