MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

JBR11 is primary, JBR8 is secondary: intellij.build.bundled.jre.prefix fix

Browse Source 
GitOrigin-RevId: 7573018f9e3b3cb6c24cb64ca913406c65b895aa
This commit is contained in:
Dmitriy.Panov
2019-07-02 06:52:16 +03:00
committed by intellij-monorepo-bot
parent 8f44e8373d
commit 48de716632
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
+7 -5
View File
@@ -55,7 +55,7 @@ class BundledJreManager {
buildContext.messages.info("JRE is already extracted to $targetDir")
return targetDir
}
File archive = findArchive(osName, getJreBuild(osName), getJreVersion(), null, JvmArchitecture.x64, JreVendor.JetBrains)
File archive = findArchive(osName, getJreBuild(osName), getJreVersion(), jrePrefix(), JvmArchitecture.x64, JreVendor.JetBrains)
if (archive == null) {
return null
}
@@ -99,7 +99,7 @@ class BundledJreManager {
}
File findJreArchive(String osName, JvmArchitecture arch = JvmArchitecture.x64) {
return findArchive(osName, getJreBuild(osName), getJreVersion(), null, arch, JreVendor.JetBrains)
return findArchive(osName, getJreBuild(osName), getJreVersion(), jrePrefix(), arch, JreVendor.JetBrains)
}
String archiveNameJre(BuildContext buildContext) {
@@ -199,9 +199,7 @@ class BundledJreManager {
}
private File findSecondBundledJreArchive(String osName, JvmArchitecture arch = JvmArchitecture.x64, JreVendor vendor = JreVendor.JetBrains) {
return findArchive(osName, secondBundledJreBuild, secondBundledJreVersion,
System.getProperty("intellij.build.bundled.jre.prefix"),
arch, vendor)
return findArchive(osName, secondBundledJreBuild, secondBundledJreVersion, null, arch, vendor)
}
private File findArchive(String osName, String jreBuild,
@@ -269,6 +267,10 @@ class BundledJreManager {
}
}
String jrePrefix() {
return System.getProperty("intellij.build.bundled.jre.prefix")
}
String secondJreSuffix() {
return "-jbr8"
}