-
Notifications
You must be signed in to change notification settings - Fork 317
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
Restore common types and Xbase generators #2882
Merged
Merged
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
64eb952
added generator as a source folder
LorenzoBettini ccebf73
emf.codegen.ecore dependency
LorenzoBettini 1ca6073
added MWE2 file
LorenzoBettini 6677060
added DirectoryCleaner
LorenzoBettini 55f05c5
renaming
LorenzoBettini be0778f
regenerated classes
LorenzoBettini f8b3fd3
removed old Java generator
LorenzoBettini 84d8d4a
restored GenerateXbase
LorenzoBettini 127bca3
regenerated classes
LorenzoBettini 54b9a1c
removed generator from src.excludes
LorenzoBettini 3abeb80
bin.excludes of generator folder in Xbase
LorenzoBettini 146b934
Revert "removed old Java generator"
LorenzoBettini a22ecf8
renamed Java generator
LorenzoBettini b825be4
removed MWE2 file
LorenzoBettini 7338790
bin.excludes of generator folder in Common Types
LorenzoBettini File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
20 changes: 20 additions & 0 deletions
20
org.eclipse.xtext.common.types/GenerateCommonTypes.mwe2.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType"> | ||
| <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> | ||
| <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/> | ||
| <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> | ||
| <listEntry value="/org.eclipse.xtext.common.types"/> | ||
| </listAttribute> | ||
| <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> | ||
| <listEntry value="4"/> | ||
| </listAttribute> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.xtext.common.types"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/xtext/common/types/GenerateCommonTypes.mwe2"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtext.common.types"/> | ||
| </launchConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 0 additions & 42 deletions
42
org.eclipse.xtext.common.types/generator/org/eclipse/xtext/common/types/GenerateEMF.java
This file was deleted.
Oops, something went wrong.
36 changes: 36 additions & 0 deletions
36
org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/GenerateCommonTypes.mwe2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2023 itemis AG (http://www.itemis.eu) and others. | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| *******************************************************************************/ | ||
| module org.eclipse.xtext.common.types.CommonTypesGenerator | ||
|
|
||
| import org.eclipse.emf.mwe.utils.StandaloneSetup | ||
| import org.eclipse.emf.mwe.utils.DirectoryCleaner | ||
| import org.eclipse.emf.mwe2.ecore.EcoreGenerator | ||
|
|
||
| var project = "org.eclipse.xtext.common.types" | ||
|
|
||
| /** | ||
| * @author Lorenzo Bettini - Initial contribution | ||
| */ | ||
| Workflow { | ||
| bean = StandaloneSetup { | ||
| // initialize the EMF singleton with proper classpath to platform:/resource mappings | ||
| platformUri = "." | ||
| } | ||
|
|
||
| component = DirectoryCleaner { | ||
| directory = "emf-gen" | ||
| } | ||
|
|
||
| component = EcoreGenerator { | ||
| // generate the Java code for the EPackage | ||
| genModel = "platform:/resource/${project}/model/JavaVMTypes.genmodel" | ||
| srcPath = "platform:/resource/${project}/src" | ||
| lineDelimiter = "\n" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
I'd prefer if we wouldn't ship this workflow file.
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.
Since MWE2 uses common.types, I'd prefer if we could regenerate without an MWE dependency. Otherwise changes to the types model would require MWE to run successfully before other changes to the types model can be applied.