rik/jlibloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some tweaks to error messages for unsupported platforms.

Browse Source
This commit is contained in:
Adam Murdoch
2013-02-07 16:58:33 +11:00
parent 9e0493f94e
commit ff3abfd4fd
4 changed files with 257 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/rubygrapefruit/platform/Native.java
View File

@@ -51,7 +51,7 @@ public class Native {
if (loader == null) {
Platform platform = Platform.current();
try {
loader = new NativeLibraryLoader(new NativeLibraryLocator(extractDir));
loader = new NativeLibraryLoader(platform, new NativeLibraryLocator(extractDir));
loader.load(platform.getLibraryName());
int nativeVersion = NativeLibraryFunctions.getVersion();
if (nativeVersion != NativeLibraryFunctions.VERSION) {

21
src/main/java/net/rubygrapefruit/platform/internal/NativeLibraryLoader.java Normal file → Executable file
View File

@@ -25,28 +25,29 @@ import java.util.Set;
public class NativeLibraryLoader {
private final Set<String> loaded = new HashSet<String>();
private final NativeLibraryLocator locator;
private final Platform platform;
private final NativeLibraryLocator nativeLibraryLocator;
public NativeLibraryLoader(NativeLibraryLocator locator) {
this.locator = locator;
public NativeLibraryLoader(Platform platform, NativeLibraryLocator nativeLibraryLocator) {
this.platform = platform;
this.nativeLibraryLocator = nativeLibraryLocator;
}
public void load(String name) {
if (loaded.contains(name)) {
public void load(String libraryFileName) {
if (loaded.contains(libraryFileName)) {
return;
}
try {
File libFile = locator.find(name);
File libFile = nativeLibraryLocator.find(libraryFileName);
if (libFile == null) {
throw new NativeIntegrationUnavailableException(String.format(
"Native library is not available for this operating system and architecture."));
throw new NativeIntegrationUnavailableException(String.format("Native library is not available for %s.", platform));
}
System.load(libFile.getCanonicalPath());
} catch (NativeException e) {
throw e;
} catch (Throwable t) {
throw new NativeException(String.format("Failed to load native library '%s'.", name), t);
throw new NativeException(String.format("Failed to load native library '%s' for %s.", libraryFileName, platform), t);
}
loaded.add(name);
loaded.add(libraryFileName);
}
}

12
src/main/java/net/rubygrapefruit/platform/internal/NativeLibraryLocator.java Normal file → Executable file
View File

@@ -30,9 +30,9 @@ public class NativeLibraryLocator {
this.extractDir = extractDir;
}
public File find(String libraryName) throws IOException {
public File find(String libraryFileName) throws IOException {
if (extractDir != null) {
File libFile = new File(extractDir, String.format("%s/%s", NativeLibraryFunctions.VERSION, libraryName));
File libFile = new File(extractDir, String.format("%s/%s", NativeLibraryFunctions.VERSION, libraryFileName));
File lockFile = new File(libFile.getParentFile(), libFile.getName() + ".lock");
lockFile.getParentFile().mkdirs();
lockFile.createNewFile();
@@ -44,7 +44,7 @@ public class NativeLibraryLocator {
// Library has been extracted
return libFile;
}
URL resource = getClass().getClassLoader().getResource(libraryName);
URL resource = getClass().getClassLoader().getResource(libraryFileName);
if (resource != null) {
// Extract library and write marker to lock file
libFile.getParentFile().mkdirs();
@@ -58,20 +58,20 @@ public class NativeLibraryLocator {
lockFileAccess.close();
}
} else {
URL resource = getClass().getClassLoader().getResource(libraryName);
URL resource = getClass().getClassLoader().getResource(libraryFileName);
if (resource != null) {
File libFile;
File libDir = File.createTempFile("native-platform", "dir");
libDir.delete();
libDir.mkdirs();
libFile = new File(libDir, libraryName);
libFile = new File(libDir, libraryFileName);
libFile.deleteOnExit();
copy(resource, libFile);
return libFile;
}
}
File libFile = new File("build/binaries/" + libraryName);
File libFile = new File("build/binaries/" + libraryFileName);
if (libFile.isFile()) {
return libFile;
}

6
src/main/java/net/rubygrapefruit/platform/internal/Platform.java
View File

@@ -67,13 +67,11 @@ public abstract class Platform {
}
public <T extends NativeIntegration> T get(Class<T> type, NativeLibraryLoader nativeLibraryLoader) {
throw new NativeIntegrationUnavailableException(String.format("Native integration %s is not supported for the current operating system (%s)",
type.getSimpleName(), toString()));
throw new NativeIntegrationUnavailableException(String.format("Native integration %s is not supported for %s.", type.getSimpleName(), toString()));
}
public String getLibraryName() {
throw new NativeIntegrationUnavailableException(String.format(
"Native integration is not available for the current operating system (%s)", toString()));
throw new NativeIntegrationUnavailableException(String.format("Native integration is not available for %s.", toString()));
}
private static String getOperatingSystem() {