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.

Sign up for GitHub

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

Jump to bottom

Restore common types and Xbase generators #2882

Merged
merged 15 commits into from
Dec 31, 2023
Merged

Restore common types and Xbase generators #2882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
64eb952
added generator as a source folder
LorenzoBettini Dec 21, 2023
ccebf73
emf.codegen.ecore dependency
LorenzoBettini Dec 21, 2023
1ca6073
added MWE2 file
LorenzoBettini Dec 21, 2023
6677060
added DirectoryCleaner
LorenzoBettini Dec 21, 2023
55f05c5
renaming
LorenzoBettini Dec 21, 2023
be0778f
regenerated classes
LorenzoBettini Dec 21, 2023
f8b3fd3
removed old Java generator
LorenzoBettini Dec 21, 2023
84d8d4a
restored GenerateXbase
LorenzoBettini Dec 21, 2023
127bca3
regenerated classes
LorenzoBettini Dec 21, 2023
54b9a1c
removed generator from src.excludes
LorenzoBettini Dec 21, 2023
3abeb80
bin.excludes of generator folder in Xbase
LorenzoBettini Dec 30, 2023
146b934
Revert "removed old Java generator"
LorenzoBettini Dec 30, 2023
a22ecf8
renamed Java generator
LorenzoBettini Dec 30, 2023
b825be4
removed MWE2 file
LorenzoBettini Dec 30, 2023
7338790
bin.excludes of generator folder in Common Types
LorenzoBettini Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions org.eclipse.xtext.common.types/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="emf-gen"/>
<classpathentry kind="src" path="deprecated"/>
<classpathentry kind="src" path="generator"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
20 changes: 20 additions & 0 deletions org.eclipse.xtext.common.types/GenerateCommonTypes.launch
View file
Open in desktop
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.jdt.launching.localJavaApplication">
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.xtext.common.types/generator/org/eclipse/xtext/common/types/GenerateCommonTypes.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</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"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.xtext.common.types.GenerateCommonTypes"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.xtext.common.types"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtext.common.types"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
5 changes: 4 additions & 1 deletion org.eclipse.xtext.common.types/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@ bin.includes = META-INF/,\
about.html
src.includes = model/,\
about.html
additional.bundles = org.eclipse.emf.mwe2.lib,\
org.eclipse.emf.codegen.ecore,\
org.eclipse.emf.mwe2.launch
src.excludes = generator/
additional.bundles = org.eclipse.emf.mwe2.lib
bin.excludes = generator/
1 change: 0 additions & 1 deletion ...ipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/impl/TypesPackageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,6 @@ private TypesPackageImpl()
{
super(eNS_URI, TypesFactory.eINSTANCE);
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Expand Down
2 changes: 1 addition & 1 deletion ...lipse/xtext/common/types/GenerateEMF.java → ...ext/common/types/GenerateCommonTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/**
* @author Sven Efftinge - Initial contribution and API
*/
public class GenerateEMF {
public class GenerateCommonTypes {
/**
* Can't use MWE2 because of circular dependencies
*/
Expand Down
1 change: 1 addition & 0 deletions org.eclipse.xtext.xbase/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
<classpathentry kind="src" path="emf-gen"/>
<classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="src" path="deprecated"/>
<classpathentry kind="src" path="generator"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
1 change: 1 addition & 0 deletions org.eclipse.xtext.xbase/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ additional.bundles = org.eclipse.xtext.xtext.generator,\
org.eclipse.emf.codegen.ecore,\
org.eclipse.emf.mwe2.lib
src.excludes = generator/
bin.excludes = generator/
1 change: 0 additions & 1 deletion ...mf-gen/org/eclipse/xtext/xbase/annotations/xAnnotations/impl/XAnnotationsPackageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ private XAnnotationsPackageImpl()
{
super(eNS_URI, XAnnotationsFactory.eINSTANCE);
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.xbase/emf-gen/org/eclipse/xtext/xbase/impl/XbasePackageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ private XbasePackageImpl()
{
super(eNS_URI, XbaseFactory.eINSTANCE);
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.xbase/emf-gen/org/eclipse/xtext/xtype/impl/XtypePackageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ private XtypePackageImpl()
{
super(eNS_URI, XtypeFactory.eINSTANCE);
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static void main(String[] args) {
final String root = "..";
szarnekow marked this conversation as resolved.
Show resolved Hide resolved
final String projectName = "org.eclipse.xtext.xbase";
final String runtimeProject = root + "/" + projectName;
final String uiProject = System.getProperty("uiProject", root + "/../xtext-eclipse/" + projectName + ".ui");
final String uiProject = System.getProperty("uiProject", root + "/../" + projectName + ".ui");
final boolean backtrack = false;
final boolean memoize = false;
final String lineDelimiter = "\n";
Expand Down
Loading