From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 7 Jan 2017 11:14:51 +0000 (+0100)
Subject: Start adapting SLC IDE
X-Git-Tag: argeo-slc-2.1.8~14
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=inline;h=a7c082b66bcc6454e644bc076d9d7642642ea5c2;p=gpl%2Fargeo-slc.git

Start adapting SLC IDE
---

diff --git a/ide/features/org.argeo.slc.ide/feature.xml b/ide/features/org.argeo.slc.ide/feature.xml
index 8aef343c5..b4cb5460c 100644
--- a/ide/features/org.argeo.slc.ide/feature.xml
+++ b/ide/features/org.argeo.slc.ide/feature.xml
@@ -46,14 +46,8 @@ and limitations under the License.
       <import plugin="org.eclipse.jdt.debug.ui"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.pde.build"/>
       <import plugin="org.eclipse.pde.ui" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.ui" version="3.4.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.5.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.5.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.5.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.console" version="3.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/ide/plugins/org.argeo.slc.ide.branding/.classpath b/ide/plugins/org.argeo.slc.ide.branding/.classpath
index 3e28a04e0..6de27b66c 100644
--- a/ide/plugins/org.argeo.slc.ide.branding/.classpath
+++ b/ide/plugins/org.argeo.slc.ide.branding/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/ide/plugins/org.argeo.slc.ide.branding/org.argeo.slc.ide.product b/ide/plugins/org.argeo.slc.ide.branding/org.argeo.slc.ide.product
index eef57c633..0d93d1e40 100644
--- a/ide/plugins/org.argeo.slc.ide.branding/org.argeo.slc.ide.product
+++ b/ide/plugins/org.argeo.slc.ide.branding/org.argeo.slc.ide.product
@@ -14,7 +14,8 @@
    </configIni>
 
    <launcherArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
    </launcherArgs>
 
    <windowImages i16="/org.argeo.slc.ide.branding/icons/argeo-icon-100104-256.png" i32="/org.argeo.slc.ide.branding/icons/argeo-icon-100104-256.png" i48="/org.argeo.slc.ide.branding/icons/argeo-icon-100104-256.png" i64="/org.argeo.slc.ide.branding/icons/argeo-icon-100104-256.png" i128="/org.argeo.slc.ide.branding/icons/argeo-icon-100104-256.png"/>
@@ -33,7 +34,7 @@
    </launcher>
 
    <vm>
-      <linux>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</linux>
+      <linux include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
    </vm>
 
    <license>