tyler.durden/snappy-java
1
0
Fork 0
mirror of https://github.com/xerial/snappy-java.git synced 2025-07-23 05:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for #45. osgi.arch -> processor

Browse Source
This commit is contained in:
Taro L. Saito 2013-10-15 22:49:10 +09:00
parent 9aaf3470c9
commit c9d782adda
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -182,15 +182,15 @@
<Import-Package>org.osgi.framework;version="[1.5,2)"</Import-Package> <Import-Package>org.osgi.framework;version="[1.5,2)"</Import-Package>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Bundle-NativeCode> <Bundle-NativeCode>
org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86-64)(osgi.os=win32))", org/xerial/snappy/native/Windows/x86_64/snappyjava.dll;selection-filter="(&amp;(processor=x86-64)(osgi.os=win32))",
org/xerial/snappy/native/Windows/x86/snappyjava.dll;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=win32))", org/xerial/snappy/native/Windows/x86/snappyjava.dll;selection-filter="(&amp;(processor=x86)(osgi.os=win32))",
org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=macosx))", org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib;selection-filter="(&amp;(processor=x86)(osgi.os=macosx))",
org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;selection-filter="(&amp;(osgi.arch=x86-64)(osgi.os=macosx))", org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;selection-filter="(&amp;(processor=x86-64)(osgi.os=macosx))",
org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86-64)(osgi.os=linux))", org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so;selection-filter="(&amp;(processor=x86-64)(osgi.os=linux))",
org/xerial/snappy/native/Linux/x86/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=linux))", org/xerial/snappy/native/Linux/x86/libsnappyjava.so;selection-filter="(&amp;(processor=x86)(osgi.os=linux))",
org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=x86)(osgi.os=sunos))", org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;selection-filter="(&amp;(processor=x86)(osgi.os=sunos))",
org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=sparc)(osgi.os=sunos))", org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so;selection-filter="(&amp;(processor=sparc)(osgi.os=sunos))",
org/xerial/snappy/native/Linux/arm/libsnappyjava.so;selection-filter="(&amp;(osgi.arch=arm)(osgi.os=linux))" org/xerial/snappy/native/Linux/arm/libsnappyjava.so;selection-filter="(&amp;(processor=arm)(osgi.os=linux))"
</Bundle-NativeCode> </Bundle-NativeCode>
<!-- TODO: unsure about ARMHF --> <!-- TODO: unsure about ARMHF -->
</instructions> </instructions>

2
src/main/java/org/xerial/snappy/SnappyBundleActivator.java
View File

@ -56,6 +56,6 @@ public class SnappyBundleActivator implements BundleActivator
public void stop(BundleContext context) throws Exception public void stop(BundleContext context) throws Exception
{ {
SnappyLoader.setApi(null); SnappyLoader.setApi(null);
Snappy.cleanUp(); SnappyLoader.cleanUpExtractedNativeLib();
} }
} }