diff --git a/it.baeyens.arduino.core/plugin.xml b/it.baeyens.arduino.core/plugin.xml index b08ccff23..21daae2f8 100644 --- a/it.baeyens.arduino.core/plugin.xml +++ b/it.baeyens.arduino.core/plugin.xml @@ -104,7 +104,7 @@ class="it.baeyens.arduino.ui.NewArduinoSketchWizard" name="%wizard.name" icon="icons/arduino.png" - finalPerspective ="org.eclipse.cdt.ui.CPerspective" + finalPerspective ="it.baeyens.arduino.application.perspective" project="true"> %wizard.description diff --git a/it.baeyens.arduino.parent/pom.xml b/it.baeyens.arduino.parent/pom.xml index c7702c3d9..b267529d8 100644 --- a/it.baeyens.arduino.parent/pom.xml +++ b/it.baeyens.arduino.parent/pom.xml @@ -7,7 +7,7 @@ pom - 0.18.1 + 0.20.0 ${project.build.directory}/repo @@ -330,53 +330,14 @@ - juno + luna - juno + luna - + true - - - platform_juno - p2 - http://download.eclipse.org/eclipse/updates/4.2 - - - - release-train_juno - p2 - http://download.eclipse.org/releases/juno - - - - - - kepler - - kepler - - - - platform_kepler - p2 - http://download.eclipse.org/eclipse/updates/4.3 - - - - release-train_kepler - p2 - http://download.eclipse.org/releases/kepler - - - - - luna - - luna - platform_luna diff --git a/it.baeyens.arduino.product/arduino.product b/it.baeyens.arduino.product/arduino.product index 5857e60c9..4541d2a72 100644 --- a/it.baeyens.arduino.product/arduino.product +++ b/it.baeyens.arduino.product/arduino.product @@ -29,11 +29,14 @@ it.baeyens.arduino.application.perspective --launcher.XXMaxPermSize 256M --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile ---launcher.appendVmargs +--launcher.appendVmargs + -Dosgi.requiredJavaVersion=1.6 -Xms40m --Xmx512m - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts +-Xmx512m + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + @@ -309,7 +312,6 @@ rights to a jury trial in any resulting litigation.</p> - @@ -331,10 +333,25 @@ rights to a jury trial in any resulting litigation.</p> + + + + + + + + + + + + + + + - + diff --git a/it.baeyens.arduino.product/plugin.xml b/it.baeyens.arduino.product/plugin.xml index c1be63110..bf800f3a9 100644 --- a/it.baeyens.arduino.product/plugin.xml +++ b/it.baeyens.arduino.product/plugin.xml @@ -40,6 +40,10 @@ name="preferenceCustomization" value="plugin_customization.ini"> + + diff --git a/it.baeyens.cdt.refactor/.gitignore b/it.baeyens.cdt.refactor/.gitignore new file mode 100644 index 000000000..ae3c17260 --- /dev/null +++ b/it.baeyens.cdt.refactor/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/it.baeyens.cdt.refactor/bin/it/baeyens/cdt/refactor/Activator.class b/it.baeyens.cdt.refactor/bin/it/baeyens/cdt/refactor/Activator.class deleted file mode 100644 index 5fec9377e..000000000 Binary files a/it.baeyens.cdt.refactor/bin/it/baeyens/cdt/refactor/Activator.class and /dev/null differ diff --git a/it.baeyens.cdt.refactor/bin/it/baeyens/cdt/refactor/RenameFolder.class b/it.baeyens.cdt.refactor/bin/it/baeyens/cdt/refactor/RenameFolder.class deleted file mode 100644 index 3cbf6ae5f..000000000 Binary files a/it.baeyens.cdt.refactor/bin/it/baeyens/cdt/refactor/RenameFolder.class and /dev/null differ diff --git a/readme.md b/readme.md index 40e66a203..ed7ac7aa9 100644 --- a/readme.md +++ b/readme.md @@ -45,9 +45,8 @@ win32x32.cmd (if you are on 32 bits windows) ======= ##Build Options You can control the maven build with the following profiles: -* juno (default) (builds against the juno repositories (4.2)) -* kepler (builds agains the kepler repositories (4.3)) * luna (builds agains the luna repositories (4.4)) +* mars (builds agains the mars repositories (4.5)) * win32 (builds for 32 bit windows) * win64 * linux32 @@ -58,11 +57,11 @@ You can control the maven build with the following profiles: #####Examples: -mvn verify -Plinux32,kepler +mvn verify -Plinux32 (builds for luna and linux 32 bits) -mvn verify -Pwin32,juno,linux32 +mvn verify -Pwin32,mars,linux32 -mvn verify (builds for juno and the platform you are running on) +mvn verify (builds for luna and the platform you are running on) ###Setting up a repository