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

[generator2][wizard] only depend on new generator in new projects

Browse source
This commit is contained in:
Stefan Oehme 2015-10-22 11:33:08 +02:00
parent 8aa96eeb3a
commit 75e304e304
11 changed files with 81 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
plugins/org.eclipse.xtext.xtext.generator/pom.xml
View file

@ -13,6 +13,11 @@
<name>Xtext Generator 2</name>
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext</artifactId>
<version>[${project.version}]</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.ecore</artifactId>
@ -33,15 +38,71 @@
<artifactId>org.eclipse.emf.codegen.ecore</artifactId>
<version>${emf.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-antlr-generator</artifactId>
<version>${antlr-generator-version}</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>${icu4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.lib</artifactId>
<version>${mwe2-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.common.types</artifactId>
<version>[${project.version}]</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe.utils</artifactId>
<version>${mwe-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.runtime</artifactId>
<version>${mwe2-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.language</artifactId>
<version>${mwe2-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>${mwe2-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe.core</artifactId>
<version>${mwe-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-antlr-generator</artifactId>
<version>${antlr-generator-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>[3.6.0,)</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

7
plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
View file

@ -81,7 +81,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
newLinkedHashSet(
"org.eclipse.xtext.xbase",
"org.eclipse.xtext.common.types",
"org.eclipse.xtext.generator",
"org.eclipse.xtext.xtext.generator",
"org.eclipse.emf.codegen.ecore",
"org.eclipse.emf.mwe.utils",
@ -249,7 +248,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
}
dependencies {
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext:${xtextVersion}"
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
}
@ -321,11 +319,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
</configuration>
«IF config.needsTychoBuild»
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>

6
plugins/org.eclipse.xtext/.settings/.api_filters
View file

@ -411,6 +411,12 @@
<message_argument value="bindIQualifiedNameConverter()"/>
</message_arguments>
</filter>
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.xtext.XtextRuntimeModule"/>
<message_argument value="bindIXtext2EcorePostProcessor()"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/xtext/formatting/impl/MatcherNFAProvider.java" type="org.eclipse.xtext.formatting.impl.MatcherNFAProvider">
<filter id="576720909">

11
plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeModule.java
View file

@ -106,8 +106,15 @@ public class XtextRuntimeModule extends AbstractXtextRuntimeModule {
return XtextValueConverters.class;
}
public Class<? extends IXtext2EcorePostProcessor> bindIXtext2EcorePostProcessor() {
return XtendXtext2EcorePostProcessor.class;
/**
* @since 2.9
*/
public void configureIXtext2EcorePostProcessor(Binder binder) {
try {
Class.forName("org.eclipse.xtend.expression.ExecutionContext");
binder.bind(IXtext2EcorePostProcessor.class).to(XtendXtext2EcorePostProcessor.class);
} catch (ClassNotFoundException e) {
}
}
@Override

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

@ -6,7 +6,6 @@ bin.includes = .,\
plugin.xml
additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.xtext.common.types,\
org.eclipse.xtext.generator,\
org.eclipse.xtext.xtext.generator,\
org.eclipse.emf.codegen.ecore,\
org.eclipse.emf.mwe.utils,\

1
tests/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

@ -9,7 +9,6 @@ configurations {
}
dependencies {
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext:${xtextVersion}"
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
}

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

@ -6,7 +6,6 @@ bin.includes = .,\
plugin.xml
additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.xtext.common.types,\
org.eclipse.xtext.generator,\
org.eclipse.xtext.xtext.generator,\
org.eclipse.emf.codegen.ecore,\
org.eclipse.emf.mwe.utils,\

5
tests/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

@ -34,11 +34,6 @@
<includePluginDependencies>true</includePluginDependencies>
</configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>

1
tests/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

@ -11,7 +11,6 @@ configurations {
}
dependencies {
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext:${xtextVersion}"
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
}

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

@ -6,7 +6,6 @@ bin.includes = .,\
plugin.xml
additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.xtext.common.types,\
org.eclipse.xtext.generator,\
org.eclipse.xtext.xtext.generator,\
org.eclipse.emf.codegen.ecore,\
org.eclipse.emf.mwe.utils,\

5
tests/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

@ -34,11 +34,6 @@
<includePluginDependencies>true</includePluginDependencies>
</configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>