Skip to content

Fix official sample #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Nov 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7581afd
add moccml tfsm to the official examples
Sep 23, 2019
7a40f28
ignore bin...
Sep 23, 2019
812a4ee
ignore bin...
Sep 23, 2019
7b97b9d
Merge branch 'fixOfficialSample' of
Oct 7, 2019
37c4be6
Merge branch 'fixOfficialSample' of
Oct 7, 2019
a4d18a4
Merge branch 'fixOfficialSample' of https://github.com/eclipse/gemoc-…
Oct 7, 2019
5c20bf8
fix according to Erwan's review
Oct 15, 2019
3f407ba
Merge branch 'master' into fixOfficialSample
jdeantoni Oct 15, 2019
da91917
Remove bin folder from sigpml example
ebousse Oct 16, 2019
bf45f4b
Remove all remaining bin folders from examples
ebousse Oct 16, 2019
f375542
Remove all existing *.class files from the repository
ebousse Oct 16, 2019
950ec8d
Add *.class to gitignore
ebousse Oct 16, 2019
a50d6fe
Remove redundant gitignore files
ebousse Oct 16, 2019
38fe470
Remove remaining xtend-gen folders from the repository
ebousse Oct 16, 2019
3f4fb71
move project to a language_workbench subfolder
dvojtise Nov 5, 2019
0e4b8dd
fix autoecoreregisternature to current gemoc
dvojtise Nov 5, 2019
7be6eef
fix path to moccmllib and ecore in the ecl file
dvojtise Nov 5, 2019
ba294b6
fix path to images
dvojtise Nov 6, 2019
cd72889
add basic pingpong example
dvojtise Nov 6, 2019
9f89b8f
more fix in the odesign
dvojtise Nov 6, 2019
b935068
fix acceleo error message when running sigpml
dvojtise Nov 7, 2019
01c1fab
align project name and folder name
dvojtise Nov 7, 2019
7b02a11
align project name and folder name
dvojtise Nov 7, 2019
24ff4bf
add an aird and jpg
dvojtise Nov 8, 2019
605416d
use project name pattern similar to sigpml moc.dse moc.lib
dvojtise Nov 8, 2019
e7b4cf8
improve model example
dvojtise Nov 8, 2019
9fdc836
add example deployer to the studio product
dvojtise Nov 8, 2019
7cb8a5d
fixing path to zip of sigpml example in deployer
dvojtise Nov 8, 2019
33ad7c6
add tfsm to the example deployer
dvojtise Nov 8, 2019
f27b59f
typo
dvojtise Nov 8, 2019
8f63d37
typo
dvojtise Nov 8, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ build.acceleo
node_modules
/package-lock.json
**/.polyglot.build.properties
*.class
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<extension
point="org.eclipse.ui.newWizards">
<wizard
<wizard
canFinishEarly="true"
category="org.eclipse.ui.Examples/org.eclipse.gemoc.gemoc_language_workbench.samples.category"
class="org.eclipse.gemoc.execution.moccml.lwb.example.deployer.wizards.SigPMLExampleWizard"
Expand All @@ -17,9 +17,9 @@ point="org.eclipse.ui.newWizards">
<description>
SigPML language implementation using MOCCML
</description>
</wizard>
</wizard>

<wizard
<wizard
canFinishEarly="true"
category="org.eclipse.ui.Examples/org.eclipse.gemoc.gemoc_modeling_workbench.samples.category"
class="org.eclipse.gemoc.execution.moccml.mwb.example.deployer.wizards.SigPMLExampleWizard"
Expand All @@ -30,9 +30,38 @@ point="org.eclipse.ui.newWizards">
name="GEMOC models for MoccmlSigPML Language"
preferredPerspectives="org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.perspective">
<description>
SigPML model example for SigPML language implementation using MOCCML
This project contains some SigPML model examples that can be executed if you have installed the MoccmlSigPML language
</description>
</wizard>
</wizard>
<wizard
canFinishEarly="true"
category="org.eclipse.ui.Examples/org.eclipse.gemoc.gemoc_language_workbench.samples.category"
class="org.eclipse.gemoc.execution.moccml.lwb.example.deployer.wizards.TFSMExampleWizard"
finalPerspective="org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.perspective"
hasPages="false"
icon="icons/IconeGemocLanguage-16.png"
id="org.eclipse.gemoc.ale.language.wb.sample.deployer.fsm.wizard"
name="GEMOC MoccmlTFSM Language"
preferredPerspectives="org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.perspective">
<description>
TFSM (Timed Finite State Machine) language implementation using MOCCML
</description>
</wizard>

