IDEA-175506 Build scripts: download JREs only for platforms for which product is being built

pass targetOs property to gradle task
This commit is contained in:
Alexander Zolotov
2017-07-07 14:04:52 +03:00
parent 4e8a0d2dd8
commit 763bdba5df
3 changed files with 2 additions and 2 deletions
+1
View File
@@ -1,6 +1,7 @@
task setupJbre {}
def jdkRepo = inJetBrainsNetwork ? 'http://repo.labs.intellij.net/intellij-jdk' : 'https://dl.bintray.com/jetbrains/intellij-jdk'
def targetOs = "${System.getProperty("intellij.build.target.os", "all")}"
jrePlatformsToDownload(targetOs).each { platform ->
archToDownload(platform).each { arch ->
-1
View File
@@ -22,7 +22,6 @@ def checkoutDir = intellijProjectDir()
def jdkDir = "$checkoutDir/build/jdk"
project.ext.jdk18OutputDir = "${System.getProperty("intellij.jdk18.output.dir", "") ?: "$jdkDir/1.8"}"
project.ext.targetOs = "${System.getProperty("intellij.build.target.os", "all")}"
task downloadJdk18 {
def arch = jdk18Arch()
@@ -296,7 +296,7 @@ idea.fatal.error.notification=disabled
if (buildContext.productProperties.scrambleMainJar) {
scramble()
}
buildContext.gradle.run('Setting up JetBrains JREs', 'setupJbre')
buildContext.gradle.run('Setting up JetBrains JREs', 'setupJbre', "-Dintellij.build.target.os=$buildContext.options.targetOS")
layoutShared()
def propertiesFile = patchIdeaPropertiesFile()