MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJI-108: setupJdk* failing to delete files tmp workaround

Browse Source
This commit is contained in:
Dmitriy.Panov
2019-01-28 13:55:27 +03:00
parent d384eabce0
commit 3964695005
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
build/dependencies/setupJdk.gradle
View File

@@ -50,10 +50,6 @@ task setupJdk(dependsOn: downloadJdk) {
fileTree(outputDir).each {
outputs.file(it)
}
onlyIf {
// gradle is not running on it
!System.getProperty('java.home').contains(outputDir)
}
doLast {
logger.info("Setting up JDK $jdkVersion to compile")
unpackJdk(downloadOutputs.singleFile, outputDir)
@@ -61,24 +57,29 @@ task setupJdk(dependsOn: downloadJdk) {
}
def unpackJdk(jdkArchive, outputDir) {
logger.info("Unpacking $jdkArchive to ${outputDir}")
if (file(outputDir).exists()) {
delete(outputDir)
}
def currentOs = OperatingSystem.current()
if (currentOs.isWindows()) {
copy {
from tarTree(jdkArchive)
into outputDir
try {
logger.info("Unpacking $jdkArchive to ${outputDir}")
if (file(outputDir).exists()) {
delete(outputDir)
}
def currentOs = OperatingSystem.current()
if (currentOs.isWindows()) {
copy {
from tarTree(jdkArchive)
into outputDir
}
}
else {
exec { commandLine 'mkdir', '-p', outputDir }
exec { commandLine 'tar', 'xpf', "$jdkArchive.absolutePath", '--directory', outputDir }
if (currentOs.isMacOsX() && file("${outputDir}/jdk/Contents").exists()) {
exec { commandLine 'mv', "${outputDir}/jdk/Contents", outputDir }
exec { commandLine 'rm', '-rf', "${outputDir}/jdk" }
}
}
}
else {
exec { commandLine 'mkdir', '-p', outputDir }
exec { commandLine 'tar', 'xpf', "$jdkArchive.absolutePath", '--directory', outputDir }
if (currentOs.isMacOsX() && file("${outputDir}/jdk/Contents").exists()) {
exec { commandLine 'mv', "${outputDir}/jdk/Contents", outputDir }
exec { commandLine 'rm', '-rf', "${outputDir}/jdk" }
}
catch (Exception ignored) {
println(ignored.message)
}
}