Merge remote-tracking branch 'origin/master' into incremental

Original commit: aa41ae09ed
This commit is contained in:
Evgeny Gerashchenko
2014-06-19 11:43:11 +04:00
@@ -16,7 +16,6 @@
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;
@@ -101,9 +100,7 @@ public class KotlinBuilderModuleScriptGenerator {
if (noSources) return null;
String scriptFilename = context.getProjectDescriptor().dataManager.getDataPaths().getDataStorageRoot().getName()
+ "#" + StringUtil.sanitizeJavaIdentifier(chunk.getName());
File scriptFile = new File(PathManager.getTempPath() + File.separator + scriptFilename + ".script." + FACTORY.getFileExtension());
File scriptFile = File.createTempFile("kjps", StringUtil.sanitizeJavaIdentifier(chunk.getName()) + ".script.xml");
writeScriptToFile(context, builder.asText(), scriptFile);