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

Use NIO Files for creating temp files: build tools

Browse Source 
Original commit: c9bbdf6575
This commit is contained in:
Ilya Gorbunov
2020-11-14 09:50:43 +03:00
parent ac5da46004
commit 2746242fbc
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
+11 -4
View File
@@ -46,6 +46,9 @@ import org.jetbrains.kotlin.utils.keysToMap
import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassReader
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
private const val JVM_BUILD_META_INFO_FILE_NAME = "jvm-build-meta-info.txt" private const val JVM_BUILD_META_INFO_FILE_NAME = "jvm-build-meta-info.txt"
@@ -242,14 +245,18 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
append("-test") append("-test")
} }
} }
val dir = System.getProperty("kotlin.jps.dir.for.module.files")?.let { File(it) }?.takeIf { it.isDirectory }
fun createTempFile(dir: Path?, prefix: String?, suffix: String?): Path =
if (dir != null) Files.createTempFile(dir, prefix, suffix) else Files.createTempFile(prefix, suffix)
val dir = System.getProperty("kotlin.jps.dir.for.module.files")?.let { Paths.get(it) }?.takeIf { Files.isDirectory(it) }
return try { return try {
File.createTempFile("kjps", readableSuffix + ".script.xml", dir) createTempFile(dir, "kjps", readableSuffix + ".script.xml")
} catch (e: IOException) { } catch (e: IOException) {
// sometimes files cannot be created, because file name is too long (Windows, Mac OS) // sometimes files cannot be created, because file name is too long (Windows, Mac OS)
// see https://bugs.openjdk.java.net/browse/JDK-8148023 // see https://bugs.openjdk.java.net/browse/JDK-8148023
try { try {
File.createTempFile("kjps", ".script.xml", dir) createTempFile(dir, "kjps", ".script.xml")
} catch (e: IOException) { } catch (e: IOException) {
val message = buildString { val message = buildString {
append("Could not create module file when building chunk $chunk") append("Could not create module file when building chunk $chunk")
@@ -259,7 +266,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
} }
throw RuntimeException(message, e) throw RuntimeException(message, e)
} }
} }.toFile()
} }
private fun findClassPathRoots(): Collection<File> { private fun findClassPathRoots(): Collection<File> {