From 0aaa081bc51dcc9bb29ab506edbf94a79d6dc9d1 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 25 Jan 2012 16:16:57 +0100 Subject: [PATCH] start groovyc with project encodings --- .../org/jetbrains/jps/incremental/groovy/GroovyBuilder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java index 31e857028f20..2bb3e3c411ab 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java @@ -1,8 +1,10 @@ package org.jetbrains.jps.incremental.groovy; +import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.SystemProperties; +import groovy.util.CharsetToolkit; import org.jetbrains.annotations.Nullable; import org.jetbrains.ether.dependencyView.Callbacks; import org.jetbrains.ether.dependencyView.Mappings; @@ -89,7 +91,8 @@ public class GroovyBuilder extends Builder { } Map class2Src = buildClassToSourceMap(chunk, context, toCompilePaths, moduleOutputPath); - String encoding = "UTF-8"; //todo encoding + String ideCharset = chunk.getProject().getProjectCharset(); + String encoding = !Comparing.equal(CharsetToolkit.getDefaultSystemCharset().name(), ideCharset) ? ideCharset : null; List patchers = Collections.emptyList(); //todo patchers GroovycOSProcessHandler.fillFileWithGroovycParameters( tempFile, FileUtil.toCanonicalPath(dir.getPath()), toCompilePaths, FileUtil.toSystemDependentName(moduleOutputPath), class2Src, encoding, patchers