Bug 547729: [R-Console] Fix use of obsolete java options -d32/-d64 on
macosx
Change-Id: I93bb3aea5a466a4b9dc626aed2152ae2fbfb537f
diff --git a/r/org.eclipse.statet.r.console.ui/META-INF/MANIFEST.MF b/r/org.eclipse.statet.r.console.ui/META-INF/MANIFEST.MF
index 216bea0..80346b4 100644
--- a/r/org.eclipse.statet.r.console.ui/META-INF/MANIFEST.MF
+++ b/r/org.eclipse.statet.r.console.ui/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@
org.eclipse.statet.r.ui,
org.eclipse.statet.rj.server,
org.eclipse.statet.ecommons.net.core;bundle-version="4.0.0",
+ org.eclipse.jdt.core,
org.eclipse.jdt.launching,
org.eclipse.jdt.debug.ui
Import-Package: com.ibm.icu.text;version="63.1.0",
diff --git a/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RJEngineLaunchDelegate.java b/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RJEngineLaunchDelegate.java
index 0671bfb..d1a4e0a 100644
--- a/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RJEngineLaunchDelegate.java
+++ b/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RJEngineLaunchDelegate.java
@@ -46,9 +46,11 @@
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.IVMInstall3;
import org.eclipse.jdt.launching.JavaLaunchDelegate;
+import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.statet.jcommons.collections.CollectionUtils;
import org.eclipse.statet.jcommons.collections.ImCollections;
@@ -299,6 +301,8 @@
s.append(" -Dorg.eclipse.statet.rj.verbose=true"); //$NON-NLS-1$
}
if (Platform.getOS().equals(Platform.OS_MACOSX)
+ && JavaRuntime.compareJavaVersions(JavaRuntime.computeVMInstall(configuration),
+ JavaCore.VERSION_1_8) == 0
&& s.indexOf(" -d32") < 0 && s.indexOf(" -d64") < 0) { //$NON-NLS-1$ //$NON-NLS-2$
final String rArch= this.rEnvConfig.getRArch();
if (rArch != null) {
