mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[gradle][eel][IJPL-203083] do not convert JDK path for remote execution
There is no need to convert the JDK path from local to remote, as it is already remote. GitOrigin-RevId: ad3eca9c6edb46633c0948debb78170aa802edeb
This commit is contained in:
committed by
intellij-monorepo-bot
parent
992a8cdfb5
commit
fa40715975
+3
-5
@@ -106,7 +106,6 @@ internal class GradleServerEnvironmentSetupImpl(
|
||||
|
||||
val environmentConfigurationProvider = connection.environmentConfigurationProvider
|
||||
this.environmentConfiguration = environmentConfigurationProvider.environmentConfiguration
|
||||
val targetPathMapper = environmentConfigurationProvider.pathMapper
|
||||
|
||||
val request = if (environmentConfiguration.typeId == "local") LocalTargetEnvironmentRequest()
|
||||
else environmentConfiguration.createEnvironmentRequest(project)
|
||||
@@ -115,7 +114,7 @@ internal class GradleServerEnvironmentSetupImpl(
|
||||
targetBuildParametersBuilder.useInstallation(it)
|
||||
}
|
||||
|
||||
configureJdk(javaParameters, request, consumerOperationParameters, targetPathMapper, environmentConfiguration)
|
||||
configureJdk(javaParameters, request, consumerOperationParameters, environmentConfiguration)
|
||||
progressIndicator.checkCanceled()
|
||||
val targetArguments = prepareTargetEnvironmentRequest(
|
||||
request,
|
||||
@@ -155,6 +154,7 @@ internal class GradleServerEnvironmentSetupImpl(
|
||||
targetEnvironmentProvider.uploadVolumes(progressIndicator)
|
||||
|
||||
val pathsToMap = extractPathsToMapFromInitScripts(initScripts)
|
||||
val targetPathMapper = environmentConfigurationProvider.pathMapper
|
||||
val pathMapperInitScript = createTargetPathMapperInitScript(
|
||||
request,
|
||||
targetPathMapper,
|
||||
@@ -277,7 +277,6 @@ internal class GradleServerEnvironmentSetupImpl(
|
||||
javaParameters: SimpleJavaParameters,
|
||||
request: TargetEnvironmentRequest,
|
||||
consumerOperationParameters: ConsumerOperationParameters,
|
||||
targetPathMapper: PathMapper?,
|
||||
environmentConfiguration: TargetEnvironmentConfiguration,
|
||||
) {
|
||||
if (request is LocalTargetEnvironmentRequest) {
|
||||
@@ -287,8 +286,7 @@ internal class GradleServerEnvironmentSetupImpl(
|
||||
}
|
||||
else {
|
||||
if (environmentConfiguration.runtimes.findByType(JavaLanguageRuntimeConfiguration::class.java) == null) {
|
||||
val localJavaHomePath = consumerOperationParameters.javaHome.path
|
||||
val targetJavaHomePath = targetPathMapper.maybeConvertToRemote(localJavaHomePath)
|
||||
val targetJavaHomePath = FileUtil.toCanonicalPath(consumerOperationParameters.javaHome.path)
|
||||
val javaLanguageRuntimeConfiguration = JavaLanguageRuntimeConfiguration().apply { homePath = targetJavaHomePath }
|
||||
environmentConfiguration.addLanguageRuntime(javaLanguageRuntimeConfiguration)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user