Merge branch 'master' of https://jantje@github.com/jantje/arduino-eclipse-plugin.git

jantje · jantje · commit ac41f117837e · 2016-07-04T00:41:48.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ script:
   - sh -c "if $TRAVIS_SECURE_ENV_VARS; then echo Travis SECURE available -- Deploy; else echo Travis SECURE NOT available --  Verify; fi"
 
   #Execute the maven commands depending on SECURE availabilty and print the elapsed time out periodically.
-  - sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall,mars --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall,mars --quiet --settings settings.xml'; fi"
+  - sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall,neon --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall,neon --quiet --settings settings.xml'; fi"
 
 #Several usernames and passwords/tokens are required for deployment.
 #When testing on your local/remote setup then you need to set/export env. variables:
diff --git a/it.baeyens.arduino.application/plugin.xml b/it.baeyens.arduino.application/plugin.xml
@@ -1,144 +1,144 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-   <extension
-         id="application"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="*"
-            visible="true">
-         <run
-               class="it.baeyens.arduino.application.Application">
-         </run>
-      </application>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            class="it.baeyens.arduino.application.Perspective"
-            icon="icons/logo_16.png"
-            id="it.baeyens.arduino.application.perspective"
-            name="Arduino">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="it.baeyens.arduino.application.perspective">
-         <view
-               id="org.eclipse.ui.navigator.ProjectExplorer"
-               minimized="false"
-               ratio="0.25"
-               relationship="left"
-               relative="org.eclipse.ui.editorss">
-         </view>
-         <view
-               id="org.eclipse.ui.views.PropertySheet"
-               minimized="false"
-               ratio="0.75"
-               relationship="bottom"
-               relative="org.eclipse.ui.editorss">
-         </view>
-         <view
-               id="org.eclipse.ui.views.ProblemView"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.PropertySheet">
-         </view>
-         <view
-               id="it.baeyens.arduino.monitor.views.SerialMonitor"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.ProblemView">
-         </view>
-         <view
-               id="org.eclipse.ui.console.ConsoleView"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.ProblemView">
-         </view>
-         <view
-               id="org.eclipse.ui.views.ContentOutline"
-               minimized="false"
-               ratio="0.75"
-               relationship="right"
-               relative="org.eclipse.ui.editorss">
-         </view>
-         <view
-               id="it.baeyens.arduino.monitor.views.ScopeView"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.ProblemView">
-         </view>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.intro">
-      <intro
-            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
-            id="it.baeyens.arduino.application.intro">
-      </intro>
-      <introProductBinding
-            introId="it.baeyens.arduino.application.intro"
-            productId="it.baeyens.arduino.application.product">
-      </introProductBinding>
-   </extension>
-   <extension
-         point="org.eclipse.ui.intro.config">
-      <config
-            content="introContent.xml"
-            id="it.baeyens.arduino.application.introConfigId"
-            introId="it.baeyens.arduino.application.intro">
-         <presentation
-               home-page-id="root">
-            <implementation
-                  kind="html"
-                  os="win32,linux,macosx"
-                  style="content/shared.css">
-            </implementation>
-         </presentation>
-      </config>
-   </extension>
-   <extension
-         id="product"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="org.eclipse.ui.ide.workbench"
-            name="Eclipse Arduino IDE">
-         <property
-               name="windowImages"
-               value="icons/logo_16.png,icons/logo_32.png,icons/logo_48.png,icons/logo_256.png">
-         </property>
-         <property
-               name="aboutText"
-               value="Eclipse IDE for Arduino Developers&#x0A;&#x0A;Info: http://eclipse.baeyens.it/&#x0A;Source: https://github.com/jantje/arduino-eclipse-plugin&#x0A;Binaries: http://eclipse.baeyens.it/download.php&#x0A;&#x0A;Contributors: jantje, brodykenrick, wimjongman, neuweiler, &#x0A;darcade, amorellgarcia&#x0A;&#x0A;https://github.com/jantje/arduino-eclipse-plugin/graphs/contributors">
-         </property>
-         <property
-               name="aboutImage"
-               value="icons/eclipse_lg.png">
-         </property>
-         <property
-               name="startupForegroundColor"
-               value="C8D5EA">
-         </property>
-         <property
-               name="startupProgressRect"
-               value="97,370,100,4">
-         </property>
-         <property
-               name="startupMessageRect"
-               value="400,370,441,20">
-         </property>
-         <property
-               name="appName"
-               value="Eclipse Arduino IDE">
-         </property>
-         <property
-               name="preferenceCustomization"
-               value="plugin_customization.ini">
-         </property>
-      </product>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         id="application"
+         point="org.eclipse.core.runtime.applications">
+      <application
+            cardinality="*"
+            visible="true">
+         <run
+               class="it.baeyens.arduino.application.Application">
+         </run>
+      </application>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            class="it.baeyens.arduino.application.Perspective"
+            icon="icons/logo_16.png"
+            id="it.baeyens.arduino.application.perspective"
+            name="Arduino">
+      </perspective>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="it.baeyens.arduino.application.perspective">
+         <view
+               id="org.eclipse.ui.navigator.ProjectExplorer"
+               minimized="false"
+               ratio="0.25"
+               relationship="left"
+               relative="org.eclipse.ui.editorss">
+         </view>
+         <view
+               id="org.eclipse.ui.views.PropertySheet"
+               minimized="false"
+               ratio="0.75"
+               relationship="bottom"
+               relative="org.eclipse.ui.editorss">
+         </view>
+         <view
+               id="org.eclipse.ui.views.ProblemView"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.PropertySheet">
+         </view>
+         <view
+               id="it.baeyens.arduino.monitor.views.SerialMonitor"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.ProblemView">
+         </view>
+         <view
+               id="org.eclipse.ui.console.ConsoleView"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.ProblemView">
+         </view>
+         <view
+               id="org.eclipse.ui.views.ContentOutline"
+               minimized="false"
+               ratio="0.75"
+               relationship="right"
+               relative="org.eclipse.ui.editorss">
+         </view>
+         <view
+               id="it.baeyens.arduino.monitor.views.ScopeView"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.ProblemView">
+         </view>
+      </perspectiveExtension>
+   </extension>
+   <extension
+         point="org.eclipse.ui.intro">
+      <intro
+            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
+            id="it.baeyens.arduino.application.intro">
+      </intro>
+      <introProductBinding
+            introId="it.baeyens.arduino.application.intro"
+            productId="it.baeyens.arduino.application.product">
+      </introProductBinding>
+   </extension>
+   <extension
+         point="org.eclipse.ui.intro.config">
+      <config
+            content="introContent.xml"
+            id="it.baeyens.arduino.application.introConfigId"
+            introId="it.baeyens.arduino.application.intro">
+         <presentation
+               home-page-id="root">
+            <implementation
+                  kind="html"
+                  os="win32,linux,macosx"
+                  style="content/shared.css">
+            </implementation>
+         </presentation>
+      </config>
+   </extension>
+   <extension
+         id="product"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="org.eclipse.ui.ide.workbench"
+            name="Sloeber, the Eclipse Arduino IDE">
+         <property
+               name="windowImages"
+               value="icons/logo_16.png,icons/logo_32.png,icons/logo_48.png,icons/logo_256.png">
+         </property>
+         <property
+               name="aboutText"
+               value="Sloeber, the Eclipse IDE for Arduino Developers&#x0A;&#x0A;Info: http://eclipse.baeyens.it/&#x0A;Source: https://github.com/jantje/arduino-eclipse-plugin&#x0A;Binaries: http://eclipse.baeyens.it/download.php&#x0A;&#x0A;Contributors (github users): jantje, brodykenrick, wimjongman, neuweiler, &#x0A;darcade, amorellgarcia, MarceloLimori&#x0A;&#x0A;https://github.com/jantje/arduino-eclipse-plugin/graphs/contributors">
+         </property>
+         <property
+               name="aboutImage"
+               value="icons/eclipse_lg.png">
+         </property>
+         <property
+               name="startupForegroundColor"
+               value="C8D5EA">
+         </property>
+         <property
+               name="startupProgressRect"
+               value="97,370,100,4">
+         </property>
+         <property
+               name="startupMessageRect"
+               value="400,370,441,20">
+         </property>
+         <property
+               name="appName"
+               value="Sloeber, the Eclipse Arduino IDE">
+         </property>
+         <property
+               name="preferenceCustomization"
+               value="plugin_customization.ini">
+         </property>
+      </product>
+   </extension>
+
+</plugin>
diff --git a/it.baeyens.arduino.application/splash.bmp b/it.baeyens.arduino.application/splash.bmp
diff --git a/it.baeyens.arduino.common/META-INF/MANIFEST.MF b/it.baeyens.arduino.common/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@ Bundle-Activator: it.baeyens.arduino.common.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit,
- org.eclipse.wb.core.lib,
  org.eclipse.cdt.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: it.baeyens.arduino.arduino,
  it.baeyens.arduino.common
