MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

[eel-jps] IJPL-176715: BuildManager: global options folder should be transferred to the target environment

Browse Source 
GitOrigin-RevId: 41eeaaef60c095f3e60f3d43eb3cba25b7dfa30c
This commit is contained in:
Andrii Zinchenko
2025-02-11 10:32:42 +00:00
committed by intellij-monorepo-bot
parent 44cc56f70e
commit 3f0aec69e8
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+15 -2
View File
@@ -153,6 +153,9 @@ import java.util.stream.Collectors;
import static com.intellij.ide.impl.ProjectUtil.getProjectForComponent;
import static com.intellij.openapi.diagnostic.InMemoryHandler.IN_MEMORY_LOGGER_ADVANCED_SETTINGS_NAME;
import static com.intellij.platform.eel.provider.EelNioBridgeServiceKt.asEelPath;
import static com.intellij.platform.eel.provider.EelProviderUtil.upgradeBlocking;
import static com.intellij.platform.eel.provider.utils.EelPathUtils.transferContentsIfNonLocal;
import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.TargetTypeBuildScope;
public final class BuildManager implements Disposable {
@@ -882,7 +885,7 @@ public final class BuildManager implements Disposable {
Function<String, String> pathMapper;
if (canUseEel() && !EelPathUtils.isProjectLocal(project)) {
pathMapper = e -> EelNioBridgeServiceKt.asEelPath(Path.of(e)).toString();
pathMapper = e -> asEelPath(Path.of(e)).toString();
}
else {
pathMapper = wslDistribution != null ? wslDistribution::getWslPath : Function.identity();
@@ -916,8 +919,18 @@ public final class BuildManager implements Disposable {
future.setDone();
}
else {
String optionsPath = PathManager.getOptionsPath();
if (canUseEel() && !EelPathUtils.isProjectLocal(project)) {
final var eel = upgradeBlocking(eelDescriptor);
optionsPath = asEelPath(transferContentsIfNonLocal(eel, Path.of(optionsPath), null)).toString();
}
else {
optionsPath = pathMapper.apply(optionsPath);
}
final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings globals =
CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder().setGlobalOptionsPath(pathMapper.apply(PathManager.getOptionsPath()))
CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder().setGlobalOptionsPath(optionsPath)
.build();
CmdlineRemoteProto.Message.ControllerMessage.FSEvent currentFSChanges;
final ExecutorService projectTaskQueue;