sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[#1384] removed xpand/generator(1) dependency from wizard for existing ecore models

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2020-02-14 09:51:24 +01:00
parent d2c2a544a2
commit 543d37bed1
8 changed files with 0 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.ide/pom.xml vendored
View file

@ -89,8 +89,6 @@
org.eclipse.jdt.debug,
org.eclipse.jdt.launching,
org.eclipse.text,
org.eclipse.xtend.typesystem.emf,
org.eclipse.xtend,
</excludeArtifactIds>
</configuration>
</execution>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml vendored
View file

@ -89,8 +89,6 @@
org.eclipse.jdt.debug,
org.eclipse.jdt.launching,
org.eclipse.text,
org.eclipse.xtend.typesystem.emf,
org.eclipse.xtend,
</excludeArtifactIds>
</configuration>
</execution>

2
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend
View file

@ -173,8 +173,6 @@ class IdeProjectDescriptor extends ProjectDescriptor {
org.eclipse.jdt.debug,
org.eclipse.jdt.launching,
org.eclipse.text,
org.eclipse.xtend.typesystem.emf,
org.eclipse.xtend,
</excludeArtifactIds>
</configuration>
</execution>

6
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
View file

@ -122,7 +122,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
if (config.ecore2Xtext.EPackageInfos.exists[genmodelURI.fileExtension == "xcore"]) {
result.add("org.eclipse.emf.ecore.xcore")
}
result.add('org.eclipse.xtext.generator')
}
return result
}
@ -296,11 +295,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
mwe2 'org.eclipse.xtext:xtext-antlr-generator'
«IF fromExistingEcoreModels»
mwe2 "org.eclipse.xtext:org.eclipse.xtext.generator:${xtextVersion}"
mwe2 "org.eclipse.xpand:org.eclipse.xpand:2.0.0"
mwe2 "org.eclipse.xpand:org.eclipse.xtend:2.0.0"
«ENDIF»
}
task generateXtextLanguage(type: JavaExec) {

5
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file

@ -60,11 +60,6 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
«IF isFromExistingEcoreModels»
<unit id="org.eclipse.xpand" version="0.0.0"/>
<unit id="org.eclipse.xtend" version="0.0.0"/>
<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
«ENDIF»
<repository location="https://download.eclipse.org/releases/2020-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

8
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java
View file

@ -550,14 +550,6 @@ public class IdeProjectDescriptor extends ProjectDescriptor {
_builder.append("org.eclipse.text,");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("org.eclipse.xtend.typesystem.emf,");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t\t\t\t\t");
_builder.append("org.eclipse.xtend,");
_builder.newLine();
_builder.append("\t\t");
_builder.append("\t\t\t\t");
_builder.append("</excludeArtifactIds>");
_builder.newLine();

15
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
View file

@ -193,7 +193,6 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
if (_exists) {
result.add("org.eclipse.emf.ecore.xcore");
}
result.add("org.eclipse.xtext.generator");
}
return result;
}
@ -626,20 +625,6 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
_builder.append("\t");
_builder.append("mwe2 \'org.eclipse.xtext:xtext-antlr-generator\'");
_builder.newLine();
{
boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels();
if (_isFromExistingEcoreModels) {
_builder.append("\t");
_builder.append("mwe2 \"org.eclipse.xtext:org.eclipse.xtext.generator:${xtextVersion}\"");
_builder.newLine();
_builder.append("\t");
_builder.append("mwe2 \"org.eclipse.xpand:org.eclipse.xpand:2.0.0\"");
_builder.newLine();
_builder.append("\t");
_builder.append("mwe2 \"org.eclipse.xpand:org.eclipse.xtend:2.0.0\"");
_builder.newLine();
}
}
_builder.append("}");
_builder.newLine();
_builder.newLine();

14
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file

@ -115,20 +115,6 @@ public class TargetPlatformProject extends ProjectDescriptor {
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.eclipse.emf.sdk.feature.group\" version=\"0.0.0\"/>");
_builder.newLine();
{
boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels();
if (_isFromExistingEcoreModels) {
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.eclipse.xpand\" version=\"0.0.0\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.eclipse.xtend\" version=\"0.0.0\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.eclipse.xtend.typesystem.emf\" version=\"0.0.0\"/>");
_builder.newLine();
}
}
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2020-03\"/>");
_builder.newLine();