mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-03-22 06:50:54 +07:00
[build scripts] don't pass 'jna.nounpack=true' property when starting IDE inside build scripts (IJPL-150094)
JNA native parts aren't packed in proper locations at this stage yet, so we shouldn't disable JNA unpacking. It would be even better to get rid of explicit 'jna.nounpack' at all unless we really need it. GitOrigin-RevId: f6c3bca167e1827a2577c5739f6050cc1dab983f
This commit is contained in:
committed by
intellij-monorepo-bot
parent
38a0b779ae
commit
6b2e75f9da
@@ -21,7 +21,6 @@ internal class ModuleBasedProductRunner(private val rootModuleForModularLoader:
|
||||
)
|
||||
)
|
||||
|
||||
//todo include jna.boot.library.path, pty4j.preferred.native.folder and related properties?
|
||||
val loaderModule = context.originalModuleRepository.repository.getModule(RuntimeModuleId.module("intellij.platform.runtime.loader"))
|
||||
val ideClasspath = loaderModule.moduleClasspath.map { it.pathString }
|
||||
runApplicationStarter(
|
||||
@@ -30,7 +29,8 @@ internal class ModuleBasedProductRunner(private val rootModuleForModularLoader:
|
||||
args = args,
|
||||
vmProperties = systemProperties + additionalVmProperties,
|
||||
vmOptions = VmOptionsGenerator.computeVmOptions(context) +
|
||||
context.productProperties.additionalIdeJvmArguments +
|
||||
//we need to unset 'jna.nounpack' (see IJ-CR-125211), otherwise the process will fail to load JNA on macOS (IJPL-150094)
|
||||
context.productProperties.additionalIdeJvmArguments.filterNot { it == "-Djna.nounpack=true" } +
|
||||
context.productProperties.getAdditionalContextDependentIdeJvmArguments(context),
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user