From 28920e22865be3b566099f569599ec921d915efd Mon Sep 17 00:00:00 2001 From: Harald Wolff Date: Fri, 1 Apr 2016 22:41:34 +0200 Subject: [PATCH] Native Bibliotheken reorganisiert --- src/native/libhwoio.so | Bin 9400 -> 0 bytes .../{libhwoio32.so => linux32/libhwoio.so} | Bin src/native/{libnsp32.so => linux32/libnsp.so} | Bin src/native/{libnsp64.so => linux64/libnsp.so} | Bin src/native/{hwoio32.dll => mswin32/hwoio.dll} | Bin src/native/{nsp32.dll => mswin32/nsp.dll} | Bin src/native/{ => osx32}/libhwoio.dylib | Bin src/org/hwo/nativeloader/NativeLoader.java | 135 ------------------ 8 files changed, 135 deletions(-) delete mode 100644 src/native/libhwoio.so rename src/native/{libhwoio32.so => linux32/libhwoio.so} (100%) rename src/native/{libnsp32.so => linux32/libnsp.so} (100%) rename src/native/{libnsp64.so => linux64/libnsp.so} (100%) rename src/native/{hwoio32.dll => mswin32/hwoio.dll} (100%) rename src/native/{nsp32.dll => mswin32/nsp.dll} (100%) rename src/native/{ => osx32}/libhwoio.dylib (100%) delete mode 100644 src/org/hwo/nativeloader/NativeLoader.java diff --git a/src/native/libhwoio.so b/src/native/libhwoio.so deleted file mode 100644 index b88bef6283af7e2b7c497d93358ac4ed8c32bb8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9400 zcmc&)eQaCR6~B&?)FEx+1StIg>Q!ZHL0D-ARR@IT%k68`l&my^p>?k>_Df@M>|j5q zX}7X$X;B}ZrLv8w{bN`sPU-xUVZBm|l3L76Ry+&sTNc+1KkqfeAy2@mz-{?kFan(fB(^UPY%a+ zm)#WGeeS_~uRWgppyv8Bbra`bd%x!0XCK^sto!*1{f3vuLA_*hvMRQ{$|^nt1=m|4 z&Rq*{PZ9hVfECk!uY{l9m(X{W(Em*d9AM^w$DW=pq5mgPELP8_O5kslzz>(epDBSW zfP3Jvr!@e0>>%)4;8|J({|MUUh8b|M-eZxv;KOmV`Rs@duL1pfR?QC0HPjagt2+e# zj18aR{^u9?$N5`dWS-nF{JbRm90nfKe0b{FTy|7^R~&>_oa5E3ui8K=g#Iz%=K-PL zA`Jd2^y9++GJ!K$-q9Ng%P~!fYO>7aU^u8Txf=+RH*9T}18P*=5sYbSbZdKSC=yn; zDqSJfkQJB6{s9FYD52nPP~6xrZxJ3^LrN^B#@I%sUy&ox9dggkh#ZW_n-wkCuimXj zgG#6)0`&-UKwcT?Q^Ty=AJ#%l^Y2hKMbo0p-yKu6V60D714ceV`CjD#HLC0cUC`jV zvo6UWip12}S1hK61GCqTs{a1jYePHzJuoh6G#ZY`p@<(kBNApYHKh7A7FCrmP;y@! zeeH|}HI;>eU4CyY;$6*THK1q;6wwun86yu6G-&;%4K1zmD(@=qt;Y1gU8F4cXU?Mp zc}LMdTyGuh0?b8Puj7k?urijhd4?hEXCCf>_MIj%kKHyLJ~^Hai0_f~iJz)7{NNsf zYdxiu2{$jv(uI zn@l*CK}j;<)E6l0FyZF*-fP0eQH8tOZo)+ubG*ldi=~3&eI|S!M~v5i2{$iMgC@Mz zq`%*UoBLB5y6BP;6?jlF&d+Q@0%HHrpc-Jmzf*kTaC`?af zA>Hr;PJa%o`4ZM_W z{1O0CvI0q`v?3$v?@2?Mn*OVyn>Noex~XbgcB;E}NgHF^Ug*Z;tzEJgTtL?)8{a{t zC@6^YOUlLlU}{7EdXZ=g|oSaGsE8QZ?N%EP-F40NJEY9S3<56 z{AqKgL}L{2R3lV5CBbXkSVa#2jt>j#^J+QNXJ{>pSEs)Xnnt~${71nZj(HkgW+%7t z{=z)Wi9Si+^Q5H5k4SpwK`G&TQc5r>F(|<}Nr^Zh?N6TI&DCGYPD;8jBMt4zu=o|j zKZ6p|C<3F*sj`J`Ch6nDsG554ayF~`F6F&-aBrO%@+hIRp*@$f@j1i)0Y4Yw3Ew4N z%qg5Nt1Q`DKwBC6!;kyVLcY+3QjL^x;CB1!$OST!-r6u3LILWK|JPwD zJ1^BK&Clkpz5@>)L^vUBW7ISPY^$}R;zL}vtGwh+YWBX*# zfj&qgHC*tPNczh#NKfT-9r3xf$GCFsv5^bc4TB(iVLm#683uDCd!Z_I6MzZ!$+_I9 zH^8W;VAQAd&bRdTb8Wisb(k}+*B)d0eV<9m_RkW&w@jr~8>JYc7Zwsz6&H-2^5QiM^b4W8vtE0i%RBS(#{sYY9QhfLSAd+Kt;xUh zP_F!UK|TcSZZZ4cWB5l16P;7&TwV^^MDmX=XCufDi}G;e!gQ|Opp^z;c%Q*Ud;dbg)1JS;5a-TLF0nrgHP#{g z)A-{Y!gP&6m|Ikc@D7oodX5OaDnY3{=w@F32B8nrjPs&6HZAyniH7`J@VJ5hKNH1I z>~;95Xy6lq9uss-(6fU6L(q=}trP<@U(hcLx?0e6f__8LZb9k%yS}ycHqY`lwJWHE zJ-2wj=3RC3%7zt2jxld+SFfgY0o9@g?V(&aqN&~;;kdUe9t;I;4h9(KdX!iX^9FW> z!P1~`HD$b&fIrn#mjTwmldyIG*7K~C8POm#pf{kPOP{q_dQwh!nhL3o$yr;ig{$!hq!>4 zCsw>Lj$rtimy6d~_2D36KD-N|6F^$GtorWUdS%7y*aC5{v*Ps-pY)g^o_De<8Qts5 zLMQA(v_4t!s~LR{R=hC&f^uhW^~!7Gx>L?R$mS6vhwHe571kfu?=si~?EUN&_)%N` zHw)apZ`{NE=j%!9UpL1K`!gy0CTj1hJ3Mp zK$T+t-{ks*IvP7 z0KPQWi}}oHu3uz*_D8jt7Ka zo1C9=co5ktm~{Y}hq^JiYqht9=Zzq+P34QnqRo+Cf42ymTfNS@;zo!$7oN9z$wlI= zFgDhTn1cFNL9yQt_;}JcWBFNP*0na`{j%k^3R}Va5S#zf|F<08>+p&L%N$Roeoqx* z{<|jSk>YvcW4QZ}J)KvHb_iuyhIpcTmtf%+Xt)!@L-uqZBswVscx}Wi+0#9(2{80c z_H@4_O7}@n;R&`cOOk-YyB*onIhp7kLYwMOdPF-xj(0`k={!x;BkZyMST@yPz$^e6 zY8zs7?j|~dAS5cE?5X`>kfD7GDnX+AE>XH4qdgw^?DhkIVZG=+PVoSubk7GBp0F%) ziUDJ`r}I8h9&<4n(6No^LpFOluM%yv6-ajEa<9#v;ul2i*AJUJ_K2{j@w5MbKpPb# zsNMdc%|3S@5%&^|QJE9IDg_up)%Acz90K(vY#R*$(kldT>iM|99bN%W5 zZ+U)6`c0kyZ9=WmeZ-D?YYCoMf50%fihQ2S~9!SAbB`3+*>n6L@$ G<^LDM`8AdR diff --git a/src/native/libhwoio32.so b/src/native/linux32/libhwoio.so similarity index 100% rename from src/native/libhwoio32.so rename to src/native/linux32/libhwoio.so diff --git a/src/native/libnsp32.so b/src/native/linux32/libnsp.so similarity index 100% rename from src/native/libnsp32.so rename to src/native/linux32/libnsp.so diff --git a/src/native/libnsp64.so b/src/native/linux64/libnsp.so similarity index 100% rename from src/native/libnsp64.so rename to src/native/linux64/libnsp.so diff --git a/src/native/hwoio32.dll b/src/native/mswin32/hwoio.dll similarity index 100% rename from src/native/hwoio32.dll rename to src/native/mswin32/hwoio.dll diff --git a/src/native/nsp32.dll b/src/native/mswin32/nsp.dll similarity index 100% rename from src/native/nsp32.dll rename to src/native/mswin32/nsp.dll diff --git a/src/native/libhwoio.dylib b/src/native/osx32/libhwoio.dylib similarity index 100% rename from src/native/libhwoio.dylib rename to src/native/osx32/libhwoio.dylib diff --git a/src/org/hwo/nativeloader/NativeLoader.java b/src/org/hwo/nativeloader/NativeLoader.java deleted file mode 100644 index 6a364ba..0000000 --- a/src/org/hwo/nativeloader/NativeLoader.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.hwo.nativeloader; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream.GetField; -import java.io.OutputStream; - -import javax.management.RuntimeErrorException; - -import org.hwo.os.OsDetect; -import org.hwo.os.OsDetect.Bitness; -import org.hwo.os.OsDetect.OsType; - -public class NativeLoader { - - private static boolean patchedLinux = false; - - private static String calculateLibraryName(String libName){ - - String platformLibName; - - if (OsDetect.getBitness()==Bitness.B32){ - libName = libName + "32"; - } - if (OsDetect.getBitness()==Bitness.B64){ - libName = libName + "64"; - } - - switch (OsDetect.getOperatingSystem()) - { - case LINUX: - platformLibName = String.format("lib%s.so",libName); - break; - case OSX: - platformLibName = String.format("lib%s.dylib",libName); - break; - case WINDOWS: - platformLibName = String.format("%s.dll",libName); - break; - default: - throw new RuntimeException("Betriebssystem nicht unterst�tzt!"); - } - - return platformLibName; - - } - - public static boolean tryLoad(String libName){ - try - { - System.loadLibrary(libName); - return true; - } catch (UnsatisfiedLinkError e) - { - System.err.println(""); - System.err.println(""); - System.err.println("** tryLoad(...) A *****************************"); - System.err.println(""); - e.printStackTrace(); - - - try - { - System.load(libName); - return true; - } catch (UnsatisfiedLinkError ee) - { - System.err.println(""); - System.err.println(""); - System.err.println("** tryLoad(...) B *****************************"); - System.err.println(""); - ee.printStackTrace(); - } - } - return false; - } - - public static void loadLibrary(String libName) - { - //if (OsDetect.getOperatingSystem()==OsType.LINUX){ - // System.err.println("Linux erkannt. Patche java.library.path"); - System.setProperty("java.library.path",String.format(".:%s",System.getProperty("java.library.path"))); - //} - - - if (tryLoad(libName)) - return; - - String platformLibName = calculateLibraryName(libName); - if (tryLoad(platformLibName)) - return; - - if (tryLoad(new File("").getAbsolutePath() + File.separator + platformLibName)) - return; - - String resourcePath; - - System.err.println(String.format("NativeLoader: Platform dependent Name: %s",platformLibName)); - - resourcePath = "/native/" + platformLibName; - System.err.println(String.format("NativeLoader: Resource name: %s",resourcePath)); - - InputStream libInputStream = NativeLoader.class.getResourceAsStream(resourcePath); - if (libInputStream == null) - { - System.err.println("Resource wurde nicht gefunden!"); - } - - try { - File tempLibFile = File.createTempFile("native-", platformLibName); - FileOutputStream fos = new FileOutputStream(tempLibFile); - - System.err.println(String.format("Using Temp File: %s",tempLibFile.getAbsoluteFile())); - System.err.println(String.format("Size: %d",libInputStream.available())); - - byte[] buffer = new byte[libInputStream.available()]; - libInputStream.read(buffer); - fos.write(buffer); - fos.close(); - - System.err.println(String.format("Loading: %s", tempLibFile.getAbsolutePath())); - System.load(tempLibFile.getAbsolutePath()); - - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - - } - - } - - -}