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

use 'jbrsdk' bundle (including src.zip), not 'jbr' for 'Update IDE from Sources…' action

Browse Source 
GitOrigin-RevId: 8fd4b997d7122dc3d64527f5b55f4cd03eedbe63
This commit is contained in:
Dmitry Batrak
2019-12-23 11:04:38 +00:00
committed by intellij-monorepo-bot
parent 1c147101e4
commit f213896195
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
+4
View File
@@ -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"
}
plugins/devkit/devkit-core/src/actions/updateFromSources/UpdateIdeFromSourcesAction.kt
+1
View File
@@ -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(",")}")
}