azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made compiler report source to output mapping when invoked from JPS.

Browse Source 
Original commit: cbf8af2e88
This commit is contained in:
Evgeny Gerashchenko
2014-08-18 19:21:42 +04:00
parent e97d8614c5
commit 79ae770031
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+2
View File
@@ -140,6 +140,8 @@ public class KotlinBuilder extends ModuleLevelBuilder {
JpsProject project = representativeTarget.getModule().getProject(); JpsProject project = representativeTarget.getModule().getProject();
CommonCompilerArguments commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project); CommonCompilerArguments commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project);
commonArguments.verbose = true; // Make compiler report source to output files mapping
CompilerSettings compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project); CompilerSettings compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project);
final Set<File> allCompiledFiles = getAllCompiledFilesContainer(context); final Set<File> allCompiledFiles = getAllCompiledFilesContainer(context);
jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
-3
View File
@@ -71,9 +71,6 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
private void initProject() { private void initProject() {
addJdk(JDK_NAME); addJdk(JDK_NAME);
loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr"); loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr");
CompilerSettings settings = new CompilerSettings();
settings.setAdditionalArguments(settings.getAdditionalArguments() + " -verbose");
JpsKotlinCompilerSettings.setCompilerSettings(myProject, settings);
} }
public void doTest() { public void doTest() {