From cbf8af2e88c7bfb7631e91570a0970000facee09 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 18 Aug 2014 19:21:42 +0400 Subject: [PATCH] Made compiler report source to output mapping when invoked from JPS. --- jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 ++ .../test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 3f58e1efa08..3de567053f6 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -140,6 +140,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { JpsProject project = representativeTarget.getModule().getProject(); CommonCompilerArguments commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project); + commonArguments.verbose = true; // Make compiler report source to output files mapping + CompilerSettings compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project); final Set allCompiledFiles = getAllCompiledFilesContainer(context); diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 2f108a570d5..9a96e7ca41e 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -71,9 +71,6 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private void initProject() { addJdk(JDK_NAME); loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr"); - CompilerSettings settings = new CompilerSettings(); - settings.setAdditionalArguments(settings.getAdditionalArguments() + " -verbose"); - JpsKotlinCompilerSettings.setCompilerSettings(myProject, settings); } public void doTest() {