Navigation Menu

Skip to content
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

Move dsl default location to project root and minor Melange related refactoring #76

Merged
merged 7 commits into from Dec 6, 2018

Conversation

dvojtise
Copy link
Contributor

@dvojtise dvojtise commented Dec 3, 2018

This PR changes the default location for .dsl files.

The wizards and Melange will now place them at the root of the project.

This contributes to fix #65

This PR also does some minor code cleanup by removing unnecessary dependencies to Melange

This PR comes with PR eclipse/gemoc-studio#124

move location where the dsl file is created when using new sequential
project wizard
contribute to
#65

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
do not use melange wizard as base for creating non melange projects

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
otherwise the scan of branch does not detect the change and does not
create a job if there is not branch on the main repo

the jenkins files must be identical

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
this contain additional support for
#65

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
@ebousse
Copy link
Contributor

ebousse commented Dec 3, 2018

Just curious: why does the PR have so many added lines (+669) for very few removed lines (−43)? Shouldn't it simply change existing code to adapt to the new path?

@dvojtise
Copy link
Contributor Author

dvojtise commented Dec 3, 2018

True, I forgot to mention 2 additional stuff I did commit when writing this PR:

  • reintroduce a Jenkins file at the root of this repo. It helps to trigger the build on jenkins even if there is no branch with the corresponding name in the repo gemoc-studio. However, this is still not perfect because this jenkinsfile must be copied in each repo.
  • refactored some code that was coming from Melange, I introduced a class AbstractNewProjectWizardWithTemplates that implements INewWizard in order to replace the use of NewMelangeProjectWizard. This goes in direction of removing unnecessary dependencies to Melange

@ebousse
Copy link
Contributor

ebousse commented Dec 3, 2018

Ah I see, I understand better then. Maybe then you should change the PR title, to have a cleaner squash and changelog afterwards?

@dvojtise dvojtise changed the title Move dsl default location to project root Move dsl default location to project root and minor melange related refactoring Dec 3, 2018
@dvojtise dvojtise changed the title Move dsl default location to project root and minor melange related refactoring Move dsl default location to project root and minor Melange related refactoring Dec 3, 2018
@ebousse
Copy link
Contributor

ebousse commented Dec 4, 2018

Also two tests appear to fail: https://ci.eclipse.org/gemoc/job/gemoc-studio/job/move_dsl_default_location_to_project_root/

With the same error: Unexpected marker: Cannot cast from EObjectAdapter to StateAdapter on /org.eclipse.gemoc.sample.legacyfsm.xfsm/src-gen/org/eclipse/gemoc/sample/legacyfsm/xfsm/adapters/xfsmmt/XfsmMTAdaptersFactory.java

Some problems in the Melange generated code. Could it be caused to your Melange-related changes? This would be strange since this seems to be caused by core Melange services.

@dvojtise
Copy link
Contributor Author

dvojtise commented Dec 4, 2018

Yes, I'm on it. I did not intend to accept a PR with failed tests 😉 (this is just a pain to have to switch between 2 branches when working on 2 PRs and try to validate them locally)

I'll try to get the Eclipse package and regenerate everything for the example and not just the runtime

@ebousse
Copy link
Contributor

ebousse commented Dec 4, 2018

OK great :) good luck with bug hunting!

may have an impact on eclipse/gemoc-studio#123

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
@dvojtise
Copy link
Contributor Author

dvojtise commented Dec 5, 2018

tests are now successful and ready for review, squash and merge 😄

@dvojtise dvojtise merged commit b1ab5a3 into master Dec 6, 2018
@dvojtise dvojtise deleted the move_dsl_default_location_to_project_root branch December 6, 2018 09:36
dvojtise added a commit to eclipse/gemoc-studio-execution-java that referenced this pull request Jan 14, 2020
…efactoring (eclipse/gemoc-studio-modeldebugging#76)

* change location of dsl file for new sequential project

move location where the dsl file is created when using new sequential project wizard
contribute to eclipse/gemoc-studio-modeldebugging#65

* some melange cleanup: do not use melange wizard as base for creating non melange projects. introduced a class AbstractNewProjectWizardWithTemplates that implements INewWizard in order to replace the use of NewMelangeProjectWizard

* reintroduce a jenkins file

otherwise the scan of branch does not detect the change and does not
create a job if there is not branch on the main repo. The jenkins files must be identical on all repos.


* bump melange to 2018-11-29

this contain additional support for
eclipse/gemoc-studio-modeldebugging#65

* make sure preferences settings declares java 1.8 ->may have an impact on eclipse/gemoc-studio#123

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DSL file in src folder leads to incorrect deployment
2 participants