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

Merge pull request #235 from eclipse/lb-bug_479196

Browse source 
479196: AntlrToolFacade always downloads antlr-generator in Maven build
This commit is contained in:
Lorenzo Bettini 2017-01-11 18:41:25 +01:00 committed by GitHub
commit aabb3c134e
9 changed files with 60 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.gradle vendored
View file

@ -12,6 +12,7 @@ dependencies {
mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.0.201605261059"
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:[2.1.1, 3)"
}
task generateXtextLanguage(type: JavaExec) {

5
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/pom.xml vendored
View file

@ -56,6 +56,11 @@
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-antlr-generator</artifactId>
<version>[2.1.1, 3)</version>
</dependency>
</dependencies>
</plugin>
<plugin>

1
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle/build.gradle vendored
View file

@ -15,6 +15,7 @@ dependencies {
mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.0.201605261059"
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:[2.1.1, 3)"
}
task generateXtextLanguage(type: JavaExec) {

5
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/pom.xml vendored
View file

@ -56,6 +56,11 @@
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-antlr-generator</artifactId>
<version>[2.1.1, 3)</version>
</dependency>
</dependencies>
</plugin>
<plugin>

5
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/pom.xml vendored
View file

@ -56,6 +56,11 @@
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-antlr-generator</artifactId>
<version>[2.1.1, 3)</version>
</dependency>
</dependencies>
</plugin>
<plugin>

4
org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.xtend
View file

@ -30,6 +30,10 @@ class XtextVersion {
'2.9.0.201605261059'
}
def getAntlrGeneratorVersion() {
'[2.1.1, 3)'
}
def getXtendGradlePluginVersion() {
xtextGradlePluginVersion
}

4
org.eclipse.xtext.util/xtend-gen/org/eclipse/xtext/util/XtextVersion.java
View file

@ -53,6 +53,10 @@ public class XtextVersion {
return "2.9.0.201605261059";
}
public String getAntlrGeneratorVersion() {
return "[2.1.1, 3)";
}
public String getXtendGradlePluginVersion() {
return this.getXtextGradlePluginVersion();
}

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

@ -284,6 +284,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:«config.xtextVersion.mweVersion»"
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:«config.xtextVersion.antlrGeneratorVersion»"
«IF fromExistingEcoreModels»
mwe2 "org.eclipse.xtext:org.eclipse.xtext.generator:${xtextVersion}"
mwe2 "org.eclipse.xpand:org.eclipse.xpand:2.0.0"
@ -375,6 +376,11 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-antlr-generator</artifactId>
<version>«config.xtextVersion.antlrGeneratorVersion»</version>
</dependency>
</dependencies>
«ENDIF»
</plugin>

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

@ -596,6 +596,12 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
_builder.append("\t");
_builder.append("mwe2 \"org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}\"");
_builder.newLine();
_builder.append("\t");
_builder.append("mwe2 \"org.eclipse.xtext:xtext-antlr-generator:");
String _antlrGeneratorVersion = this.getConfig().getXtextVersion().getAntlrGeneratorVersion();
_builder.append(_antlrGeneratorVersion, "\t");
_builder.append("\"");
_builder.newLineIfNotEmpty();
{
boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels();
if (_isFromExistingEcoreModels) {
@ -915,6 +921,29 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
_builder.append("</dependency>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("<dependency>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t");
_builder.append("<groupId>org.eclipse.xtext</groupId>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t");
_builder.append("<artifactId>xtext-antlr-generator</artifactId>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t");
_builder.append("<version>");
String _antlrGeneratorVersion = this.getConfig().getXtextVersion().getAntlrGeneratorVersion();
_builder.append(_antlrGeneratorVersion, "\t\t\t\t\t");
_builder.append("</version>");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("</dependency>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("</dependencies>");
_builder.newLine();
}