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

Saving module XMLs in temp directory instead of output.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-06-04 19:25:59 +04:00
parent 7d9742417f
commit 3a2a3e7cd5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+1
View File
@@ -179,6 +179,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment,
moduleFile, outputItemCollector); 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 // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below
jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java
+5 -1
View File
@@ -16,7 +16,9 @@
package org.jetbrains.jet.jps.build; package org.jetbrains.jet.jps.build;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -98,7 +100,9 @@ public class KotlinBuilderModuleScriptGenerator {
if (noSources) return null; 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); writeScriptToFile(context, builder.asText(), scriptFile);