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

Resolve native lib version collectly by referring VERSION file

Browse Source
This commit is contained in:
Taro L. Saito 2011-06-04 10:35:19 +09:00
parent f7c90faa1d
commit 26774e3ca7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -13,6 +13,12 @@
<build> <build>
<resources> <resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>org/xerial/snappy/VERSION</include>
</includes>
</resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<includes> <includes>
@ -23,7 +29,6 @@
<directory>${basedir}</directory> <directory>${basedir}</directory>
<targetPath>META-INF/maven/${project.groupId}/${project.artifactId}</targetPath> <targetPath>META-INF/maven/${project.groupId}/${project.artifactId}</targetPath>
<includes> <includes>
<include>VERSION</include>
<include>LICENSE*</include> <include>LICENSE*</include>
</includes> </includes>
</resource> </resource>

5
src/main/java/org/xerial/snappy/LoadSnappy.java
View File

@ -96,7 +96,6 @@ public class LoadSnappy
String targetFolder) { String targetFolder) {
String nativeLibraryFilePath = libFolderForCurrentOS + "/" + libraryFileName; String nativeLibraryFilePath = libFolderForCurrentOS + "/" + libraryFileName;
final String prefix = "snappy-" + getVersion() + "-"; final String prefix = "snappy-" + getVersion() + "-";
String extractedLibFileName = prefix + libraryFileName; String extractedLibFileName = prefix + libraryFileName;
File extractedLibFile = new File(targetFolder, extractedLibFileName); File extractedLibFile = new File(targetFolder, extractedLibFileName);
@ -226,7 +225,7 @@ public class LoadSnappy
URL versionFile = LoadSnappy.class.getResource("/META-INF/maven/org.xerial.snappy/snappy-java/pom.properties"); URL versionFile = LoadSnappy.class.getResource("/META-INF/maven/org.xerial.snappy/snappy-java/pom.properties");
if (versionFile == null) if (versionFile == null)
versionFile = LoadSnappy.class.getResource("/META-INF/maven/org.xerial.snappy/snappy-java/VERSION"); versionFile = LoadSnappy.class.getResource("/org/xerial/snappy/VERSION");
String version = "unknown"; String version = "unknown";
try { try {
@ -234,6 +233,8 @@ public class LoadSnappy
Properties versionData = new Properties(); Properties versionData = new Properties();
versionData.load(versionFile.openStream()); versionData.load(versionFile.openStream());
version = versionData.getProperty("version", version); version = versionData.getProperty("version", version);
if (version.equals("unknown"))
version = versionData.getProperty("VERSION", version);
version = version.trim().replaceAll("[^0-9\\.]", ""); version = version.trim().replaceAll("[^0-9\\.]", "");
} }
} }