-Import-Package: org.eclipse.cdt.core,
+Import-Package: org.apache.commons.io,
+ org.eclipse.cdt.core,
  org.eclipse.cdt.core.envvar,
  org.eclipse.cdt.core.index,
  org.eclipse.cdt.core.model,
diff --git a/it.baeyens.arduino.parent/pom.xml b/it.baeyens.arduino.parent/pom.xml
@@ -358,7 +358,7 @@
                 <platform-version-name>mars</platform-version-name>
             </properties>
             <activation>
-				<activeByDefault>true</activeByDefault>
+				<activeByDefault>false</activeByDefault>
 			</activation>
 
 			<repositories>
@@ -375,13 +375,38 @@
 				</repository>
 			</repositories>
 		</profile>
+
+		<profile>
+			<id>neon</id>
+            <properties>
+                <platform-version-name>neon</platform-version-name>
+            </properties>
+            <activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+
+			<repositories>
+				<repository>
+					<id>platform_neon</id>
+					<layout>p2</layout>
+					<url> http://download.eclipse.org/eclipse/updates/4.6</url>
+				</repository>
+
+				<repository>
+					<id>release-train_neon</id>
+					<layout>p2</layout>
+					<url> http://download.eclipse.org/releases/neon</url>
+				</repository>
+				
+			</repositories>	
+		</profile>
 	</profiles>
 
-	<repositories>
+	<repositories>		
 		<repository>
 			<id>nebula</id>
 			<layout>p2</layout>
-			<url> http://download.eclipse.org/technology/nebula/snapshot</url>
+			<url>http://download.eclipse.org/technology/nebula/snapshot</url>
 		</repository>
 	</repositories>
 
diff --git a/it.baeyens.arduino.product/arduino.product b/it.baeyens.arduino.product/arduino.product
