From 3a2a3e7cd51e6b48d24adf94927e247c9d48d816 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 4 Jun 2014 19:25:59 +0400 Subject: [PATCH] Saving module XMLs in temp directory instead of output. --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 1 + .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 ae45d220ab5..d5ef4398b14 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -179,6 +179,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector); + moduleFile.delete(); } // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index ae00121e279..0ae30acd43f 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -16,7 +16,9 @@ package org.jetbrains.jet.jps.build; +import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -98,7 +100,9 @@ public class KotlinBuilderModuleScriptGenerator { if (noSources) return null; - File scriptFile = new File(getOutputDir(chunk.representativeTarget()), "script." + FACTORY.getFileExtension()); + String scriptFilename = context.getProjectDescriptor().dataManager.getDataPaths().getDataStorageRoot().getName() + + "#" + StringUtil.sanitizeJavaIdentifier(chunk.getName()); + File scriptFile = new File(PathManager.getTempPath() + File.separator + scriptFilename + ".script." + FACTORY.getFileExtension()); writeScriptToFile(context, builder.asText(), scriptFile);