From 066d0d9752f1c4208d482efd427894f39a3d726d Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Thu, 30 Apr 2020 13:38:07 +0300 Subject: [PATCH] [JPS build] fix check for non-existing output roots on Windows 'storedNonExistentOutputs' stores system-independent paths so we need to convert slashes to '/' in nonexistentOutputRoots as well, otherwise 'containsAll' check won't work properly (PATH_HASHING_STRATEGY handles case sensitivity only, it doesn't convert file separators), the method may incorrectly return 'true' causing full rebuild of the corresponding target. This fixes GwtBuilderTest on Windows. GitOrigin-RevId: d07aa1cc66d91c67bc54e01dbc201c9115ac51d7 --- .../jps/incremental/storage/BuildTargetConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetConfiguration.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetConfiguration.java index b52c8c6a7666..0a60b075d21d 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetConfiguration.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetConfiguration.java @@ -185,7 +185,7 @@ public class BuildTargetConfiguration { } } if (wasDeleted) { - nonexistentOutputRoots.add(outputRoot.getAbsolutePath()); + nonexistentOutputRoots.add(FileUtil.toSystemIndependentName(outputRoot.getAbsolutePath())); } } }