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

Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern 2009-09-08 21:50:35 -07:00
parent 84b073e889 cb1f3dafe7
commit d55a1fb20e
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bindings/java/hyperic_jni/jni-build.xml
View File

@ -25,7 +25,6 @@ USA.
<property name="jni.src.java" value="src"/> <property name="jni.src.java" value="src"/>
<property name="jni.libprefix" value="java"/> <property name="jni.libprefix" value="java"/>
<property name="jni.libversion" value=""/> <property name="jni.libversion" value=""/>
<property name="osx.min" value="-mmacosx-version-min=10.3"/>
<property name="cpptasks.jar" location="lib/cpptasks.jar"/> <property name="cpptasks.jar" location="lib/cpptasks.jar"/>
@ -357,7 +356,7 @@ USA.
<compilerarg value="${uni.sdk}"/> <compilerarg value="${uni.sdk}"/>
<compilerarg value="-arch"/> <compilerarg value="-arch"/>
<compilerarg value="${uni.arch}"/> <compilerarg value="${uni.arch}"/>
<compilerarg value="${osx.min}"/> <compilerarg value="-mmacosx-version-min=${osx.min}"/>
<sysincludepath location="/Developer/Headers/FlatCarbon"/> <sysincludepath location="/Developer/Headers/FlatCarbon"/>
@ -372,7 +371,7 @@ USA.
<linkerarg value="-Wl,-syslibroot,${uni.sdk}"/> <linkerarg value="-Wl,-syslibroot,${uni.sdk}"/>
<linkerarg value="-arch"/> <linkerarg value="-arch"/>
<linkerarg value="${uni.arch}"/> <linkerarg value="${uni.arch}"/>
<linkerarg value="${osx.min}"/> <linkerarg value="-mmacosx-version-min=${osx.min}"/>
<!-- for Gestalt() --> <!-- for Gestalt() -->
<linkerarg value="-framework"/> <linkerarg value="-framework"/>

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

@ -97,13 +97,28 @@ public class ArchNameTask extends Task {
}); });
if (sdks != null) { if (sdks != null) {
Arrays.sort(sdks); Arrays.sort(sdks);
final String prop = "uni.sdk"; String prop = "uni.sdk";
String sdk = getProject().getProperty(prop); String sdk = getProject().getProperty(prop);
String defaultMin = "10.3";
if (sdk == null) { if (sdk == null) {
sdk = sdks[sdks.length-1].getPath(); int ix = sdks.length-1;
sdk = sdks[ix].getPath();
if ((sdk.indexOf("10.6") != -1) && (ix > 0)) {
sdk = sdks[ix-1].getPath(); //downgrade due to 64-bit ppc issues XXX
defaultMin = "10.5";
}
getProject().setProperty(prop, sdk); getProject().setProperty(prop, sdk);
} }
System.out.println("Using SDK=" + sdk); System.out.println("Using SDK=" + sdk);
prop = "osx.min";
String min = getProject().getProperty(prop);
if (min == null) {
min = defaultMin;
getProject().setProperty(prop, min);
}
System.out.println("Using -mmacosx-version-min=" + min);
} }
} }
} }