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 2012/12/16 02:17:32 UTC
[9/50] git commit: Refactor coffeescript.gradle into code under
buildSrc, for reuse across modules
Refactor coffeescript.gradle into code under buildSrc, for reuse across modules
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/4a043f35
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/4a043f35
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/4a043f35
Branch: refs/heads/master
Commit: 4a043f350d1192e56dcbaf813c50da28fa68282f
Parents: 3864197
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Dec 14 11:21:40 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Dec 14 11:21:40 2012 -0800
----------------------------------------------------------------------
build.gradle | 1 -
buildSrc/build.gradle | 11 ++
.../main/groovy/t5build/CompileCoffeeScript.groovy | 67 ++++++++++++++
tapestry-core/build.gradle | 3 +-
tapestry-core/coffeescript.gradle | 72 ---------------
5 files changed, 79 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a043f35/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 61c576e..0a474ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,6 @@ project.ext.versions = [
servletapi: "2.5",
spock: "0.7-groovy-2.0",
hibernate: "4.1.2.Final",
- wro4j: "1.5.0",
groovy: "2.0.5"
]
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a043f35/buildSrc/build.gradle
----------------------------------------------------------------------
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 0000000..c02932c
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,11 @@
+apply plugin: "groovy"
+
+repositories {
+ mavenCentral()
+}
+
+
+dependencies {
+ compile "ro.isdc.wro4j:wro4j-extensions:1.5.0"
+ gradleApi()
+}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a043f35/buildSrc/src/main/groovy/t5build/CompileCoffeeScript.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/t5build/CompileCoffeeScript.groovy b/buildSrc/src/main/groovy/t5build/CompileCoffeeScript.groovy
new file mode 100644
index 0000000..628437a
--- /dev/null
+++ b/buildSrc/src/main/groovy/t5build/CompileCoffeeScript.groovy
@@ -0,0 +1,67 @@
+package t5build
+
+import ro.isdc.wro.model.resource.*
+import ro.isdc.wro.extensions.processor.js.*
+import ro.isdc.wro.extensions.processor.support.coffeescript.*
+import org.gradle.api.*
+import org.gradle.api.tasks.*
+
+class CustomizedProcessor extends CoffeeScriptProcessor {
+
+ protected CoffeeScript newCoffeeScript() {
+ CoffeeScript engine = new CoffeeScript()
+ engine.options = ["bare"]
+ return engine
+ }
+}
+
+class CompileCoffeeScript extends DefaultTask {
+
+ {
+ description = "Compiles CoffeeScript sources into JavaScript"
+ group = "build"
+ }
+
+ def srcDir = "src/main/coffeescript"
+
+ def outputDir = "${project.buildDir}/compiled-coffeescript"
+
+ @InputDirectory
+ File getSrcDir() { project.file(srcDir) }
+
+ @OutputDirectory
+ File getOutputDir() { project.file(outputDir) }
+
+ @TaskAction
+ void doCompile() {
+ logger.info "Compiling CoffeeScript sources from $srcDir into $outputDir"
+
+ def outputDirFile = getOutputDir()
+ // Recursively delete output directory if it exists
+ outputDirFile.deleteDir()
+
+ def tree = project.fileTree srcDir, {
+ include '**/*.coffee'
+ }
+
+ def processor = new CustomizedProcessor()
+
+ tree.visit { visit ->
+ if (visit.directory) return
+
+ def inputFile = visit.file
+ def inputPath = visit.path
+ def outputPath = inputPath.replaceAll(/\.coffee$/, '.js')
+ def outputFile = new File(outputDirFile, outputPath)
+
+ logger.info "Compiling ${inputPath}"
+
+ outputFile.parentFile.mkdirs()
+
+ def resource = Resource.create(inputFile.absolutePath, ResourceType.JS)
+
+ processor.process(resource, inputFile.newReader(), outputFile.newWriter())
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a043f35/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index ba4233b..30e9c61 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -1,5 +1,6 @@
import org.apache.tools.ant.filters.*
import org.gradle.plugins.ide.idea.model.*
+import t5build.*
description = "Central module for Tapestry, containing all core services and components"
@@ -9,8 +10,6 @@ project.ext {
antlrOutput = "$generatedDir/antlr"
}
-apply from: "coffeescript.gradle"
-
configurations {
antlr3
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a043f35/tapestry-core/coffeescript.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/coffeescript.gradle b/tapestry-core/coffeescript.gradle
deleted file mode 100644
index 62fb812..0000000
--- a/tapestry-core/coffeescript.gradle
+++ /dev/null
@@ -1,72 +0,0 @@
-import ro.isdc.wro.model.resource.*
-import ro.isdc.wro.extensions.processor.js.*
-import ro.isdc.wro.extensions.processor.support.coffeescript.*
-
-buildscript {
- repositories { mavenCentral() }
- dependencies {
- classpath "ro.isdc.wro4j:wro4j-extensions:${versions.wro4j}"
- }
-}
-
-class CustomizedProcessor extends CoffeeScriptProcessor {
-
- protected CoffeeScript newCoffeeScript() {
- CoffeeScript engine = new CoffeeScript()
- engine.options = ["bare"]
- return engine
- }
-}
-
-class CompileCoffeeScript extends DefaultTask {
-
- {
- description = "Compiles CoffeeScript sources into JavaScript"
- group = "build"
- }
-
- def srcDir = "src/main/coffeescript"
-
- def outputDir = "${project.buildDir}/compiled-coffeescript"
-
- @InputDirectory
- File getSrcDir() { project.file(srcDir) }
-
- @OutputDirectory
- File getOutputDir() { project.file(outputDir) }
-
- @TaskAction
- void doCompile() {
- logger.info "Compiling CoffeeScript sources from $srcDir into $outputDir"
-
- def outputDirFile = getOutputDir()
- // Recursively delete output directory if it exists
- outputDirFile.deleteDir()
-
- def tree = project.fileTree srcDir, {
- include '**/*.coffee'
- }
-
- def processor = new CustomizedProcessor()
-
- tree.visit { visit ->
- if (visit.directory) return
-
- def inputFile = visit.file
- def inputPath = visit.path
- def outputPath = inputPath.replaceAll(/\.coffee$/, '.js')
- def outputFile = new File(outputDirFile, outputPath)
-
- logger.info "Compiling ${inputPath}"
-
- outputFile.parentFile.mkdirs()
-
- def resource = Resource.create(inputFile.absolutePath, ResourceType.JS)
-
- processor.process(resource, inputFile.newReader(), outputFile.newWriter())
- }
- }
-
-}
-
-project.ext.CompileCoffeeScript = CompileCoffeeScript