<wizard
canFinishEarly="true"
category="org.eclipse.ui.Examples/org.eclipse.gemoc.gemoc_modeling_workbench.samples.category"
class="org.eclipse.gemoc.execution.moccml.mwb.example.deployer.wizards.TFSMExampleWizard"
finalPerspective="org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.perspective"
hasPages="false"
icon="icons/IconeGemocModel-16.png"
id="org.eclipse.gemoc.ale.language.wb.sample.deployer.fsm.wizard"
name="GEMOC models for MoccmlTFSM Language"
preferredPerspectives="org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.perspective">
<description>
This project contains some TFSM model examples that can be executed if you have installed the MoccmlTFSM language
</description>
</wizard>
</extension>

</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<sigpml_example_root>${basedir}/../../../examples/moccmlSigPML</sigpml_example_root>
<sigpml_example_language_root>${sigpml_example_root}/language_workbench</sigpml_example_language_root>
<sigpml_example_modeling_root>${sigpml_example_root}/modeling_workbench</sigpml_example_modeling_root>

<tfsm_example_root>${basedir}/../../../examples/moccmlTFSM</tfsm_example_root>
<tfsm_example_language_root>${tfsm_example_root}/language_workbench</tfsm_example_language_root>
<tfsm_example_modeling_root>${tfsm_example_root}/modeling_workbench</tfsm_example_modeling_root>
</properties>

<parent>
Expand All @@ -33,7 +37,7 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<mkdir dir="${basedir}/zips" />

<!-- sigPML language -->
Expand All @@ -47,11 +51,6 @@
<fileset
dir="${sigpml_example_language_root}/org.eclipse.gemoc.example.moccmlsigpml.design/" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccmlsigpml.dse.zip">
<fileset
dir="${sigpml_example_language_root}/org.eclipse.gemoc.example.moccmlsigpml.dse/" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccmlsigpml.groovy.zip">
<fileset
Expand All @@ -63,9 +62,14 @@
dir="${sigpml_example_language_root}/org.eclipse.gemoc.example.moccmlsigpml.k3dsa" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccmlsigpml.lib.zip">
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccmlsigpml.moc.lib.zip">
<fileset
dir="${sigpml_example_language_root}/org.eclipse.gemoc.example.moccmlsigpml.lib" />
dir="${sigpml_example_language_root}/org.eclipse.gemoc.example.moccmlsigpml.moc.lib" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccmlsigpml.moc.dse.zip">
<fileset
dir="${sigpml_example_language_root}/org.eclipse.gemoc.example.moccmlsigpml.moc.dse" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccmlsigpml.model.zip">
Expand Down Expand Up @@ -93,7 +97,59 @@
<fileset
dir="${sigpml_example_modeling_root}/org.eclipse.gemoc.example.moccmlsigpml.simple_example/" />
</zip>
</tasks>

<!-- ***************************************** -->

<!-- TFSM language -->
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.zip">
<fileset
dir="${tfsm_example_language_root}/org.eclipse.gemoc.example.moccml.tfsm/" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.design.zip">
<fileset
dir="${tfsm_example_language_root}/org.eclipse.gemoc.example.moccml.tfsm.design/" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.k3dsa.zip">
<fileset
dir="${tfsm_example_language_root}/org.eclipse.gemoc.example.moccml.tfsm.k3dsa" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.moc.lib.zip">
<fileset
dir="${tfsm_example_language_root}/org.eclipse.gemoc.example.moccml.tfsm.moc.lib" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.moc.dse.zip">
<fileset
dir="${tfsm_example_language_root}/org.eclipse.gemoc.example.moccml.tfsm.moc.dse" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.model.zip">
<fileset
dir="${tfsm_example_language_root}/org.eclipse.gemoc.example.moccml.tfsm.model" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.model.edit.zip">
<fileset
dir="${tfsm_example_language_root}/org.eclipse.gemoc.example.moccml.tfsm.model.edit" />
</zip>
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.model.editor.zip">
<fileset
dir="${tfsm_example_language_root}/org.eclipse.gemoc.example.moccml.tfsm.model.editor" />
</zip>
<!-- TFSM models -->
<zip
destfile="${basedir}/zips/org.eclipse.gemoc.example.moccml.tfsm.pingpong_example.zip">
<fileset
dir="${tfsm_example_modeling_root}/org.eclipse.gemoc.example.moccml.tfsm.pingpong_example/" />
</zip>


