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

Merge pull request #649 from eclipse/so_maven_clean_task

Browse source 
[wizard][maven] clean test-src-gen folders
This commit is contained in:
Stefan Oehme 2015-10-05 14:40:59 +02:00
commit 5c92b49d98
4 changed files with 56 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -471,27 +471,23 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets combine.children="append">
<fileset>
<directory>${basedir}/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
</fileset>
«FOR p : #[this, config.ideProject, config.uiProject, config.webProject]»
«IF p.enabled»
<fileset>
<directory>${basedir}/../«p.name»/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
</fileset>
«IF p instanceof TestedProjectDescriptor»
«IF p.testProject.enabled»
<fileset>
<directory>${basedir}/../«if(p.testProject.isInlined) p.name else p.testProject.name»/«Outlet.TEST_SRC_GEN.sourceFolder»/</directory>
</fileset>
«ENDIF»
«ENDIF»
«ENDIF»
«ENDFOR»
<fileset>
<directory>${basedir}/model/generated/</directory>
</fileset>
«IF config.ideProject.enabled»
<fileset>
<directory>${basedir}/../${project.artifactId}.ide/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
</fileset>
«ENDIF»
«IF config.uiProject.enabled»
<fileset>
<directory>${basedir}/../${project.artifactId}.ui/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
</fileset>
«ENDIF»
«IF config.webProject.enabled»
<fileset>
<directory>${basedir}/../${project.artifactId}.web/«Outlet.MAIN_SRC_GEN.sourceFolder»/</directory>
</fileset>
«ENDIF»
</filesets>
</configuration>
</plugin>

26
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

@ -62,20 +62,26 @@
<configuration>
<filesets combine.children="append">
<fileset>
<directory>${basedir}/src-gen/</directory>
<directory>${basedir}/../org.xtext.example.full/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.full.tests/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.full.ide/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.full.ui/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.full.ui.tests/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.full.web/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/model/generated/</directory>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.ide/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.ui/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.web/src-gen/</directory>
</fileset>
</filesets>
</configuration>
</plugin>

26
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

@ -62,20 +62,26 @@
<configuration>
<filesets combine.children="append">
<fileset>
<directory>${basedir}/src-gen/</directory>
<directory>${basedir}/../org.xtext.example.mavenTycho/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTycho.tests/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTycho.ide/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTycho.ui/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTycho.ui.tests/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.mavenTycho.web/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/model/generated/</directory>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.ide/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.ui/src-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.web/src-gen/</directory>
</fileset>
</filesets>
</configuration>
</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

@ -62,17 +62,20 @@
<configuration>
<filesets combine.children="append">
<fileset>
<directory>${basedir}/src/main/xtext-gen/</directory>
<directory>${basedir}/../org.xtext.example.plainMaven/src/main/xtext-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.plainMaven/src/test/xtext-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.plainMaven.ide/src/main/xtext-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../org.xtext.example.plainMaven.web/src/main/xtext-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/model/generated/</directory>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.ide/src/main/xtext-gen/</directory>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.web/src/main/xtext-gen/</directory>
</fileset>
</filesets>
</configuration>
</plugin>