bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24 from ville-k/master 

OSX 10.8 - fix building java bindings
This commit is contained in:
Martin Englund 2013-05-08 09:00:57 -07:00
parent 83fbcbeb4e a20ec372b7
commit 907fe7a87f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
View File

@ -90,8 +90,12 @@ public class ArchNameTask extends Task {
if (ArchLoader.IS_DARWIN) { if (ArchLoader.IS_DARWIN) {
//default to most recent SDK //default to most recent SDK
//MacOSX10.3.9.sdk, MacOSX10.4u.sdk, MacOSX10.5.sdk,etc. //MacOSX10.3.9.sdk, MacOSX10.4u.sdk, MacOSX10.5.sdk,etc.
String sdkRoot = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs";
if (new File(sdkRoot).exists() == false) {
sdkRoot = "/Developer/SDKs";
}
File[] sdks = File[] sdks =
new File("/Developer/SDKs").listFiles(new FileFilter() { new File(sdkRoot).listFiles(new FileFilter() {
public boolean accept(File file) { public boolean accept(File file) {
String name = file.getName(); String name = file.getName();
return return
@ -99,6 +103,7 @@ public class ArchNameTask extends Task {
name.endsWith(".sdk"); name.endsWith(".sdk");
} }
}); });
if (sdks != null) { if (sdks != null) {
Arrays.sort(sdks); Arrays.sort(sdks);
String prop = "uni.sdk"; String prop = "uni.sdk";