Skip to content

Commit e711b15

Browse files
ebousseszschalerdvojtisejdeantoni
authored
Concurrent execution framework, rehauled and extended (#235)
* Add Footprint EClass to trace mse metamodel rebase wrt master (jd) * Ensure UTF-8 encoding * Bump xtend compiler to 2.22.0 rebase wrt master (jd) * Undo xtend bump * Format + fix null pointers in setTimelineProvider rebase wrt master (jd) * Add Footprint EClass to trace metamodel rebase wrt master (jd) * Move commons from modeldebugging repository to dedicated repository (#223) rebase wrt master (jd) * use commons from new gemoc-studio-commons repository * Split commons eclipse pde to remove UI dependency (#224) * use new commons.eclipse.pde.ui plugin * adapt to commons.eclipse.pde * reduce dependencies use GemocPlugin in commons.eclipse instead of commons.eclipse.pde * Bump xtend compiler to 2.22.0 rebase wrt master (jd) * Add Footprint EClass to trace metamodel (rebase from master JD) * update changelog (rebase from master JD) * update changelog * Bump to Eclipse 2022-06 (#222) (rebase from master JD) * bump to tycho 2.7.3 * use newer version of xtext * update for use of Sirius 7.0.1 follows https://bugs.eclipse.org/bugs/show_bug.cgi?id=531282 * java min version 11 * remove some warning generated by trace addon generator * increase delay before waiting for jobs * java 11 * add better clean workspace method + remove deprecated xtext test api the clean workspace is now able to remove previous content from crashed executions * bump to GEMOC 3.6.0 contributes to eclipse-gemoc/gemoc-studio#270 * Add Footprint EClass to trace mse metamodel rebase wrt master (jd) * Add Footprint EClass to trace metamodel rebase wrt master (jd) * Add Footprint EClass to trace metamodel rebase wrt master (jd) * Move commons from modeldebugging repository to dedicated repository (#223) rebase wrt master (jd) * use commons from new gemoc-studio-commons repository * Add Footprint EClass to trace metamodel rebase wrt master (jd) * Add Footprint EClass to trace mse metamodel rebase wrt master (jd) * clean pom * update trace generated code * Add common concurrency classes (moved from moccml engine) * Add Choco jar * Remove _ from package name * Force java 17 in engine.ui * Move AbstractConcurrentLauncher * Bump xtend 2.32.0 * Add missing xtend-gen src folder * Add more concurrency code --------- Co-authored-by: Steffen Zschaler <steffen.zschaler@kcl.ac.uk> Co-authored-by: Erwan Bousse <Erwan.Bousse@ls2n.fr> Co-authored-by: Didier Vojtisek <didier.vojtisek@inria.fr> Co-authored-by: julien deantoni <julien.deantoni@inria.fr>
1 parent 67f6962 commit e711b15

File tree

178 files changed

+6488
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+6488
-732
lines changed

CHANGELOG.md

Lines changed: 36 additions & 35 deletions

framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
</accessrules>
88
</classpathentry>
99
<classpathentry kind="src" path="src"/>
10+
<classpathentry kind="src" path="xtend-gen"/>
1011
<classpathentry kind="output" path="bin"/>
1112
</classpath>

framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
<projects>
66
</projects>
77
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
813
<buildCommand>
914
<name>org.eclipse.jdt.core.javabuilder</name>
1015
<arguments>
@@ -34,5 +39,6 @@
3439
<natures>
3540
<nature>org.eclipse.pde.PluginNature</nature>
3641
<nature>org.eclipse.jdt.core.javanature</nature>
42+
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
3743
</natures>
3844
</projectDescription>

framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,18 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api,
3232
org.eclipse.ui.workbench,
3333
org.eclipse.ui.ide;bundle-version="3.14.0"
3434
Bundle-ActivationPolicy: lazy
35-
Bundle-RequiredExecutionEnvironment: JavaSE-11
35+
Bundle-RequiredExecutionEnvironment: JavaSE-17
3636
Export-Package: org.eclipse.gemoc.executionframework.engine.ui,
37+
org.eclipse.gemoc.executionframework.engine.ui.concurrency,
38+
org.eclipse.gemoc.executionframework.engine.ui.concurrency.deciders,
39+
org.eclipse.gemoc.executionframework.engine.ui.concurrency.deciders.actions,
40+
org.eclipse.gemoc.executionframework.engine.ui.concurrency.launcher,
41+
org.eclipse.gemoc.executionframework.engine.ui.concurrency.strategies,
42+
org.eclipse.gemoc.executionframework.engine.ui.concurrency.strategies.concurrency,
43+
org.eclipse.gemoc.executionframework.engine.ui.concurrency.strategies.filters,
44+
org.eclipse.gemoc.executionframework.engine.ui.concurrency.strategyselector,
45+
org.eclipse.gemoc.executionframework.engine.ui.concurrency.views.step,
46+
org.eclipse.gemoc.executionframework.engine.ui.genericdebugmodel,
3747
org.eclipse.gemoc.executionframework.engine.ui.launcher,
3848
org.eclipse.gemoc.executionframework.engine.ui.launcher.tabs,
3949
org.eclipse.gemoc.executionframework.engine.ui.provider

framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/build.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
source.. = src/
1+
source.. = src/,\
2+
xtend-gen/
23
output.. = bin/
34
bin.includes = META-INF/,\
45
.,\
421 Bytes
732 Bytes
302 Bytes
197 Bytes
139 Bytes

0 commit comments

Comments
 (0)