</target>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ protected Collection<ProjectDescriptor> getProjectDescriptors() {
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccmlsigpml.model.editor.zip", "org.eclipse.gemoc.example.moccmlsigpml.model.editor"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccmlsigpml.groovy.zip", "org.eclipse.gemoc.example.moccmlsigpml.groovy"));
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccmlsigpml.k3dsa.zip", "org.eclipse.gemoc.example.moccmlsigpml.k3dsa"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccmlsigpml.lib.zip", "org.eclipse.gemoc.example.moccmlsigpml.lib"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccmlsigpml.moc.dse.zip", "org.eclipse.gemoc.example.moccmlsigpml.moc.dse"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccmlsigpml.moc.lib.zip", "org.eclipse.gemoc.example.moccmlsigpml.moc.lib"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccmlsigpml.design.zip", "org.eclipse.gemoc.example.moccmlsigpml.design"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccmlsigpml.zip", "org.eclipse.gemoc.example.moccmlsigpml"));
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.ultimateplotter.zip", "org.eclipse.gemoc.example.ultimateplotter"));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package org.eclipse.gemoc.execution.moccml.lwb.example.deployer.wizards;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import org.eclipse.gemoc.execution.moccml.example.deployer.Activator;
import org.eclipse.gemoc.sequential.language.wb.sample.deployer.wizards.AbstractExampleWizard;
import org.eclipse.ui.plugin.AbstractUIPlugin;

public class TFSMExampleWizard extends AbstractExampleWizard {

@Override
protected AbstractUIPlugin getContainerPlugin() {
return Activator.getDefault();
}

@Override
protected Collection<ProjectDescriptor> getProjectDescriptors() {
List<ProjectDescriptor> projects = new ArrayList<ProjectDescriptor>(1);
// extract project in a compilation friendly way, give the compiler a chance to be more efficient and succeed without a "clean all"
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.model.zip", "org.eclipse.gemoc.example.moccml.tfsm.model"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.model.edit.zip", "org.eclipse.gemoc.example.moccml.tfsm.model.edit"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.model.editor.zip", "org.eclipse.gemoc.example.moccml.tfsm.model.editor"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.k3dsa.zip", "org.eclipse.gemoc.example.moccml.tfsm.k3dsa"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.moc.dse.zip", "org.eclipse.gemoc.example.moccml.tfsm.moc.dse"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.moc.lib.zip", "org.eclipse.gemoc.example.moccml.tfsm.moc.lib"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.design.zip", "org.eclipse.gemoc.example.moccml.tfsm.design"));;
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.zip", "org.eclipse.gemoc.example.moccml.tfsm"));

return projects;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package org.eclipse.gemoc.execution.moccml.mwb.example.deployer.wizards;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import org.eclipse.gemoc.execution.moccml.example.deployer.Activator;
import org.eclipse.gemoc.sequential.language.wb.sample.deployer.wizards.AbstractExampleWizard;
import org.eclipse.ui.plugin.AbstractUIPlugin;

public class TFSMExampleWizard extends AbstractExampleWizard {

@Override
protected AbstractUIPlugin getContainerPlugin() {
return Activator.getDefault();
}

@Override
protected Collection<ProjectDescriptor> getProjectDescriptors() {
List<ProjectDescriptor> projects = new ArrayList<ProjectDescriptor>(1);
// extract project in a compilation friendly way, give the compiler a chance to be more efficient and succeed without a "clean all"
projects.add(new ProjectDescriptor(Activator.PLUGIN_ID, "zips/org.eclipse.gemoc.example.moccml.tfsm.pingpong_example.zip", "org.eclipse.gemoc.example.moccml.tfsm.pingpong_example"));
return projects;
}

}
Binary file not shown.
Binary file not shown.
Loading