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

IDEA-CR-52030 unnecessary String cast is removed; JBR path through system property is not used anymore

Browse Source 
GitOrigin-RevId: a86b01a3afb4136e96c5ff0f9aa951e7edd531dd
This commit is contained in:
Dmitriy.Panov
2019-09-03 14:59:03 +00:00
committed by intellij-monorepo-bot
parent 127cb52450
commit cb8f1f46a4
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
+6 -6
View File
@@ -65,7 +65,7 @@ class CompilationContextImpl implements CompilationContext {
def dependenciesProjectDir = new File(communityHome, 'build/dependencies')
logFreeDiskSpace(messages, projectHome, "before downloading dependencies")
def gradleJdk = toCanonicalPath(JdkUtils.computeJdkHome(messages, '1.8', "jdk8Home", null, "JDK_18_x64"))
def gradleJdk = toCanonicalPath(JdkUtils.computeJdkHome(messages, '1.8', null, "JDK_18_x64"))
GradleRunner gradle = new GradleRunner(dependenciesProjectDir, projectHome, messages, gradleJdk)
if (!options.isInDevelopmentMode) {
setupCompilationDependencies(gradle, options)
@@ -89,21 +89,21 @@ class CompilationContextImpl implements CompilationContext {
private static String defineJavaSdk(JpsModel model, String projectHome, BuildOptions options, BuildMessages messages) {
def sdks = []
def jbrDir = jbrDir(projectHome, options)
def jdk6Home = JdkUtils.computeJdkHome(messages, '1.6', "jdkHome", "$jbrDir/1.6", "JDK_16_x64")
def jdk6Home = JdkUtils.computeJdkHome(messages, '1.6', "$jbrDir/1.6", "JDK_16_x64")
JdkUtils.defineJdk(model.global, "IDEA jdk", jdk6Home, messages)
sdks << "IDEA jdk"
def jbrVersionName = jbrVersionName(options)
sdks << jbrVersionName
def jbrDefaultDir = "$jbrDir/$jbrVersionName"
def jbrEnvVar = "JDK_${options.jbrVersion < 9 ? "1$options.jbrVersion" : options.jbrVersion}_x64"
def jbrHome = toCanonicalPath(JdkUtils.computeJdkHome(messages, jbrVersionName, "jdk${options.jbrVersion}Home", jbrDefaultDir, jbrEnvVar))
def jbrHome = toCanonicalPath(JdkUtils.computeJdkHome(messages, jbrVersionName, jbrDefaultDir, jbrEnvVar))
JdkUtils.defineJdk(model.global, jbrVersionName, jbrHome, messages)
model.project.modules
.collect { it.getSdkReference(JpsJavaSdkType.INSTANCE)?.sdkName }
.findAll { it != null && !sdks.contains(it) }
.toSet().each { sdkName ->
def sdkHome = JdkUtils.computeJdkHome(messages, sdkName, sdkName, "$jbrDir/$sdkName", null)?.with {
toCanonicalPath(it as String)
def sdkHome = JdkUtils.computeJdkHome(messages, sdkName, "$jbrDir/$sdkName", null)?.with {
toCanonicalPath(it)
}
if (sdkHome != null) {
JdkUtils.defineJdk(model.global, sdkName, sdkHome, messages)
@@ -112,7 +112,7 @@ class CompilationContextImpl implements CompilationContext {
def urls = jbr11.getRoots(JpsOrderRootType.COMPILED).collect { it.url }
JdkUtils.readModulesFromReleaseFile(new File(sdkHome)).each {
if (!urls.contains(it)) {
jbr11.addRoot(it as String, JpsOrderRootType.COMPILED)
jbr11.addRoot(it, JpsOrderRootType.COMPILED)
}
}
}
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.groovy
+2 -8
View File
@@ -28,14 +28,8 @@ class JdkUtils {
messages.info("'$jdkName' Java SDK set to $jdkHomePath")
}
static String computeJdkHome(BuildMessages messages, String name, String propertyName, String defaultDir, String envVarName) {
static String computeJdkHome(BuildMessages messages, String name, String defaultDir, String envVarName) {
String jdkDir
if (propertyName != null) {
jdkDir = System.getProperty(propertyName)
if (jdkDir != null) {
return jdkDir
}
}
if (defaultDir != null) {
jdkDir = SystemInfo.isMac ? "$defaultDir/Contents/Home" : defaultDir
if (new File(jdkDir).exists()) {
@@ -45,7 +39,7 @@ class JdkUtils {
jdkDir = null
}
}
messages.info("$name: property=$propertyName, dir=$defaultDir, env=$envVarName")
messages.info("$name: dir=$defaultDir, env=$envVarName")
if (envVarName != null) {
jdkDir = System.getenv(envVarName)
}