From f2138961957b383a3ee8833e98f227e2909e833f Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Fri, 20 Dec 2019 16:44:20 +0300 Subject: [PATCH] =?UTF-8?q?use=20'jbrsdk'=20bundle=20(including=20src.zip)?= =?UTF-8?q?,=20not=20'jbr'=20for=20'Update=20IDE=20from=20Sources=E2=80=A6?= =?UTF-8?q?'=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GitOrigin-RevId: 8fd4b997d7122dc3d64527f5b55f4cd03eedbe63 --- .../org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy | 4 ++++ .../actions/updateFromSources/UpdateIdeFromSourcesAction.kt | 1 + 2 files changed, 5 insertions(+) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy index 9250c66d6787..66d4dc62ed7d 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy @@ -431,6 +431,10 @@ idea.fatal.error.notification=disabled 'setupJbre', "-Dintellij.build.target.os=$buildContext.options.targetOS", "-Dintellij.build.bundled.jre.version=$buildContext.options.bundledJreVersion" ] + String prefix = System.getProperty("intellij.build.bundled.jre.prefix") + if (prefix != null) { + args += "-Dintellij.build.bundled.jre.prefix=$prefix" + } if (buildContext.options.bundledJreBuild != null) { args += "-Dintellij.build.bundled.jre.build=$buildContext.options.bundledJreBuild" } diff --git a/plugins/devkit/devkit-core/src/actions/updateFromSources/UpdateIdeFromSourcesAction.kt b/plugins/devkit/devkit-core/src/actions/updateFromSources/UpdateIdeFromSourcesAction.kt index f2b05e8c123e..b2b6768c3d23 100644 --- a/plugins/devkit/devkit-core/src/actions/updateFromSources/UpdateIdeFromSourcesAction.kt +++ b/plugins/devkit/devkit-core/src/actions/updateFromSources/UpdateIdeFromSourcesAction.kt @@ -307,6 +307,7 @@ open class UpdateIdeFromSourcesAction params.programParametersList.add(scriptFile.absolutePath) params.programParametersList.add("update-from-sources") params.vmParametersList.add("-D$includeBinAndRuntimeProperty=true") + params.vmParametersList.add("-Dintellij.build.bundled.jre.prefix=jbrsdk-") if (bundledPluginDirsToSkip.isNotEmpty()) { params.vmParametersList.add("-Dintellij.build.bundled.plugin.dirs.to.skip=${bundledPluginDirsToSkip.joinToString(",")}") }