Fix official sample #21

jdeantoni · 2019-10-07T09:12:59Z

second attempt :)

this is an alignment of "official" concurrent example with the last gemoc release

Signed-off-by: julien.deantoni@inria.fr

https://github.com/eclipse/gemoc-studio-execution-moccml.git into fixOfficialSample

…studio-execution-moccml.git into fixOfficialSample

jdeantoni · 2019-10-07T09:17:00Z

well...
Erwan was right I used a "git config --global user.email="julien.deantoni@univ-cotedazur.fr" unexpectedly...

So I updated it in the gemoc git folder with the correct identity.
I closed previous PR et did a new one... It seems to be the same problem (maybe because one of the commit still have the wrong committer ID).

@dvojtise not sure to know what is this squash about but If you can accept it when you have time that's perfect. No rush...

I'll try to take care about my git identity in the future....

dvojtise · 2019-10-07T09:26:21Z

the squash and commit is one of the possible actions when accepting a pull request:

merge, will take all commits and add all of them to the history
squash, rewrite the commits into a single one, doing this implies to rewrite the commit messages to synthesise all the other one. It is them possible to fix the wrong or missing signature in a single commit if I'm sure that you have the ECA 😄

We use squash for most of the GEMOC PR as it creates a cleaner history

ebousse · 2019-10-07T09:31:24Z

@dvojtise if I am correct @jdeantoni would simply need to edit the description of the PR and to add the "Signed off" at the end of it? Then when doing the squash, the comment of the PR would become the description of the single resulting commit, which would thus contain the "Signed off" declaration?

ebousse · 2019-10-07T09:54:36Z

EDIT: I removed this comment, I solved the error by fixing workspace issues regarding missing source folders :)

dvojtise · 2019-10-07T12:05:34Z

@ebousse I don't think the ECA test is based on PR comment, I think they are based on commit comments, this means that correctly fixing this would require to rewrite the git history and amend the commit comments

Note that when doing the squash: the default commit message proposed by the web UI is a concat of all commit messages (ie. with a lot of signed-of-by that need to be removed and make sure to keep only the last correct one) (editing the PR description has no impact on this)

ebousse · 2019-10-09T12:04:04Z

@dvojtise Yes I see, I thought that the PR message was used as the default commit message, but I mixed things up. You are right.

ebousse · 2019-10-09T12:07:47Z

@jdeantoni I am struggling to make the TFSM example work. I found three problems so far:

the name of the plugin org.eclipse.gemoc.example.moccml..tfsm has an extra dot (not a big deal)
the value oftoCCSLQVTOFilePath is not set in the plugin.xml file of org.eclipse.gemoc.example.moccml..tfsm, it needs to be /org.eclipse.gemoc.example.moccml.tfsm.dse/qvto-gen/modeling/TFSM.qvto
TFSM.ecl seems to have some problems: first the imports are still using org.gemoc and not org.eclipse.gemoc, second I have a compilatio error on line 28 (res is not recognized)

ebousse · 2019-10-10T08:11:49Z

Regarding SigPML, I managed to make a model execution work! (although without animation for some reason, probably unrelated to the DSL definition itself).

A few comments on things I have seen:

you can remove guava from the dependencies of org.eclipse.gemoc.example.moccmlsigpml.model,
you can probably avoid versionning org.eclipse.gemoc.example.moccmlsigpml.model/bin, and add it in the gitignore,
in examples/moccmlSigPML/language_workbench/org.eclipse.gemoc.example.moccmlsigpml.model/.project you can remove the project natures fr.obeo.dsl.viewpoint.nature.modelingproject and org.eclipse.emf.ecoretools.registration.ui.ecoreAutoRegisterNature which point to nothing in today's eclipse versions,
in examples/moccmlSigPML/modeling_workbench/org.eclipse.gemoc.example.moccmlsigpml.simple_example/.project you can remove the xtext nature I think, and replace it with org.eclipse.sirius.nature.modelingproject since SigPML is graphical.

ebousse · 2019-10-16T08:25:07Z

I made a few commits to your branch to remove all remaining *.class files from the repository, as it made the review of the diff of the PR not always easy to read. I think a lot of these were pushed a very long time ago by mistake.

bin and target are already in the root gitignore

ebousse · 2019-10-16T08:50:31Z

....eclipse.gemoc.example.moccml..tfsm/src/org/eclipse/gemoc/example/moccml/tfsm/Activator.java

