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

[wizard] add generator dependencies for plain maven projects

Browse source 
IDE integration for plain maven is not aware of dependencies that are
only listed in the <plugin> section. So to make the projects usable, we
add the dependencies to the compile classpath. We mark them optional so
they don't get pulled at runtime.
This commit is contained in:
Stefan Oehme 2015-10-06 10:50:00 +02:00
parent 150e743f00
commit 1dbec35330
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ExternalDependency.xtend
View file

@ -58,6 +58,7 @@ class ExternalDependency {
version = parts.get(2)
}
Scope scope = Scope.COMPILE
boolean optional = false
}
@Accessors

3
plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend
View file

@ -56,6 +56,9 @@ class PomFile extends TextFile {
«IF dep.scope != Scope.COMPILE»
<scope>«dep.scope.mavenNotation»</scope>
«ENDIF»
«IF dep.optional»
<optional>true</optional>
«ENDIF»
</dependency>
«ENDFOR»
</dependencies>

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

@ -70,6 +70,10 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
deps += createBundleDependency("org.eclipse.emf.ecore.xcore")
}
}
if (!isEclipsePluginProject && config.needsMavenBuild) {
deps += createXtextDependency("org.eclipse.xtext.xtext") => [maven.optional = true]
deps += createXtextDependency("org.eclipse.xtext.xtext.generator") => [maven.optional = true]
}
deps
}
@ -454,11 +458,6 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
</dependencies>
</plugin>
<plugin>

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

@ -44,11 +44,6 @@
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
</dependencies>
</plugin>
<plugin>

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

@ -44,11 +44,6 @@
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
</dependencies>
</plugin>
<plugin>

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

@ -44,11 +44,6 @@
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
@ -208,5 +203,17 @@
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext</artifactId>
<version>${xtextVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
<version>${xtextVersion}</version>
<optional>true</optional>
</dependency>
</dependencies>
</project>