-
Notifications
You must be signed in to change notification settings - Fork 8
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
Fix official sample #21
Conversation
well... So I updated it in the gemoc git folder with the correct identity. @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.... |
the squash and commit is one of the possible actions when accepting a pull request:
We use squash for most of the GEMOC PR as it creates a cleaner history |
@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? |
EDIT: I removed this comment, I solved the error by fixing workspace issues regarding missing source folders :) |
@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) |
@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. |
@jdeantoni I am struggling to make the TFSM example work. I found three problems so far:
|
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:
|
I made a few commits to your branch to remove all remaining |
bin and target are already in the root gitignore
@@ -0,0 +1,5 @@ | |||
package org.eclipse.gemoc.example.moccml.tfsm; | |||
|
|||
public class Activator { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why an activator, if it remains empty?
<modelVersion>4.0.0</modelVersion> | ||
|
||
<parent> | ||
<groupId>org.gemoc.sample.robotml</groupId> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
And I rapidly did the same cleanup for 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 :) |
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>
(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>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
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 |
second attempt :)
this is an alignment of "official" concurrent example with the last gemoc release