Merge remote branch 'upstream/master'

Author: jantje

it.baeyens.arduino.feature/feature.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="it.baeyens.arduino.feature"
-      label="Arduino eclipse extensions"
+      label="Arduino Eclipse Extensions"
       version="2.2.0.qualifier"
-      provider-name="jan Baeyens">
+      provider-name="Jan Baeyens">
 
    <description url="http://www.example.com/description">
       This feature allows easy creation of Arduino projects in an Eclipse
@@ -135,15 +135,7 @@ If you do not agree with this policy, then please do not install this software.
    </url>
 
    <requires>
-      <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core" version="5.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core" version="8.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.console"/>
+      <import feature="org.eclipse.cdt" version="8.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -174,4 +166,11 @@ If you do not agree with this policy, then please do not install this software.
          version="0.0.0"
          fragment="true"/>
 
+   <plugin
+         id="it.baeyens.arduino.application"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

it.baeyens.arduino.product/arduino.p2.inf

@@ -0,0 +1,7 @@
+instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/luna,name:Luna);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/luna,name:Luna);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.4, name:The Eclipse Project Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.4, name:The Eclipse Project Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//www.baeyens.it/eclipse/nightly,name:Arduino Latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//www.baeyens.it/eclipse/nightly,name:Arduino Latest);

it.baeyens.arduino.product/arduino.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Arduino IDE" uid="it.baeyens.arduino.product" id="it.baeyens.arduino.application.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Arduino IDE" uid="it.baeyens.arduino.product" id="it.baeyens.arduino.application.product" application="org.eclipse.ui.ide.workbench" version="2.2.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/it.baeyens.arduino.application/icons/logo_128.png"/>
@@ -31,7 +31,7 @@ it.baeyens.arduino.application.perspective
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=1.6
+      <vmArgs>-Dosgi.requiredJavaVersion=1.7
 -Xms40m
 -Xmx512m
       </vmArgs>
@@ -356,4 +356,10 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
    </configurations>
 
+   <repositories>
+      <repository location="http://download.eclipse.org/releases/luna/" enabled="true" />
+      <repository location="http://download.eclipse.org/eclipse/updates/4.4" enabled="true" />
+      <repository location="http://www.baeyens.it/eclipse/nightly" enabled="true" />
+   </repositories>
+
 </product>

it.baeyens.arduino.product/build.properties

@@ -2,5 +2,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                splash.bmp,\
-               plugin_customization.ini
+               plugin_customization.ini,\
+               arduino.p2.inf
 source.. = src/