Skip to content

Commit

Permalink
Merge pull request #4 from gemoc/upgrade-for-current-gemoc-studio
Browse files Browse the repository at this point in the history
Upgrade  sequential version for current Gemoc studio
  • Loading branch information
dvojtise authored Jun 5, 2024
2 parents f0862e5 + 39a87ba commit b909fa8
Show file tree
Hide file tree
Showing 296 changed files with 1,761 additions and 1,668 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xtend-gen"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
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.8
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ Require-Bundle: fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version
org.eclipse.emf.common;bundle-version="2.8.0";visibility:="reexport",
org.gemoc.arduino.sequential.model;bundle-version="1.0.0"
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Automatic-Module-Name: org.gemoc.arduino.sequential.k3dsa
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class Instruction_UtilitesAspect {
var Project project = null

var current = _self.eContainer()
while (current != null) {
while (current !== null) {
if (current instanceof Project) {
project = current as Project
return project
Expand All @@ -75,7 +75,7 @@ class Instruction_UtilitesAspect {
val project = _self.getProject(module)

for (board : project.boards) {
if (board != null && board instanceof ArduinoBoard) {
if (board !== null && board instanceof ArduinoBoard) {
var ArduinoBoard arduinoBoard = board as ArduinoBoard
for (analogPin : arduinoBoard.analogPins) {
if (analogPin.module == module) {
Expand Down Expand Up @@ -135,7 +135,7 @@ class Project_ExecutableAspect {
}

@InitializeModel
def public void initializeModel(EList<String> args){
def void initializeModel(EList<String> args){
_self.setup
}
}
Expand Down Expand Up @@ -266,7 +266,7 @@ class If_ExecutableAspect extends Control_ExecutableAspect {
if (_self.evaluate) {
_self.block.execute
} else {
if (_self.elseBlock != null) {
if (_self.elseBlock !== null) {
_self.elseBlock.execute
}
}
Expand Down Expand Up @@ -418,7 +418,7 @@ class IntegerModuleGet_ExecutableAspect extends Expression_EvaluableAspect{
if (_self.module instanceof BluetoothTransceiver){
val l = (_self.module as BluetoothTransceiver).dataReceived
val res = l.head
if (res != null) {
if (res !== null) {
l.remove(0)
return res
} else {
Expand Down Expand Up @@ -583,7 +583,7 @@ abstract class Expression_EvaluableAspect {
var Instruction instruction = null

var current = _self.eContainer()
while (current != null) {
while (current !== null) {
if (current instanceof Instruction) {
instruction = current as Instruction
return instruction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
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=17
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.gemoc.sequential.model.arduino,
org.gemoc.sequential.model.arduino.impl,
org.gemoc.sequential.model.arduino.util
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
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=17
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Automatic-Module-Name: org.gemoc.arduino.sequential.xarduino.design
Bundle-Name: org.gemoc.arduino.sequential.design
Bundle-SymbolicName: org.gemoc.arduino.sequential.xarduino.design;singleton:=true
Bundle-Version: 1.0.0.qualifier
Expand All @@ -23,7 +24,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.gemoc.execution.sequential.javaengine.ui;bundle-version="0.1.0",
org.gemoc.arduino.sequential.xarduino;bundle-version="0.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: com.google.common.collect,
org.eclipse.xtext.resource
Export-Package: org.gemoc.arduino.sequential.xarduino.design,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
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=17
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Bundle-ClassPath: .
Bundle-Activator: org.gemoc.arduino.sequential.xarduino.arduino.provider.XArduinoEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.gemoc.arduino.sequential.xarduino.arduino.provider
Require-Bundle: org.eclipse.core.runtime,
org.gemoc.arduino.sequential.xarduino;visibility:=reexport,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
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=17
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Bundle-ClassPath: .
Bundle-Activator: org.gemoc.arduino.sequential.xarduino.arduino.presentation.XArduinoEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.gemoc.arduino.sequential.xarduino.arduino.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageBuilder</name>
<name>org.eclipse.gemoc.xdsmlframework.ide.ui.GemocLanguageProjectBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.gemoc.xdsmlframework.ide.ui.GemocLanguageProjectNature</nature>
<nature>org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
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=17
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
Manifest-Version: 1.0
Automatic-Module-Name: org.gemoc.arduino.sequential.xarduino
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.gemoc.arduino.sequential.xarduino;singleton:=true
Automatic-Module-Name: org.gemoc.arduino.sequential.xarduino
Bundle-Version: 0.1.0
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:="reexport",
fr.inria.diverse.k3.al.annotationprocessor.plugin,
fr.inria.diverse.melange,
org.eclipse.xtext.xbase.lib,
org.eclipse.gemoc.xdsmlframework.api;bundle-version="4.0.0";visibility:="reexport",
org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:="reexport",
org.eclipse.gemoc.executionframework.engine;bundle-version="4.0.0";visibility:="reexport",
com.google.guava,
org.eclipse.xtend.lib,
org.eclipse.emf.common,
org.eclipse.emf.ecore.xmi,
org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version=0.0.0;visibility:=reexport
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: %providerName
Export-Package: org.gemoc.arduino.sequential.xarduino.aspects,
org.gemoc.arduino.sequential.xarduino.arduino,
org.gemoc.arduino.sequential.xarduino.arduino.impl,
org.gemoc.arduino.sequential.xarduino.arduino.util
Bundle-Name: %pluginName
Bundle-Version: 0.1.0
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ name = org.gemoc.arduino.sequential.XArduino
ecore = platform:/resource/org.gemoc.arduino.sequential.xarduino/model/XArduino.ecore

k3 = org.gemoc.arduino.sequential.xarduino.aspects.IntegerModuleGet_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Delay_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Instruction_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.BooleanVariable_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.BinaryIntegerExpression_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Project_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.While_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.ModuleAssignment_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.IntegerVariable_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.If_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.ArduinoCommunicationModule_PushAspect,org.gemoc.arduino.sequential.xarduino.aspects.Instruction_UtilitesAspect,org.gemoc.arduino.sequential.xarduino.aspects.VariableAssignment_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.If_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Pin_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.While_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.BooleanModuleGet_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Control_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.IntegerConstant_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.ModuleInstruction_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Repeat_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.BluetoothTransceiver_PushAspect,org.gemoc.arduino.sequential.xarduino.aspects.VariableDeclaration_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.VariableRef_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.BooleanConstant_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Block_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Constant_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Repeat_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Variable_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Expression_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.BinaryBooleanExpression_EvaluableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Utilities_ExecutableAspect,org.gemoc.arduino.sequential.xarduino.aspects.Control_ExecutableAspect

metaprog = org.eclipse.gemoc.metaprog.kermeta3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#
#Thu Oct 24 17:56:36 CEST 2019
#Wed Jun 05 14:50:44 CEST 2024
bin.includes=META-INF/,.,plugin.xml,plugin.properties,model/,XArduino.dsl
source..=src,\n src-gen
Loading

0 comments on commit b909fa8

Please sign in to comment.