@@ -0,0 +1,5 @@
+package org.eclipse.gemoc.example.moccml.tfsm;
+
+public class Activator {


Why an activator, if it remains empty?

ebousse · 2019-10-16T08:52:44Z

examples/moccmlTFSM/org.eclipse.gemoc.example.moccml.tfsm.design/pom.xml

+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.gemoc.sample.robotml</groupId>


Do we still need RobotML for the TFSM build? (I haven't checked but I wonder)

xtend-gen is present in the root .gitignore, so these files should not be there

ebousse · 2019-10-16T08:59:39Z

And I rapidly did the same cleanup for xtend-gen files. Sorry for making these changes unrelated to the original PR, but it helped me understand the actual changes better + to eliminate the possible cause of a bug.

As shown above, I tried using the "code review" tool of github, but the diff is very long and it slows down my firefox way too much, so I only went through a couple of files :)

dvojtise · 2019-11-05T13:43:01Z

should be handled by #19

ie.simialr structure as other examples + removed extra . in folder name Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

dvojtise · 2019-11-05T15:37:00Z

(I moved the tfsm sample to a structure similar to other examples ie. language_workbench subfolder (in order to have room for model examples) )

when I tried to open the projects I have an error on K3RuntimeDataHelper which apprently rely on a generated file org.eclipse.gemoc.example.moccml.tfsm/xdsml-java-gen/oncurrenttfsm/xdsml/api/impl/OncurrentTFSMRTDAccessor.java

but with my version of GEMOC it doesn't generate the expected methods (getcurrentState and getnumberOfTicks)

Did you forget to do a PR that contributes something to the generator ? (most probably in org.eclipse.gemoc.execution.concurrent.ccsljavaxdsml.ui/src/main/java/org/eclipse/gemoc/execution/concurrent/ccsljavaxdsml/ui/builder/GemocLanguageDesignerBuilder.java ? )

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

dvojtise · 2019-11-08T16:49:18Z

I think I've fixed TFSM which seem to work now

I've also done some minor corrections in SigPML

I've also fixed the example deployer plugin so it is now in the studio with both TFSM and SigPML

some bugs remains, but they aren't directly due to the examples but to other bugs (bug when doing a clean all, breakpoint management which ideally would require some refactoring, or the fact that the project have 2 natures (concurrent and sequential) cf #24 and eclipse-gemoc/gemoc-studio-modeldebugging#131 eclipse-gemoc/gemoc-studio-modeldebugging#132

jdeantoni added 6 commits September 23, 2019 09:40

add moccml tfsm to the official examples

7581afd

ignore bin...

7a40f28

ignore bin...

812a4ee

Signed-off-by: julien.deantoni@inria.fr

Merge branch 'fixOfficialSample' of

7b97b9d

https://github.com/eclipse/gemoc-studio-execution-moccml.git into fixOfficialSample

Merge branch 'fixOfficialSample' of

37c4be6

https://github.com/eclipse/gemoc-studio-execution-moccml.git into fixOfficialSample

Merge branch 'fixOfficialSample' of https://github.com/eclipse/gemoc-…

a4d18a4

…studio-execution-moccml.git into fixOfficialSample

jdeantoni requested review from dvojtise and ebousse October 7, 2019 09:12

jdeantoni and others added 6 commits October 15, 2019 20:09

fix according to Erwan's review

5c20bf8

Merge branch 'master' into fixOfficialSample

3f407ba

Remove bin folder from sigpml example

da91917

Remove all remaining bin folders from examples

bf45f4b

Remove all existing *.class files from the repository

f375542

Add *.class to gitignore

950ec8d

Remove redundant gitignore files

a50d6fe

bin and target are already in the root gitignore

ebousse reviewed Oct 16, 2019

View reviewed changes

Remove remaining xtend-gen folders from the repository

38fe470

xtend-gen is present in the root .gitignore, so these files should not be there

dvojtise closed this Nov 5, 2019

dvojtise reopened this Nov 5, 2019

move project to a language_workbench subfolder

3f4fb71

ie.simialr structure as other examples + removed extra . in folder name Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

dvojtise added 16 commits November 5, 2019 18:08

fix autoecoreregisternature to current gemoc

0e4b8dd

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

fix path to moccmllib and ecore in the ecl file

7be6eef

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

fix path to images

ba294b6

add basic pingpong example

cd72889

more fix in the odesign

9f89b8f

fix acceleo error message when running sigpml

b935068

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

align project name and folder name

01c1fab

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

align project name and folder name

7b02a11

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

add an aird and jpg

24ff4bf

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

use project name pattern similar to sigpml moc.dse moc.lib

605416d

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

improve model example

e7b4cf8

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

add example deployer to the studio product

9fdc836

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

fixing path to zip of sigpml example in deployer

7cb8a5d

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

add tfsm to the example deployer

33ad7c6

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

typo

f27b59f

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

typo

8f63d37

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

dvojtise merged commit 3477250 into master Nov 13, 2019

dvojtise deleted the fixOfficialSample branch November 14, 2019 10:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix official sample #21

Fix official sample #21

jdeantoni commented Oct 7, 2019

jdeantoni commented Oct 7, 2019

dvojtise commented Oct 7, 2019 •

edited

Loading

ebousse commented Oct 7, 2019

ebousse commented Oct 7, 2019 •

edited

Loading

dvojtise commented Oct 7, 2019

ebousse commented Oct 9, 2019

ebousse commented Oct 9, 2019

ebousse commented Oct 10, 2019

ebousse commented Oct 16, 2019

ebousse Oct 16, 2019

ebousse Oct 16, 2019

ebousse commented Oct 16, 2019

dvojtise commented Nov 5, 2019

dvojtise commented Nov 5, 2019

dvojtise commented Nov 8, 2019

		@@ -0,0 +1,5 @@
		package org.eclipse.gemoc.example.moccml.tfsm;

		public class Activator {

Fix official sample #21

Fix official sample #21

Conversation

jdeantoni commented Oct 7, 2019

jdeantoni commented Oct 7, 2019

dvojtise commented Oct 7, 2019 • edited Loading

ebousse commented Oct 7, 2019

ebousse commented Oct 7, 2019 • edited Loading

dvojtise commented Oct 7, 2019

ebousse commented Oct 9, 2019

ebousse commented Oct 9, 2019

ebousse commented Oct 10, 2019

ebousse commented Oct 16, 2019

ebousse Oct 16, 2019

Choose a reason for hiding this comment

ebousse Oct 16, 2019

Choose a reason for hiding this comment

ebousse commented Oct 16, 2019

dvojtise commented Nov 5, 2019

dvojtise commented Nov 5, 2019

dvojtise commented Nov 8, 2019

dvojtise commented Oct 7, 2019 •

edited

Loading

ebousse commented Oct 7, 2019 •

edited

Loading