Put generated source files under src/main/generated (rather than under build) This makes the Gradle build work better with IDEA
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5fc74d5f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5fc74d5f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5fc74d5f Branch: refs/heads/master Commit: 5fc74d5fc9baabbfb27557b50502388eee9b9831 Parents: 233ff42 Author: Howard M. Lewis Ship <[email protected]> Authored: Sat Apr 20 15:01:43 2013 -0400 Committer: Howard M. Lewis Ship <[email protected]> Committed: Sat Apr 20 15:01:43 2013 -0400 ---------------------------------------------------------------------- tapestry-core/.gitignore | 1 + tapestry-core/build.gradle | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5fc74d5f/tapestry-core/.gitignore ---------------------------------------------------------------------- diff --git a/tapestry-core/.gitignore b/tapestry-core/.gitignore index 21deb58..b5e996d 100644 --- a/tapestry-core/.gitignore +++ b/tapestry-core/.gitignore @@ -1,2 +1,3 @@ docs /.externalToolBuilders +src/main/generated http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5fc74d5f/tapestry-core/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle index 41eb406..b922575 100644 --- a/tapestry-core/build.gradle +++ b/tapestry-core/build.gradle @@ -6,7 +6,7 @@ description = "Central module for Tapestry, containing all core services and com project.ext { antlrSource = "src/main/antlr" - generatedDir = "$buildDir/generated-sources" + generatedDir = "src/main/generated" antlrOutput = "$generatedDir/antlr" } @@ -76,12 +76,6 @@ idea.module { sourceDirs += compileCoffeeScript.srcDir testSourceDirs += compileTestCoffeeScript.srcDir - -// Hack the IML so that "build" is not excluded; necessary because several directories under build -// are added as source, resources, or test folders. - iml.whenMerged { module -> - module.excludeFolders.removeAll { it.canonicalUrl.endsWith "/build" } - } } compileJava {
