tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject [38/50] git commit: Ensure that "build" is NOT an excluded folder for tapestry-core
Date Sun, 16 Dec 2012 01:17:33 GMT
Ensure that "build" is NOT an excluded folder for tapestry-core


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8fcbbcb6
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8fcbbcb6
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8fcbbcb6

Branch: refs/heads/master
Commit: 8fcbbcb626138184916a753d9a543a0e57b943ca
Parents: c438550
Author: Howard M. Lewis Ship <hlship@apache.org>
Authored: Tue Dec 4 17:25:47 2012 -0800
Committer: Howard M. Lewis Ship <hlship@apache.org>
Committed: Tue Dec 4 17:25:47 2012 -0800

----------------------------------------------------------------------
 tapestry-core/build.gradle |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8fcbbcb6/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index 166d825..70baeb0 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -1,8 +1,9 @@
 import org.apache.tools.ant.filters.*
+import org.gradle.plugins.ide.idea.model.*
 
 description = "Central module for Tapestry, containing all core services and components"
 
-project.ext { 
+project.ext {
   antlrSource = "src/main/antlr"
   generatedDir = "$buildDir/generated-sources"
   antlrOutput = "$generatedDir/antlr"
@@ -55,7 +56,7 @@ task generateGrammarSource(type: JavaExec) {
   }
 }
 
-task compileCoffeeScript(type: CompileCoffeeScript) { 
+task compileCoffeeScript(type: CompileCoffeeScript) {
   outputDir "${generatedDir}/compiled-coffeescript"
 }
 
@@ -64,7 +65,7 @@ task compileTestCoffeeScript(type: CompileCoffeeScript) {
     outputDir "${generatedDir}/compiled-test-coffeescript"
 }
 
-processResources { 
+processResources {
   from compileCoffeeScript
 }
 
@@ -73,16 +74,20 @@ processTestResources {
   from compileTestCoffeeScript
 }
 
-idea.module { 
-  // dependsOn generateGrammarSource
-
-  sourceDirs += compileCoffeeScript.srcDir 
+idea.module {
+  sourceDirs += compileCoffeeScript.srcDir
   sourceDirs += compileCoffeeScript.outputDir
 
   testSourceDirs += compileTestCoffeeScript.srcDir
   testSourceDirs += compileTestCoffeeScript.outputDir
 
-  excludeDirs.clear()
+  // 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 {


Mime
View raw message