diff --git a/.travis.yml b/.travis.yml index ee45eb8..51851dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java script: mvn clean package -jdk: oraclejdk7 +jdk: oraclejdk11 deploy: provider: releases api_key: diff --git a/packaging/fr.obeo.dsl.arduino.product/arduinodesigner.product b/packaging/fr.obeo.dsl.arduino.product/arduinodesigner.product index 7cb9a64..18948ef 100644 --- a/packaging/fr.obeo.dsl.arduino.product/arduinodesigner.product +++ b/packaging/fr.obeo.dsl.arduino.product/arduinodesigner.product @@ -43,7 +43,6 @@ Visit http://www.obeo.fr - + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 @@ -144,6 +144,7 @@ This Agreement is governed by the laws of the State of New York and the intellec + @@ -156,4 +157,11 @@ This Agreement is governed by the laws of the State of New York and the intellec + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.branding/.classpath b/plugins/fr.obeo.dsl.arduino.branding/.classpath index ad32c83..ca3785c 100644 --- a/plugins/fr.obeo.dsl.arduino.branding/.classpath +++ b/plugins/fr.obeo.dsl.arduino.branding/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.branding/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino.branding/.settings/org.eclipse.jdt.core.prefs index c537b63..7adc0fb 100644 --- a/plugins/fr.obeo.dsl.arduino.branding/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/fr.obeo.dsl.arduino.branding/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino.branding/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino.branding/META-INF/MANIFEST.MF index 4f5eff7..41ecddc 100644 --- a/plugins/fr.obeo.dsl.arduino.branding/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino.branding/META-INF/MANIFEST.MF @@ -13,5 +13,6 @@ Require-Bundle: org.eclipse.ui, fr.obeo.dsl.arduino.gen, fr.obeo.dsl.arduino.ui, org.eclipse.platform -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy +Automatic-Module-Name: fr.obeo.dsl.arduino.branding diff --git a/plugins/fr.obeo.dsl.arduino.build/.classpath b/plugins/fr.obeo.dsl.arduino.build/.classpath index 098194c..ca3785c 100644 --- a/plugins/fr.obeo.dsl.arduino.build/.classpath +++ b/plugins/fr.obeo.dsl.arduino.build/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.build/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino.build/.settings/org.eclipse.jdt.core.prefs index f42de36..7adc0fb 100644 --- a/plugins/fr.obeo.dsl.arduino.build/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/fr.obeo.dsl.arduino.build/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino.build/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino.build/META-INF/MANIFEST.MF index 4c69f06..4bcda09 100644 --- a/plugins/fr.obeo.dsl.arduino.build/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino.build/META-INF/MANIFEST.MF @@ -7,6 +7,7 @@ Bundle-Activator: fr.obeo.dsl.arduino.build.ArduinoBuilderActivator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, com.google.guava -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: fr.obeo.dsl.arduino.build +Automatic-Module-Name: fr.obeo.dsl.arduino.build diff --git a/plugins/fr.obeo.dsl.arduino.build/src/fr/obeo/dsl/arduino/build/ArduinoBuilder.java b/plugins/fr.obeo.dsl.arduino.build/src/fr/obeo/dsl/arduino/build/ArduinoBuilder.java index 10ad52c..e9e7eac 100644 --- a/plugins/fr.obeo.dsl.arduino.build/src/fr/obeo/dsl/arduino/build/ArduinoBuilder.java +++ b/plugins/fr.obeo.dsl.arduino.build/src/fr/obeo/dsl/arduino/build/ArduinoBuilder.java @@ -250,6 +250,7 @@ private IStatus link(String sketchName, List libraries) { commands.add("-o"); commands.add("arduino.elf"); commands.add(sketchName + ".o"); + commands.add("hooks.o"); commands.add("WInterrupts.o"); commands.add("wiring_analog.o"); commands.add("wiring.o"); @@ -258,7 +259,7 @@ private IStatus link(String sketchName, List libraries) { commands.add("wiring_shift.o"); commands.add("CDC.o"); commands.add("HardwareSerial.o"); - commands.add("HID.o"); + //commands.add("HID.o"); commands.add("IPAddress.o"); commands.add("main.o"); commands.add("new.o"); @@ -296,9 +297,12 @@ private IStatus compileSpecificLibrary(String libraryPath, private IStatus compileMainLibraries() { System.out.println("Compile main libraries"); String arduinoMainLibraryPath = arduinoSdk + "hardware" - + File.separator + "arduino" + File.separator + "cores" + + File.separator + "arduino" + File.separator + "avr" + File.separator + "cores" + File.separator + "arduino" + File.separator; IStatus status = null; + status = compileCFile(arduinoMainLibraryPath, "hooks"); + if (status.getSeverity() != IStatus.OK) + return status; status = compileCFile(arduinoMainLibraryPath, "WInterrupts"); if (status.getSeverity() != IStatus.OK) return status; @@ -315,6 +319,9 @@ private IStatus compileMainLibraries() { if (status.getSeverity() != IStatus.OK) return status; status = compileCFile(arduinoMainLibraryPath, "wiring_shift"); + if (status.getSeverity() != IStatus.OK) + return status; + status = compileCPPFile(arduinoMainLibraryPath, "abi"); if (status.getSeverity() != IStatus.OK) return status; status = compileCPPFile(arduinoMainLibraryPath, "CDC"); @@ -323,9 +330,22 @@ private IStatus compileMainLibraries() { status = compileCPPFile(arduinoMainLibraryPath, "HardwareSerial"); if (status.getSeverity() != IStatus.OK) return status; - status = compileCPPFile(arduinoMainLibraryPath, "HID"); + status = compileCPPFile(arduinoMainLibraryPath, "HardwareSerial0"); + if (status.getSeverity() != IStatus.OK) + return status; + status = compileCPPFile(arduinoMainLibraryPath, "HardwareSerial1"); if (status.getSeverity() != IStatus.OK) return status; + status = compileCPPFile(arduinoMainLibraryPath, "HardwareSerial2"); + if (status.getSeverity() != IStatus.OK) + return status; + status = compileCPPFile(arduinoMainLibraryPath, "HardwareSerial3"); + if (status.getSeverity() != IStatus.OK) + return status; + /* + * status = compileCPPFile(arduinoMainLibraryPath, "HID"); if + * (status.getSeverity() != IStatus.OK) return status; + */ status = compileCPPFile(arduinoMainLibraryPath, "IPAddress"); if (status.getSeverity() != IStatus.OK) @@ -334,6 +354,9 @@ private IStatus compileMainLibraries() { if (status.getSeverity() != IStatus.OK) return status; status = compileCPPFile(arduinoMainLibraryPath, "new"); + if (status.getSeverity() != IStatus.OK) + return status; + status = compileCPPFile(arduinoMainLibraryPath, "PluggableUSB"); if (status.getSeverity() != IStatus.OK) return status; status = compileCPPFile(arduinoMainLibraryPath, "Print"); @@ -366,6 +389,7 @@ private IStatus compileSketch(String fileName, List libraries) { String command = arduinoSdk + "hardware" + File.separator + "tools" + File.separator + "avr" + File.separator + "bin" + File.separator + "avr-g++"; + if (os.contains(WINDOWS)) { command += ".exe"; @@ -382,10 +406,10 @@ private IStatus compileSketch(String fileName, List libraries) { commands.add("-DARDUINO=" + getDArduino()); commands.add("-I."); commands.add("-I" + arduinoSdk + "hardware" + File.separator - + "arduino" + File.separator + "cores" + File.separator + + "arduino" + File.separator + "avr" + File.separator + "cores" + File.separator + "arduino"); commands.add("-I" + arduinoSdk + "hardware" + File.separator - + "arduino" + File.separator + "variants" + File.separator + + "arduino" + File.separator + "avr" + File.separator + "variants" + File.separator + "standard"); for (String library : libraries) { String libraryName = Character.toUpperCase(library.charAt(0)) @@ -425,9 +449,9 @@ private IStatus compileCFile(String filePath, String fileName) { ProcessBuilder builder = new ProcessBuilder(command, "-c", "-mmcu=" + getMMCU(), "-DF_CPU=" + getDFCPU(), "-DARDUINO=" + getDArduino(), "-I.", "-I" + arduinoSdk + "hardware" - + File.separator + "arduino" + File.separator + "cores" + + File.separator + "arduino" + File.separator + "avr" + File.separator + "cores" + File.separator + "arduino", "-I" + arduinoSdk + "hardware" - + File.separator + "arduino" + File.separator + "variants" + + File.separator + "arduino" + File.separator + "avr" + File.separator + "variants" + File.separator + "standard", "-g", "-Os", "-Wall", "-ffunction-sections", "-fdata-sections", "-std=gnu99", filePath + fileName + ".c", "-o", fileName + ".o"); @@ -456,10 +480,10 @@ private IStatus compileCPPFile(String filePath, String fileName) { commands.add("-DARDUINO=" + getDArduino()); commands.add("-I."); commands.add("-I" + arduinoSdk + "hardware" + File.separator - + "arduino" + File.separator + "cores" + File.separator + + "arduino" + File.separator + "avr" + File.separator + "cores" + File.separator + "arduino"); commands.add("-I" + arduinoSdk + "hardware" + File.separator - + "arduino" + File.separator + "variants" + File.separator + + "arduino" + File.separator + "avr" + File.separator + "variants" + File.separator + "standard"); commands.add("-g"); commands.add("-Os"); diff --git a/plugins/fr.obeo.dsl.arduino.design/.classpath b/plugins/fr.obeo.dsl.arduino.design/.classpath index 39810b7..ca3785c 100644 --- a/plugins/fr.obeo.dsl.arduino.design/.classpath +++ b/plugins/fr.obeo.dsl.arduino.design/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.design/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino.design/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..bd1095b --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.design/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino.design/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino.design/META-INF/MANIFEST.MF index 396dad0..a4c6df1 100644 --- a/plugins/fr.obeo.dsl.arduino.design/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino.design/META-INF/MANIFEST.MF @@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.sirius.common.ui;bundle-version="2.0.0", org.eclipse.sirius.diagram;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.google.common.collect Export-Package: fr.obeo.dsl.arduino.design +Automatic-Module-Name: fr.obeo.dsl.arduino.design diff --git a/plugins/fr.obeo.dsl.arduino.edit/.classpath b/plugins/fr.obeo.dsl.arduino.edit/.classpath index 121e527..ca3785c 100644 --- a/plugins/fr.obeo.dsl.arduino.edit/.classpath +++ b/plugins/fr.obeo.dsl.arduino.edit/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino.edit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..bd1095b --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.edit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino.edit/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino.edit/META-INF/MANIFEST.MF index 3511db8..c8a604a 100644 --- a/plugins/fr.obeo.dsl.arduino.edit/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: fr.obeo.dsl.arduino.provider.ArduinoEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: fr.obeo.dsl.arduino.provider Require-Bundle: org.eclipse.core.runtime, fr.obeo.dsl.arduino;visibility:=reexport, diff --git a/plugins/fr.obeo.dsl.arduino.editor/.classpath b/plugins/fr.obeo.dsl.arduino.editor/.classpath index 121e527..ca3785c 100644 --- a/plugins/fr.obeo.dsl.arduino.editor/.classpath +++ b/plugins/fr.obeo.dsl.arduino.editor/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino.editor/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..bd1095b --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.editor/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino.editor/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino.editor/META-INF/MANIFEST.MF index 23d91ed..712c0c5 100644 --- a/plugins/fr.obeo.dsl.arduino.editor/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino.editor/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: fr.obeo.dsl.arduino.presentation.ArduinoEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: fr.obeo.dsl.arduino.presentation Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources;visibility:=reexport, @@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.edit.ui;visibility:=reexport, org.eclipse.ui.ide;visibility:=reexport Bundle-ActivationPolicy: lazy +Automatic-Module-Name: fr.obeo.dsl.arduino.editor diff --git a/plugins/fr.obeo.dsl.arduino.gen/.classpath b/plugins/fr.obeo.dsl.arduino.gen/.classpath index bf1769b..09eec2a 100644 --- a/plugins/fr.obeo.dsl.arduino.gen/.classpath +++ b/plugins/fr.obeo.dsl.arduino.gen/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.gen/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino.gen/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..bd1095b --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino.gen/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino.gen/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino.gen/META-INF/MANIFEST.MF index 5ba27e4..2bf0523 100644 --- a/plugins/fr.obeo.dsl.arduino.gen/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino.gen/META-INF/MANIFEST.MF @@ -16,8 +16,9 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.acceleo.profiler;bundle-version="3.3.0", org.eclipse.acceleo.engine;bundle-version="3.3.0", com.google.guava -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Export-Package: fr.obeo.dsl.arduino.gen.main +Automatic-Module-Name: fr.obeo.dsl.arduino.gen diff --git a/plugins/fr.obeo.dsl.arduino.gen/src/fr/obeo/dsl/arduino/gen/main/Generate.java b/plugins/fr.obeo.dsl.arduino.gen/src/fr/obeo/dsl/arduino/gen/main/Generate.java index c85b598..e201a73 100644 --- a/plugins/fr.obeo.dsl.arduino.gen/src/fr/obeo/dsl/arduino/gen/main/Generate.java +++ b/plugins/fr.obeo.dsl.arduino.gen/src/fr/obeo/dsl/arduino/gen/main/Generate.java @@ -67,8 +67,8 @@ public class Generate extends AbstractAcceleoGenerator { * @generated */ public Generate() { - // Empty implementation - } + // Empty implementation + } /** * This allows clients to instantiates a generator with all required @@ -91,8 +91,8 @@ public Generate() { */ public Generate(URI modelURI, File targetFolder, List arguments) throws IOException { - initialize(modelURI, targetFolder, arguments); - } + initialize(modelURI, targetFolder, arguments); + } /** * This allows clients to instantiates a generator with all required @@ -115,8 +115,8 @@ public Generate(URI modelURI, File targetFolder, */ public Generate(EObject model, File targetFolder, List arguments) throws IOException { - initialize(model, targetFolder, arguments); - } + initialize(model, targetFolder, arguments); + } /** * This can be used to launch the generation from a standalone application. @@ -126,55 +126,50 @@ public Generate(EObject model, File targetFolder, * @generated */ public static void main(String[] args) { - try { - if (args.length < 2) { - System.out.println("Arguments not valid : {model, folder}."); - } else { - URI modelURI = URI.createFileURI(args[0]); - File folder = new File(args[1]); - - List arguments = new ArrayList(); - - /* - * If you want to change the content of this method, do NOT - * forget to change the "@generated" tag in the Javadoc of this - * method to "@generated NOT". Without this new tag, any - * compilation of the Acceleo module with the main template that - * has caused the creation of this class will revert your - * modifications. - */ - - /* - * Add in this list all the arguments used by the starting point - * of the generation If your main template is called on an - * element of your model and a String, you can add in - * "arguments" this "String" attribute. - */ - - Generate generator = new Generate(modelURI, folder, arguments); - - /* - * Add the properties from the launch arguments. If you want to - * programmatically add new properties, add them in - * "propertiesFiles" You can add the absolute path of a - * properties files, or even a project relative path. If you - * want to add another "protocol" for your properties files, - * please override "getPropertiesLoaderService(AcceleoService)" - * in order to return a new property loader. The behavior of the - * properties loader service is explained in the Acceleo - * documentation (Help -> Help Contents). - */ - - for (int i = 2; i < args.length; i++) { - generator.addPropertiesFile(args[i]); - } - - generator.doGenerate(new BasicMonitor()); - } - } catch (IOException e) { - e.printStackTrace(); - } - } + try { + if (args.length < 2) { + System.out.println("Arguments not valid : {model, folder}."); + } else { + URI modelURI = URI.createFileURI(args[0]); + File folder = new File(args[1]); + + List arguments = new ArrayList(); + + /* + * If you want to change the content of this method, do NOT forget to change the "@generated" + * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation + * of the Acceleo module with the main template that has caused the creation of this class will + * revert your modifications. + */ + + /* + * Add in this list all the arguments used by the starting point of the generation + * If your main template is called on an element of your model and a String, you can + * add in "arguments" this "String" attribute. + */ + + Generate generator = new Generate(modelURI, folder, arguments); + + /* + * Add the properties from the launch arguments. + * If you want to programmatically add new properties, add them in "propertiesFiles" + * You can add the absolute path of a properties files, or even a project relative path. + * If you want to add another "protocol" for your properties files, please override + * "getPropertiesLoaderService(AcceleoService)" in order to return a new property loader. + * The behavior of the properties loader service is explained in the Acceleo documentation + * (Help -> Help Contents). + */ + + for (int i = 2; i < args.length; i++) { + generator.addPropertiesFile(args[i]); + } + + generator.doGenerate(new BasicMonitor()); + } + } catch (IOException e) { + e.printStackTrace(); + } + } /** * Launches the generation described by this instance. @@ -188,37 +183,32 @@ public static void main(String[] args) { */ @Override public void doGenerate(Monitor monitor) throws IOException { - /* - * TODO if you wish to change the generation as a whole, override this. - * The default behavior should be sufficient in most cases. If you want - * to change the content of this method, do NOT forget to change the - * "@generated" tag in the Javadoc of this method to "@generated NOT". - * Without this new tag, any compilation of the Acceleo module with the - * main template that has caused the creation of this class will revert - * your modifications. If you encounter a problem with an unresolved - * proxy during the generation, you can remove the comments in the - * following instructions to check for problems. Please note that those - * instructions may have a significant impact on the performances. - */ - - // org.eclipse.emf.ecore.util.EcoreUtil.resolveAll(model); - - /* - * If you want to check for potential errors in your models before the - * launch of the generation, you use the code below. - */ - - // if (model != null && model.eResource() != null) { - // List errors = - // model.eResource().getErrors(); - // for (org.eclipse.emf.ecore.resource.Resource.Diagnostic diagnostic : - // errors) { - // System.err.println(diagnostic.toString()); - // } - // } - - super.doGenerate(monitor); - } + /* + * TODO if you wish to change the generation as a whole, override this. The default behavior should + * be sufficient in most cases. If you want to change the content of this method, do NOT forget to + * change the "@generated" tag in the Javadoc of this method to "@generated NOT". Without this new tag, + * any compilation of the Acceleo module with the main template that has caused the creation of this + * class will revert your modifications. If you encounter a problem with an unresolved proxy during the + * generation, you can remove the comments in the following instructions to check for problems. Please + * note that those instructions may have a significant impact on the performances. + */ + + //org.eclipse.emf.ecore.util.EcoreUtil.resolveAll(model); + + /* + * If you want to check for potential errors in your models before the launch of the generation, you + * use the code below. + */ + + //if (model != null && model.eResource() != null) { + // List errors = model.eResource().getErrors(); + // for (org.eclipse.emf.ecore.resource.Resource.Diagnostic diagnostic : errors) { + // System.err.println(diagnostic.toString()); + // } + //} + + super.doGenerate(monitor); + } /** * If this generator needs to listen to text generation events, listeners @@ -230,18 +220,15 @@ public void doGenerate(Monitor monitor) throws IOException { */ @Override public List getGenerationListeners() { - List listeners = super - .getGenerationListeners(); - /* - * TODO if you need to listen to generation event, add listeners to the - * list here. If you want to change the content of this method, do NOT - * forget to change the "@generated" tag in the Javadoc of this method - * to "@generated NOT". Without this new tag, any compilation of the - * Acceleo module with the main template that has caused the creation of - * this class will revert your modifications. - */ - return listeners; - } + List listeners = super.getGenerationListeners(); + /* + * TODO if you need to listen to generation event, add listeners to the list here. If you want to change + * the content of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method + * to "@generated NOT". Without this new tag, any compilation of the Acceleo module with the main template + * that has caused the creation of this class will revert your modifications. + */ + return listeners; + } /** * If you need to change the way files are generated, this is your entry @@ -272,8 +259,8 @@ public List getGenerationListeners() { */ @Override public IAcceleoGenerationStrategy getGenerationStrategy() { - return super.getGenerationStrategy(); - } + return super.getGenerationStrategy(); + } /** * This will be called in order to find and load the module that will be @@ -285,8 +272,8 @@ public IAcceleoGenerationStrategy getGenerationStrategy() { */ @Override public String getModuleName() { - return MODULE_FILE_NAME; - } + return MODULE_FILE_NAME; + } /** * If the module(s) called by this launcher require properties files, return @@ -301,50 +288,42 @@ public String getModuleName() { */ @Override public List getProperties() { - /* - * If you want to change the content of this method, do NOT forget to - * change the "@generated" tag in the Javadoc of this method to - * "@generated NOT". Without this new tag, any compilation of the - * Acceleo module with the main template that has caused the creation of - * this class will revert your modifications. - */ - - /* - * TODO if your generation module requires access to properties files, - * add their qualified path to the list here. - * - * Properties files can be located in an Eclipse plug-in or in the file - * system (all Acceleo projects are Eclipse plug-in). In order to use - * properties files located in an Eclipse plugin, you need to add the - * path of the properties files to the "propertiesFiles" list: - * - * final String prefix = "platform:/plugin/"; final String pluginName = - * "org.eclipse.acceleo.module.sample"; final String packagePath = - * "/org/eclipse/acceleo/module/sample/properties/"; final String - * fileName = "default.properties"; propertiesFiles.add(prefix + - * pluginName + packagePath + fileName); - * - * With this mechanism, you can load properties files from your plugin - * or from another plugin. - * - * You may want to load properties files from the file system, for that - * you need to add the absolute path of the file: - * - * propertiesFiles.add("C:\Users\MyName\MyFile.properties"); - * - * If you want to let your users add properties files located in the - * same folder as the model: - * - * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && - * model.eResource() != null) { - * propertiesFiles.addAll(AcceleoEngineUtils - * .getPropertiesFilesNearModel(model.eResource())); } - * - * To learn more about Properties Files, have a look at the Acceleo - * documentation (Help -> Help Contents). - */ - return propertiesFiles; - } + /* + * If you want to change the content of this method, do NOT forget to change the "@generated" + * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation + * of the Acceleo module with the main template that has caused the creation of this class will + * revert your modifications. + */ + + /* + * TODO if your generation module requires access to properties files, add their qualified path to the list here. + * + * Properties files can be located in an Eclipse plug-in or in the file system (all Acceleo projects are Eclipse + * plug-in). In order to use properties files located in an Eclipse plugin, you need to add the path of the properties + * files to the "propertiesFiles" list: + * + * final String prefix = "platform:/plugin/"; + * final String pluginName = "org.eclipse.acceleo.module.sample"; + * final String packagePath = "/org/eclipse/acceleo/module/sample/properties/"; + * final String fileName = "default.properties"; + * propertiesFiles.add(prefix + pluginName + packagePath + fileName); + * + * With this mechanism, you can load properties files from your plugin or from another plugin. + * + * You may want to load properties files from the file system, for that you need to add the absolute path of the file: + * + * propertiesFiles.add("C:\Users\MyName\MyFile.properties"); + * + * If you want to let your users add properties files located in the same folder as the model: + * + * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && model.eResource() != null) { + * propertiesFiles.addAll(AcceleoEngineUtils.getPropertiesFilesNearModel(model.eResource())); + * } + * + * To learn more about Properties Files, have a look at the Acceleo documentation (Help -> Help Contents). + */ + return propertiesFiles; + } /** * Adds a properties file in the list of properties files. @@ -356,8 +335,8 @@ public List getProperties() { */ @Override public void addPropertiesFile(String propertiesFile) { - this.propertiesFiles.add(propertiesFile); - } + this.propertiesFiles.add(propertiesFile); + } /** * This will be used to get the list of templates that are to be launched by @@ -369,8 +348,8 @@ public void addPropertiesFile(String propertiesFile) { */ @Override public String[] getTemplateNames() { - return TEMPLATE_NAMES; - } + return TEMPLATE_NAMES; + } /** * This can be used to update the resource set's package registry with all @@ -382,47 +361,40 @@ public String[] getTemplateNames() { */ @Override public void registerPackages(ResourceSet resourceSet) { - super.registerPackages(resourceSet); - - /* - * If you want to change the content of this method, do NOT forget to - * change the "@generated" tag in the Javadoc of this method to - * "@generated NOT". Without this new tag, any compilation of the - * Acceleo module with the main template that has caused the creation of - * this class will revert your modifications. - */ - - /* - * If you need additional package registrations, you can register them - * here. The following line (in comment) is an example of the package - * registration for UML. - * - * You can use the method "isInWorkspace(Class c)" to check if the - * package that you are about to register is in the workspace. - * - * To register a package properly, please follow the following - * conventions: - * - * If the package is located in another plug-in, already installed in - * Eclipse. The following content should have been generated at the - * beginning of this method. Do not register the package using this - * mechanism if the metamodel is located in the workspace. - * - * if (!isInWorkspace(UMLPackage.class)) { // The normal package - * registration if your metamodel is in a plugin. - * resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, - * UMLPackage.eINSTANCE); } - * - * If the package is located in another project in your workspace, the - * plugin containing the package has not been register by EMF and - * Acceleo should register it automatically. If you want to use the - * generator in stand alone, the regular registration (seen a couple - * lines before) is needed. - * - * To learn more about Package Registration, have a look at the Acceleo - * documentation (Help -> Help Contents). - */ - } + super.registerPackages(resourceSet); + + /* + * If you want to change the content of this method, do NOT forget to change the "@generated" + * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation + * of the Acceleo module with the main template that has caused the creation of this class will + * revert your modifications. + */ + + /* + * If you need additional package registrations, you can register them here. The following line + * (in comment) is an example of the package registration for UML. + * + * You can use the method "isInWorkspace(Class c)" to check if the package that you are about to + * register is in the workspace. + * + * To register a package properly, please follow the following conventions: + * + * If the package is located in another plug-in, already installed in Eclipse. The following content should + * have been generated at the beginning of this method. Do not register the package using this mechanism if + * the metamodel is located in the workspace. + * + * if (!isInWorkspace(UMLPackage.class)) { + * // The normal package registration if your metamodel is in a plugin. + * resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE); + * } + * + * If the package is located in another project in your workspace, the plugin containing the package has not + * been register by EMF and Acceleo should register it automatically. If you want to use the generator in + * stand alone, the regular registration (seen a couple lines before) is needed. + * + * To learn more about Package Registration, have a look at the Acceleo documentation (Help -> Help Contents). + */ + } /** * This can be used to update the resource set's resource factory registry @@ -434,29 +406,30 @@ public void registerPackages(ResourceSet resourceSet) { */ @Override public void registerResourceFactories(ResourceSet resourceSet) { - super.registerResourceFactories(resourceSet); - /* - * If you want to change the content of this method, do NOT forget to - * change the "@generated" tag in the Javadoc of this method to - * "@generated NOT". Without this new tag, any compilation of the - * Acceleo module with the main template that has caused the creation of - * this class will revert your modifications. - */ - - /* - * TODO If you need additional resource factories registrations, you can - * register them here. the following line (in comment) is an example of - * the resource factory registration for UML. - * - * If you want to use the generator in stand alone, the resource factory - * registration will be required. - * - * To learn more about the registration of Resource Factories, have a - * look at the Acceleo documentation (Help -> Help Contents). - */ - - // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, - // UMLResource.Factory.INSTANCE); - } + super.registerResourceFactories(resourceSet); + /* + * If you want to change the content of this method, do NOT forget to change the "@generated" + * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation + * of the Acceleo module with the main template that has caused the creation of this class will + * revert your modifications. + */ + + /* + * TODO If you need additional resource factories registrations, you can register them here. the following line + * (in comment) is an example of the resource factory registration. + * + * If you want to use the generator in stand alone, the resource factory registration will be required. + * + * To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents). + */ + + // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(XyzResource.FILE_EXTENSION, XyzResource.Factory.INSTANCE); + + /* + * Some metamodels require a very complex setup for standalone usage. For example, if you want to use a generator + * targetting UML models in standalone, you NEED to use the following: + */ + // UMLResourcesUtil.init(resourceSet) + } } diff --git a/plugins/fr.obeo.dsl.arduino.gen/tasks/generate.xml b/plugins/fr.obeo.dsl.arduino.gen/tasks/generate.xml index 5e69be1..b080c25 100644 --- a/plugins/fr.obeo.dsl.arduino.gen/tasks/generate.xml +++ b/plugins/fr.obeo.dsl.arduino.gen/tasks/generate.xml @@ -1,37 +1,37 @@ - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.preferences/.classpath b/plugins/fr.obeo.dsl.arduino.preferences/.classpath index 098194c..ca3785c 100644 --- a/plugins/fr.obeo.dsl.arduino.preferences/.classpath +++ b/plugins/fr.obeo.dsl.arduino.preferences/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.preferences/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino.preferences/.settings/org.eclipse.jdt.core.prefs index f42de36..7adc0fb 100644 --- a/plugins/fr.obeo.dsl.arduino.preferences/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/fr.obeo.dsl.arduino.preferences/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino.preferences/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino.preferences/META-INF/MANIFEST.MF index 3822afd..6370c6b 100644 --- a/plugins/fr.obeo.dsl.arduino.preferences/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino.preferences/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.sirius.ui, org.eclipse.ui.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: fr.obeo.dsl.arduino.preferences +Automatic-Module-Name: fr.obeo.dsl.arduino.preferences diff --git a/plugins/fr.obeo.dsl.arduino.ui/.classpath b/plugins/fr.obeo.dsl.arduino.ui/.classpath index ad32c83..ca3785c 100644 --- a/plugins/fr.obeo.dsl.arduino.ui/.classpath +++ b/plugins/fr.obeo.dsl.arduino.ui/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino.ui/.settings/org.eclipse.jdt.core.prefs index c537b63..7adc0fb 100644 --- a/plugins/fr.obeo.dsl.arduino.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/fr.obeo.dsl.arduino.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino.ui/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino.ui/META-INF/MANIFEST.MF index 13a1405..24733ae 100644 --- a/plugins/fr.obeo.dsl.arduino.ui/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino.ui/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.sirius.diagram;bundle-version="2.0.0", org.eclipse.sirius.diagram.ui;bundle-version="2.0.0", org.eclipse.emf.common.ui;bundle-version="2.9.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: fr.obeo.dsl.arduino.commands;x-friends:="fr.obeo.dsl.arduino.design", fr.obeo.dsl.arduino.utils;x-friends:="fr.obeo.dsl.arduino.design" diff --git a/plugins/fr.obeo.dsl.arduino.ui/plugin.xml b/plugins/fr.obeo.dsl.arduino.ui/plugin.xml index 1985e1e..105dc0e 100644 --- a/plugins/fr.obeo.dsl.arduino.ui/plugin.xml +++ b/plugins/fr.obeo.dsl.arduino.ui/plugin.xml @@ -69,7 +69,7 @@ category="fr.obeo.dsl.arduino.category" class="fr.obeo.dsl.arduino.wizard.ArduinoProjectWizard" finalPerspective="fr.obeo.dsl.arduino.perspective" - icon="icons/project.png" + icon="icons/32x32/project.png" id="fr.obeo.dsl.arduino.wizard" name="Arduino Project" preferredPerspectives="fr.obeo.dsl.arduino.perspective" @@ -108,7 +108,7 @@ @@ -208,7 +208,7 @@ point="org.eclipse.ui.views"> diff --git a/plugins/fr.obeo.dsl.arduino/.classpath b/plugins/fr.obeo.dsl.arduino/.classpath index 751c8f2..ca3785c 100644 --- a/plugins/fr.obeo.dsl.arduino/.classpath +++ b/plugins/fr.obeo.dsl.arduino/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/fr.obeo.dsl.arduino/.settings/org.eclipse.jdt.core.prefs b/plugins/fr.obeo.dsl.arduino/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..bd1095b --- /dev/null +++ b/plugins/fr.obeo.dsl.arduino/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/fr.obeo.dsl.arduino/META-INF/MANIFEST.MF b/plugins/fr.obeo.dsl.arduino/META-INF/MANIFEST.MF index 04804ce..c55d4b0 100644 --- a/plugins/fr.obeo.dsl.arduino/META-INF/MANIFEST.MF +++ b/plugins/fr.obeo.dsl.arduino/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: fr.obeo.dsl.arduino, fr.obeo.dsl.arduino.impl, fr.obeo.dsl.arduino.util diff --git a/plugins/fr.obeo.dsl.arduino/src/fr/obeo/dsl/arduino/util/ArduinoAdapterFactory.java b/plugins/fr.obeo.dsl.arduino/src/fr/obeo/dsl/arduino/util/ArduinoAdapterFactory.java index 434830f..7a49b33 100644 --- a/plugins/fr.obeo.dsl.arduino/src/fr/obeo/dsl/arduino/util/ArduinoAdapterFactory.java +++ b/plugins/fr.obeo.dsl.arduino/src/fr/obeo/dsl/arduino/util/ArduinoAdapterFactory.java @@ -11,6 +11,7 @@ package fr.obeo.dsl.arduino.util; import fr.obeo.dsl.arduino.*; +import fr.obeo.dsl.arduino.Module; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/plugins/fr.obeo.dsl.arduino/src/fr/obeo/dsl/arduino/util/ArduinoSwitch.java b/plugins/fr.obeo.dsl.arduino/src/fr/obeo/dsl/arduino/util/ArduinoSwitch.java index 044907a..f132216 100644 --- a/plugins/fr.obeo.dsl.arduino/src/fr/obeo/dsl/arduino/util/ArduinoSwitch.java +++ b/plugins/fr.obeo.dsl.arduino/src/fr/obeo/dsl/arduino/util/ArduinoSwitch.java @@ -11,6 +11,7 @@ package fr.obeo.dsl.arduino.util; import fr.obeo.dsl.arduino.*; +import fr.obeo.dsl.arduino.Module; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; diff --git a/releng/fr.obeo.dsl.arduino.common.parent/pom.xml b/releng/fr.obeo.dsl.arduino.common.parent/pom.xml index 97dc6c8..acc0332 100644 --- a/releng/fr.obeo.dsl.arduino.common.parent/pom.xml +++ b/releng/fr.obeo.dsl.arduino.common.parent/pom.xml @@ -38,15 +38,15 @@ Contributors: - 0.19.0 + 1.5.1 ../.. - luna + 201912 codehaus.snapshots - http://snapshots.repository.codehaus.org/ + https://oss.sonatype.org/content/repositories/snapshots/ Eclipse - Acceleo Snapshots @@ -72,18 +72,8 @@ Contributors: target-platform-configuration ${tycho-version} - p2 + false - - linux - gtk - x86 - - - win32 - win32 - x86 - win32 win32 @@ -101,13 +91,20 @@ Contributors: + + fr.obeo.dsl.arduino + fr.obeo.dsl.arduino.tp + 1.0.0-SNAPSHOT + + + @@ -150,11 +147,11 @@ Contributors: org.apache.maven.plugins maven-pmd-plugin - 2.5 + 3.12.0 utf-8 100 - 1.5 + 1.11 xml false @@ -167,7 +164,7 @@ Contributors: org.eclipse.acceleo org.eclipse.acceleo.maven - 3.5.0-SNAPSHOT + 3.6.4 acceleo-compile @@ -193,7 +190,7 @@ Contributors: org.apache.maven.plugins maven-checkstyle-plugin - 2.2 + 3.1.0 check my sources @@ -241,7 +238,7 @@ Contributors: org.jacoco jacoco-maven-plugin - 0.5.6.201201232323 + 0.8.5 diff --git a/releng/fr.obeo.dsl.arduino.parent/pom.xml b/releng/fr.obeo.dsl.arduino.parent/pom.xml index b2d3f1d..b7934e4 100644 --- a/releng/fr.obeo.dsl.arduino.parent/pom.xml +++ b/releng/fr.obeo.dsl.arduino.parent/pom.xml @@ -48,6 +48,9 @@ Contributors: ${root-path}/packaging/fr.obeo.dsl.arduino.product + + + ${root-path}/releng/fr.obeo.dsl.arduino.tp diff --git a/releng/fr.obeo.dsl.arduino.target/.arduinodesigner-kepler.targetplatform/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs b/releng/fr.obeo.dsl.arduino.target/.arduinodesigner-kepler.targetplatform/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs deleted file mode 100644 index 1937a49..0000000 --- a/releng/fr.obeo.dsl.arduino.target/.arduinodesigner-kepler.targetplatform/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs +++ /dev/null @@ -1,98 +0,0 @@ -eclipse.preferences.version=1 -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/description= -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/enabled=true -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/isSystem=false -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/name=Acceleo 3.4 Releases -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/provider= -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/suffix=compositeContent.xml -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/type=org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/uri=http\://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.4/ -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4/version=1.0.0 -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201306101458/enabled=false -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201306101458/isSystem=true -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201306101458/name=file\:/home/data/httpd/download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.4/R201306101458/ -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201306101458/suffix=content.xml -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201306101458/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201306101458/uri=http\://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.4/R201306101458 -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201306101458/version=1.0.0 -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201309031307/enabled=false -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201309031307/isSystem=true -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201309031307/name=file\:/home/data/httpd/download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.4/R201309031307/ -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201309031307/suffix=content.xml -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201309031307/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201309031307/uri=http\://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.4/R201309031307 -repositories/http\:__download.eclipse.org_modeling_m2t_acceleo_updates_releases_3.4_R201309031307/version=1.0.0 -repositories/http\:__download.eclipse.org_releases_kepler/description= -repositories/http\:__download.eclipse.org_releases_kepler/enabled=true -repositories/http\:__download.eclipse.org_releases_kepler/isSystem=false -repositories/http\:__download.eclipse.org_releases_kepler/name=Eclipse Kepler repository -repositories/http\:__download.eclipse.org_releases_kepler/provider= -repositories/http\:__download.eclipse.org_releases_kepler/suffix=compositeContent.xml -repositories/http\:__download.eclipse.org_releases_kepler/type=org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository -repositories/http\:__download.eclipse.org_releases_kepler/uri=http\://download.eclipse.org/releases/kepler -repositories/http\:__download.eclipse.org_releases_kepler/version=1.0.0 -repositories/http\:__download.eclipse.org_releases_kepler_201306260900/enabled=false -repositories/http\:__download.eclipse.org_releases_kepler_201306260900/isSystem=true -repositories/http\:__download.eclipse.org_releases_kepler_201306260900/name=Kepler -repositories/http\:__download.eclipse.org_releases_kepler_201306260900/suffix=content.xml -repositories/http\:__download.eclipse.org_releases_kepler_201306260900/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_releases_kepler_201306260900/uri=http\://download.eclipse.org/releases/kepler/201306260900 -repositories/http\:__download.eclipse.org_releases_kepler_201306260900/version=1.0.0 -repositories/http\:__download.eclipse.org_releases_kepler_201309270900/enabled=false -repositories/http\:__download.eclipse.org_releases_kepler_201309270900/isSystem=true -repositories/http\:__download.eclipse.org_releases_kepler_201309270900/name=Kepler -repositories/http\:__download.eclipse.org_releases_kepler_201309270900/suffix=content.xml -repositories/http\:__download.eclipse.org_releases_kepler_201309270900/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_releases_kepler_201309270900/uri=http\://download.eclipse.org/releases/kepler/201309270900 -repositories/http\:__download.eclipse.org_releases_kepler_201309270900/version=1.0.0 -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M4_kepler/enabled=true -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M4_kepler/isSystem=false -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M4_kepler/name=org.eclipse.sirius.update -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M4_kepler/suffix=content.xml -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M4_kepler/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M4_kepler/uri=http\://download.eclipse.org/sirius/updates/milestones/1.0.0M4/kepler -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M4_kepler/version=1.0.0 -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M5_kepler/enabled=true -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M5_kepler/isSystem=false -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M5_kepler/name=org.eclipse.sirius.update -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M5_kepler/suffix=content.xml -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M5_kepler/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M5_kepler/uri=http\://download.eclipse.org/sirius/updates/milestones/1.0.0M5/kepler -repositories/http\:__download.eclipse.org_sirius_updates_milestones_1.0.0M5_kepler/version=1.0.0 -repositories/http\:__download.eclipse.org_sirius_updates_nightly_1.0.0-N20140129-050015_kepler/enabled=false -repositories/http\:__download.eclipse.org_sirius_updates_nightly_1.0.0-N20140129-050015_kepler/isSystem=true -repositories/http\:__download.eclipse.org_sirius_updates_nightly_1.0.0-N20140129-050015_kepler/name=org.eclipse.sirius.update -repositories/http\:__download.eclipse.org_sirius_updates_nightly_1.0.0-N20140129-050015_kepler/suffix=content.xml -repositories/http\:__download.eclipse.org_sirius_updates_nightly_1.0.0-N20140129-050015_kepler/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_sirius_updates_nightly_1.0.0-N20140129-050015_kepler/uri=http\://download.eclipse.org/sirius/updates/nightly/1.0.0-N20140129-050015/kepler -repositories/http\:__download.eclipse.org_sirius_updates_nightly_1.0.0-N20140129-050015_kepler/version=1.0.0 -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/description= -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/enabled=true -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/isSystem=false -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/name=Eclipse Sirius -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/provider= -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/suffix=compositeContent.xml -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/type=org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/uri=http\://download.eclipse.org/sirius/updates/nightly/latest/kepler -repositories/http\:__download.eclipse.org_sirius_updates_nightly_latest_kepler/version=1.0.0 -repositories/http\:__download.eclipse.org_technology_epp_packages_kepler/enabled=false -repositories/http\:__download.eclipse.org_technology_epp_packages_kepler/isSystem=true -repositories/http\:__download.eclipse.org_technology_epp_packages_kepler/name=Feature -repositories/http\:__download.eclipse.org_technology_epp_packages_kepler/suffix=content.xml -repositories/http\:__download.eclipse.org_technology_epp_packages_kepler/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_technology_epp_packages_kepler/uri=http\://download.eclipse.org/technology/epp/packages/kepler/ -repositories/http\:__download.eclipse.org_technology_epp_packages_kepler/version=1.0.0 -repositories/http\:__download.eclipse.org_tools_orbit_downloads_drops_S20130914154012_repository/enabled=true -repositories/http\:__download.eclipse.org_tools_orbit_downloads_drops_S20130914154012_repository/isSystem=false -repositories/http\:__download.eclipse.org_tools_orbit_downloads_drops_S20130914154012_repository/name=Orbit-S20130914154012 -repositories/http\:__download.eclipse.org_tools_orbit_downloads_drops_S20130914154012_repository/suffix=content.xml -repositories/http\:__download.eclipse.org_tools_orbit_downloads_drops_S20130914154012_repository/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__download.eclipse.org_tools_orbit_downloads_drops_S20130914154012_repository/uri=http\://download.eclipse.org/tools/orbit/downloads/drops/S20130914154012/repository/ -repositories/http\:__download.eclipse.org_tools_orbit_downloads_drops_S20130914154012_repository/version=1.0.0 -repositories/http\:__update.obeo.fr_integration_viewpoint_master_kepler_repository/enabled=true -repositories/http\:__update.obeo.fr_integration_viewpoint_master_kepler_repository/isSystem=false -repositories/http\:__update.obeo.fr_integration_viewpoint_master_kepler_repository/name=fr.obeo.dsl.viewpoint.extras.update -repositories/http\:__update.obeo.fr_integration_viewpoint_master_kepler_repository/suffix=content.xml -repositories/http\:__update.obeo.fr_integration_viewpoint_master_kepler_repository/type=org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository -repositories/http\:__update.obeo.fr_integration_viewpoint_master_kepler_repository/uri=http\://update.obeo.fr/integration/viewpoint/master/kepler/repository/ -repositories/http\:__update.obeo.fr_integration_viewpoint_master_kepler_repository/version=1.0.0 diff --git a/releng/fr.obeo.dsl.arduino.target/.arduinodesigner-kepler.targetplatform/org.eclipse.equinox.p2.repository/cache/compositeContent1725741017.xml b/releng/fr.obeo.dsl.arduino.target/.arduinodesigner-kepler.targetplatform/org.eclipse.equinox.p2.repository/cache/compositeContent1725741017.xml deleted file mode 100644 index ea6f1f5..0000000 --- a/releng/fr.obeo.dsl.arduino.target/.arduinodesigner-kepler.targetplatform/org.eclipse.equinox.p2.repository/cache/compositeContent1725741017.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/releng/fr.obeo.dsl.arduino.target/.project b/releng/fr.obeo.dsl.arduino.target/.project deleted file mode 100644 index d29077b..0000000 --- a/releng/fr.obeo.dsl.arduino.target/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - fr.obeo.dsl.arduino.target - - - - - - - - diff --git a/releng/fr.obeo.dsl.arduino.target/arduinodesigner-luna.target b/releng/fr.obeo.dsl.arduino.target/arduinodesigner-luna.target deleted file mode 100644 index 4ae6126..0000000 --- a/releng/fr.obeo.dsl.arduino.target/arduinodesigner-luna.target +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/fr.obeo.dsl.arduino.target/arduinodesigner-luna.tpd b/releng/fr.obeo.dsl.arduino.target/arduinodesigner-luna.tpd deleted file mode 100644 index 89e8be8..0000000 --- a/releng/fr.obeo.dsl.arduino.target/arduinodesigner-luna.tpd +++ /dev/null @@ -1,40 +0,0 @@ -target "ArduinoDesigner-luna" - -with source, requirements - -// Eclipse release -location "http://download.eclipse.org/releases/luna" { - org.eclipse.platform.sdk lazy - org.eclipse.equinox.executable.feature.group lazy - org.eclipse.epp.mpc.feature.group lazy - org.eclipse.amalgam.discovery.feature.group lazy - org.eclipse.emf.edit.feature.group lazy - org.eclipse.emf.mapping.ecore.feature.group lazy -} - -// Orbit -location "http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/" { - com.google.guava [11.0.2,12.0.0) - org.hamcrest.core [1.3.0,2.0.0) - org.hamcrest.library [1.3.0,2.0.0) - org.apache.log4j [1.2.0,1.3.0) -} - -// Acceleo 3 -location "http://download.eclipse.org/acceleo/updates/milestones/3.5/S201406101309/" { - org.eclipse.acceleo.feature.group lazy - org.eclipse.acceleo.runtime.feature.group lazy -} - -// Sirius -location "http://download.eclipse.org/sirius/updates/releases/2.0.3/luna" { - //runtime - org.eclipse.sirius.runtime.feature.group - org.eclipse.sirius.runtime.acceleo.feature.group - //IDE - org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group - org.eclipse.sirius.runtime.ide.eef.feature.group - org.eclipse.sirius.runtime.ide.ui.feature.group - org.eclipse.sirius.specifier.ide.ui.feature.group - org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group -} diff --git a/releng/fr.obeo.dsl.arduino.target/relax_versions.sh b/releng/fr.obeo.dsl.arduino.target/relax_versions.sh deleted file mode 100755 index f3f5002..0000000 --- a/releng/fr.obeo.dsl.arduino.target/relax_versions.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -sed -i -r -e 's|(|' ./*.target -sed -i -r -e 's|(|' ./*.target -sed -i -r -e 's|(|' ./*.target diff --git a/releng/fr.obeo.dsl.arduino.tp/.project b/releng/fr.obeo.dsl.arduino.tp/.project new file mode 100644 index 0000000..4d0ad5c --- /dev/null +++ b/releng/fr.obeo.dsl.arduino.tp/.project @@ -0,0 +1,17 @@ + + + fr.obeo.dsl.arduino.tp + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/releng/fr.obeo.dsl.arduino.tp/fr.obeo.dsl.arduino.tp.target b/releng/fr.obeo.dsl.arduino.tp/fr.obeo.dsl.arduino.tp.target new file mode 100644 index 0000000..2761377 --- /dev/null +++ b/releng/fr.obeo.dsl.arduino.tp/fr.obeo.dsl.arduino.tp.target @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/fr.obeo.dsl.arduino.tp/fr.obeo.dsl.arduino.tp.tpd b/releng/fr.obeo.dsl.arduino.tp/fr.obeo.dsl.arduino.tp.tpd new file mode 100644 index 0000000..970c4f0 --- /dev/null +++ b/releng/fr.obeo.dsl.arduino.tp/fr.obeo.dsl.arduino.tp.tpd @@ -0,0 +1,70 @@ +target "ArduinoDesigner-201912" + +with source, requirements + +// Eclipse release +location "http://download.eclipse.org/releases/2019-12/" { + org.eclipse.platform.sdk lazy + org.eclipse.epp.mpc.feature.group lazy + org.eclipse.emf.mapping.ecore.feature.group lazy + org.eclipse.emf.edit.feature.group lazy + org.eclipse.ui lazy + org.eclipse.ui.browser lazy + org.eclipse.ui.intro.universal lazy + org.eclipse.ui.workbench lazy + org.eclipse.ui.ide lazy + org.eclipse.ui.views lazy + org.eclipse.equinox.common lazy + org.eclipse.equinox.app lazy + org.eclipse.equinox.compendium.sdk.feature.group lazy + org.eclipse.equinox.core.feature.feature.group lazy + org.eclipse.equinox.ds lazy + org.eclipse.equinox.executable.feature.group lazy + org.eclipse.equinox.launcher lazy + org.eclipse.equinox.p2.core.feature.feature.group lazy + org.eclipse.equinox.p2.discovery.feature.feature.group lazy + org.eclipse.equinox.p2.extras.feature.feature.group lazy + org.eclipse.equinox.p2.rcp.feature.feature.group lazy + org.eclipse.equinox.p2.user.ui.feature.group lazy + org.eclipse.equinox.p2.rcp.feature.source.feature.group lazy + org.eclipse.equinox.p2.extras.feature.source.feature.group lazy + org.eclipse.equinox.p2.ui lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.equinox.server.core.feature.group lazy + org.eclipse.equinox.server.jetty.feature.group lazy + org.eclipse.equinox.server.p2.feature.group lazy + org.eclipse.equinox.serverside.sdk.feature.group lazy + org.eclipse.equinox.simpleconfigurator lazy + org.apache.batik.css lazy +} + +location "https://download.eclipse.org/modeling/amalgam/updates/releases/1.7.0/" { + org.eclipse.amalgam.discovery.feature.group lazy +} + +// Orbit +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository" { + com.google.guava lazy + org.hamcrest.core lazy + org.hamcrest.library lazy + org.apache.log4j lazy +} + +// Acceleo 3.7.9 +location "https://download.eclipse.org/acceleo/updates/releases/3.7/R201911060712" { + org.eclipse.acceleo.feature.group lazy + org.eclipse.acceleo.runtime.feature.group lazy +} + +// Sirius +location "https://download.eclipse.org/sirius/updates/releases/6.3.0/2019-06/" { + //runtime + org.eclipse.sirius.runtime.feature.group lazy + org.eclipse.sirius.runtime.acceleo.feature.group lazy + //IDE + org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy + org.eclipse.sirius.runtime.ide.eef.feature.group lazy + org.eclipse.sirius.runtime.ide.ui.feature.group lazy + org.eclipse.sirius.specifier.ide.ui.feature.group lazy + org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy +} diff --git a/releng/fr.obeo.dsl.arduino.tp/pom.xml b/releng/fr.obeo.dsl.arduino.tp/pom.xml new file mode 100644 index 0000000..53bbb7a --- /dev/null +++ b/releng/fr.obeo.dsl.arduino.tp/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + fr.obeo.dsl.arduino + parent + 1.0.0-SNAPSHOT + ../../releng/fr.obeo.dsl.arduino.parent + + fr.obeo.dsl.arduino + fr.obeo.dsl.arduino.tp + 1.0.0-SNAPSHOT + eclipse-target-definition + + +