Skip to content

Commit 82eb0c7

Browse files
committed
handle config files
1 parent 61aafc1 commit 82eb0c7

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageCompilerForkTask.groovy

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.grails.web.pages
1717

1818
import org.codehaus.groovy.control.CompilerConfiguration
19+
import org.grails.config.CodeGenConfig
1920
import org.grails.gsp.compiler.GroovyPageCompiler
2021
import groovy.io.FileType
2122
import org.codehaus.groovy.control.CompilationUnit
@@ -47,6 +48,7 @@ public class GroovyPageCompilerForkTask {
4748
String serverpath
4849
String encoding
4950
String targetCompatibility
51+
String[] configs
5052

5153
GroovyPageCompilerForkTask(File sourceDir, File destDir, File tmpdir) {
5254
this.tmpdir = tmpdir
@@ -58,6 +60,13 @@ public class GroovyPageCompilerForkTask {
5860
GroovyPageCompiler createPageCompiler() {
5961
GroovyPageCompiler compiler = new GroovyPageCompiler()
6062
CompilerConfiguration config = new CompilerConfiguration()
63+
64+
65+
if(configs) {
66+
String configPaths = configs.collect{new File(it)}.findAll{it.exists()}?.collect{it.canonicalPath}.toArray()
67+
compiler.setConfigs(configPaths)
68+
}
69+
6170
if (classpath) {
6271
config.classpath = classpath.toString()
6372
}
@@ -114,12 +123,16 @@ Usage: java -cp CLASSPATH GroovyPageCompilerForkTask [srcDir] [destDir] [tmpDir]
114123
String targetCompatibility = args[3]
115124
String packageName = args[4].trim()
116125
String serverpath = args[5]
126+
String[] configFiles = args[6].tokenize(',')
117127
File configFile = new File(args[6])
118128
String encoding = args[7] ?: 'UTF-8'
119129

120130

121-
// configuration.readConfiguration(configFile)
131+
122132
GroovyPageCompilerForkTask compiler = new GroovyPageCompilerForkTask(srcDir,destinationDir,tmpDir)
133+
if(configFiles) {
134+
compiler.configs = configFiles
135+
}
123136
if(packageName) {
124137
compiler.packageName = packageName
125138
}

0 commit comments

Comments
 (0)