Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solve issue #94 #95

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Solve issue #94 #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions capsule/src/main/java/Capsule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ public class Capsule implements Runnable, InvocationHandler {
private static final String PROP_JAVA_VERSION = "java.version";
private static final String PROP_JAVA_HOME = "java.home";
private static final String PROP_OS_NAME = "os.name";
private static final String PROP_OS_ARCH = "os.arch";
private static final String PROP_USER_HOME = "user.home";
private static final String PROP_JAVA_LIBRARY_PATH = "java.library.path";
private static final String PROP_FILE_SEPARATOR = "file.separator";
Expand Down Expand Up @@ -215,9 +216,26 @@ public class Capsule implements Runnable, InvocationHandler {
private static final String OS_VMS = "vms";

private static final String OS = getProperty(PROP_OS_NAME).toLowerCase();
private static final String OSArch = getProperty(PROP_OS_ARCH).toLowerCase();

private static final Set<String> PLATFORMS = immutableSet(OS_WINDOWS, OS_MACOS, OS_LINUX, OS_SOLARIS, OS_BSD, OS_AIX, OS_POSIX, OS_UNIX, OS_POSIX, OS_VMS);

/**
* Aliases for os and architecture names (each entry has the form entry(alias,canonical)).
*/
private static final Map<String,String> PLATFORM_ALIASES = immutableMap(
entry("osx", OS_MACOS),
entry("mac", OS_MACOS),
entry("win", OS_WINDOWS),
entry("x86_64", "amd64"),
entry("x86_32", "x86"),
entry("i386", "x86")
);


private static final String PLATFORM = getOS();
private static final String PLATFORM_ARCH = getOSArch();
private static final String PLATFORM_CLASSIFIER = getOSClassifier(); // combine platform and arch compatible with Maven classifier.

private static final String ENV_CACHE_DIR = "CAPSULE_CACHE_DIR";
private static final String ENV_CACHE_NAME = "CAPSULE_CACHE_NAME";
Expand Down Expand Up @@ -2840,6 +2858,9 @@ private static boolean isOsSpecific(String section) {
for (String os : PLATFORMS) {
if (section.endsWith("-" + os))
return true;
// Support for os-arch specific sections.
if (section.startsWith(os + "-"))
return true;
}
return false;
}
Expand Down Expand Up @@ -2909,6 +2930,9 @@ private String getPlatformAttribute(String mode, String attr) {
if (PLATFORM == null)
return null;
String value = null;
// Check first for architecture-specific attributes
if (PLATFORM_CLASSIFIER != null)
value = getAttributes(manifest, mode, PLATFORM_CLASSIFIER).getValue(attr);
if (value == null)
value = getAttributes(manifest, mode, PLATFORM).getValue(attr);
if (value == null && isUnix())
Expand Down Expand Up @@ -3759,6 +3783,48 @@ protected static final boolean isUnix() {
|| PLATFORM == OS_AIX || PLATFORM == OS_HP_UX;
}

/**
* Test whether the current OS is compatible with the
* given os, taking into account aliases
* @param os the OS string to test
* @return
*/
protected static final boolean isOS(String os) {
String canonicalOS = PLATFORM_ALIASES.get(os);
if (canonicalOS == null)
canonicalOS = os;
return PLATFORM.equals(canonicalOS);
}

/**
* Test whether the current OS is compatible with the
* given os, taking into account aliases
* @param arch the arch string to test
* @return
*/
protected static final boolean isArch(String arch) {
String canonicalArch = PLATFORM_ALIASES.get(arch);
if (canonicalArch == null)
canonicalArch = arch;
return PLATFORM_ARCH.equals(canonicalArch);
}

/**
* Test whether the current OS is compatible with the
* given os, taking into account aliases
* @param classifier the classifier string to test (of the form 'os-arch')
* @return
*/
protected static final boolean isClassifier(String classifier) {
String[] parts = classifier.split("-", 2);
if (parts.length < 2) {
// Not a valid classifier
// We'll interpret it as just the OS
return isOS(parts[0]);
}
return isOS(parts[0]) && isArch(parts[1]);
}

private static String getOS() {
if (OS.startsWith("windows"))
return OS_WINDOWS;
Expand All @@ -3781,6 +3847,24 @@ private static String getOS() {
return null;
}

/**
* Canonicalized arch name
* @return
*/
private static String getOSArch() {
String arch = PLATFORM_ALIASES.get(OSArch);
if (arch == null)
arch = OSArch;
return arch;
}

private static String getOSClassifier() {
String os = getOS();
if (os == null)
return null;
return os + "-" + getOSArch();
}

/**
* The suffix of a native library on this OS.
*/
Expand Down Expand Up @@ -4681,6 +4765,15 @@ private static <T> Set<T> immutableSet(T... elems) {
return unmodifiableSet(new HashSet<T>(asList(elems)));
}

@SafeVarargs
private static <K,V> Map<K,V> immutableMap(Entry<K,V>... entries) {
Map<K,V> map = new HashMap<>();
for (Entry<K,V> entry : entries) {
map.put(entry.getKey(), entry.getValue());
}
return unmodifiableMap(map);
}

private static boolean isEmpty(Object x) {
if (x == null)
return true;
Expand Down