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

[jps] IDEA-376790 Store system build files on Eel for all non‑local projects

Browse Source 
Routes the build system directory and project system hashing to Eel storage whenever Eel is available, and the project is non‑local, not just for WSL. This unifies remote handling so non‑local, non‑WSL projects now keep JPS-build-related files on the remote Eel side instead of the local machine.

The previous WSL‑specific logic is preserved and continues to be used for WSL projects or when Eel isn't applicable. Local projects remain in the local build system directory with no behavioral changes. This reduces cross‑machine path mismatches and keeps build state co‑located with remote sources for more reliable builds.


(cherry picked from commit 602fa5f5f9f2bc4649bdb37431485997d380617a)

IJ-CR-179667

GitOrigin-RevId: 69d02be22a9bb48b989f84d196aba35ac294300b
This commit is contained in:
Alexander Koshevoy
2025-10-24 21:59:36 +00:00
committed by intellij-monorepo-bot
parent 313180c930
commit fbd2efb203
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+21 -4
View File
@@ -151,6 +151,7 @@ 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.EelNioBridgeServiceKt.asNioPath;
import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.TargetTypeBuildScope;
public final class BuildManager implements Disposable {
@@ -1929,6 +1930,9 @@ public final class BuildManager implements Disposable {
}
public @NotNull Path getBuildSystemDirectory(Project project) {
if (canUseEel() && !EelPathUtils.isProjectLocal(project)) {
return EelPathUtils.getSystemFolder(project).resolve(SYSTEM_ROOT);
}
final WslPath wslPath = WslPath.parseWindowsUncPath(getProjectPath(project));
if (wslPath != null) {
Path buildDir = WslBuildCommandLineBuilder.getWslBuildSystemDirectory(wslPath.getDistribution());
@@ -1949,13 +1953,26 @@ public final class BuildManager implements Disposable {
public @NotNull File getProjectSystemDirectory(@NotNull Project project) {
String projectPath = getProjectPath(project);
WslPath wslPath = WslPath.parseWindowsUncPath(projectPath);
Function<String, Integer> hashFunction;
if (wslPath == null) {
hashFunction = String::hashCode;
if (canUseEel() && !EelPathUtils.isProjectLocal(project)) {
final var descriptor = EelProviderUtil.getEelDescriptor(project);
hashFunction = s -> {
try {
return asEelPath(Path.of(s), descriptor).toString().hashCode();
}
catch (Throwable e) {
return s.hashCode();
}
};
}
else {
hashFunction = s -> Objects.requireNonNullElse(wslPath.getDistribution().getWslPath(s), s).hashCode();
WslPath wslPath = WslPath.parseWindowsUncPath(projectPath);
if (wslPath == null) {
hashFunction = String::hashCode;
}
else {
hashFunction = s -> Objects.requireNonNullElse(wslPath.getDistribution().getWslPath(s), s).hashCode();
}
}
return Utils.getDataStorageRoot(getBuildSystemDirectory(project).toFile(), projectPath, hashFunction);
}