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

IJI-30: intellij.build.bundled.jre.prefix system property removed

Browse Source
This commit is contained in:
Dmitriy.Panov
2018-10-04 11:02:47 +03:00
parent 52dfe8db3f
commit 4a3c193ce0
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/dependencies/setupJbre.gradle
+12 -3
View File
@@ -1,11 +1,20 @@
task setupJbre {}
def setupJbre = task setupJbre {}
def jdkRepo = 'https://cache-redirector.jetbrains.com/intellij-jdk'
def targetOs = System.getProperty("intellij.build.target.os", "all")
def bundledJreVersion = System.getProperty("intellij.build.bundled.jre.version", "8").toInteger()
def isBundledJreModular = bundledJreVersion >= 9
def jreArtifactPrefix = System.getProperty("intellij.build.bundled.jre.prefix", "jbrex8")
def jreArtifactBuild = System.getProperty("intellij.build.bundled.jre.build", jdkBuild)
def jreArtifactPrefix
if (bundledJreVersion == 8) {
jreArtifactPrefix = 'jbrex8'
}
else if (bundledJreVersion == 9) {
jreArtifactPrefix = 'jbsdk9'
}
else {
throw new IllegalArgumentException("Unable to determine bundled JRE artifact prefix by JRE version $bundledJreVersion")
}
jrePlatformsToDownload(targetOs).each { platform ->
archToDownload(platform, !isBundledJreModular).each { arch ->
@@ -136,7 +145,7 @@ def createTarJbreTask(String taskName,
}
}
arguments += [dirToTar]
commandLine arguments
commandLine = arguments
}
}
}
platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy
-5
View File
@@ -122,9 +122,4 @@ class BuildOptions {
* Specifies JRE build to be bundled with distributions. If {@code null} then jdkBuild from gradle.properties will be used.
*/
String bundledJreBuild = System.getProperty("intellij.build.bundled.jre.build")
/**
* Specifies prefix of JRE artifact to be bundled with distributions, JB JRE 8 prefix by default.
*/
String bundledJrePrefix = System.getProperty("intellij.build.bundled.jre.prefix", "jbrex8")
}
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
+1 -2
View File
@@ -356,8 +356,7 @@ idea.fatal.error.notification=disabled
logFreeDiskSpace("before downloading JREs")
String[] args = [
'setupJbre', "-Dintellij.build.target.os=$buildContext.options.targetOS",
"-Dintellij.build.bundled.jre.version=$buildContext.options.bundledJreVersion",
"-Dintellij.build.bundled.jre.prefix=$buildContext.options.bundledJrePrefix"
"-Dintellij.build.bundled.jre.version=$buildContext.options.bundledJreVersion"
]
if (buildContext.options.bundledJreBuild != null) {
args += "-Dintellij.build.bundled.jre.build=$buildContext.options.bundledJreBuild"