You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/06/18 03:30:48 UTC
[2/4] git commit: Move the compiled test CoffeeScript under
src/test/generated
Move the compiled test CoffeeScript under src/test/generated
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8f1865f6
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8f1865f6
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8f1865f6
Branch: refs/heads/master
Commit: 8f1865f625eee3d2f8766dd098ba641373cae84e
Parents: d5e7469
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 17 17:38:08 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 17 17:40:19 2013 -0700
----------------------------------------------------------------------
tapestry-core/.gitignore | 1 +
tapestry-core/build.gradle | 11 ++++++-----
tapestry-core/compile-test-coffeescript | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8f1865f6/tapestry-core/.gitignore
----------------------------------------------------------------------
diff --git a/tapestry-core/.gitignore b/tapestry-core/.gitignore
index b5e996d..f739972 100644
--- a/tapestry-core/.gitignore
+++ b/tapestry-core/.gitignore
@@ -1,3 +1,4 @@
docs
/.externalToolBuilders
src/main/generated
+src/test/generated
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8f1865f6/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index a26c55f..d24d50f 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -6,8 +6,9 @@ description = "Central module for Tapestry, containing all core services and com
project.ext {
antlrSource = "src/main/antlr"
- generatedDir = "src/main/generated"
- antlrOutput = "$generatedDir/antlr"
+ mainGeneratedDir = "src/main/generated"
+ testGeneratedDir = "src/test/generated"
+ antlrOutput = "$mainGeneratedDir/antlr"
}
configurations {
@@ -53,12 +54,12 @@ task generateGrammarSource(type: JavaExec) {
}
task compileCoffeeScript(type: CompileCoffeeScript) {
- outputDir "${generatedDir}/compiled-coffeescript"
+ outputDir "${mainGeneratedDir}/compiled-coffeescript"
}
task compileTestCoffeeScript(type: CompileCoffeeScript) {
srcDir "src/test/coffeescript"
- outputDir "${generatedDir}/compiled-test-coffeescript"
+ outputDir "${testGeneratedDir}/compiled-coffeescript"
}
@@ -72,7 +73,7 @@ sourceSets {
}
}
-clean.delete generatedDir
+clean.delete mainGeneratedDir, testGeneratedDir
compileJava {
dependsOn generateGrammarSource
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8f1865f6/tapestry-core/compile-test-coffeescript
----------------------------------------------------------------------
diff --git a/tapestry-core/compile-test-coffeescript b/tapestry-core/compile-test-coffeescript
index 9f6a290..c313926 100755
--- a/tapestry-core/compile-test-coffeescript
+++ b/tapestry-core/compile-test-coffeescript
@@ -6,6 +6,6 @@
# Doe NOT compile the test scripts.
inputDir=src/test/coffeescript
-outputDir=src/main/generated/compiled-test-coffeescript
+outputDir=src/test/generated/compiled-coffeescript
coffee --watch --bare --output $outputDir $inputDir
\ No newline at end of file