Make filetypes case insensitive on Windows

Filetypes are based on checking file-extensions which are case insensitive on Windows. For example, A lib file could be named .lib, Lib, etc which is currently not allowed in for example cc_import. This patch allows file extensions to vary in case on Windows.
bazelbuild · Oct 6, 2021 · a8f6ad3 · a8f6ad3
1 parent a3cec13
commit a8f6ad3
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 34 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD
@@ -111,6 +111,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/util:var_int",
         "//src/main/java/com/google/devtools/build/lib/util/io",
         "//src/main/java/com/google/devtools/build/lib/vfs",
+        "//src/main/java/com/google/devtools/build/lib/vfs:ospathpolicy",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
         "//src/main/java/com/google/devtools/build/skyframe",

diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/BUILD b/src/main/java/com/google/devtools/build/lib/cmdline/BUILD
@@ -64,6 +64,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant",
         "//src/main/java/com/google/devtools/build/lib/util",
         "//src/main/java/com/google/devtools/build/lib/util:string",
+        "//src/main/java/com/google/devtools/build/lib/vfs:ospathpolicy",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//third_party:auto_value",
         "//third_party:caffeine",

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -112,6 +112,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/util:string",
         "//src/main/java/com/google/devtools/build/lib/util/io",
         "//src/main/java/com/google/devtools/build/lib/vfs",
+        "//src/main/java/com/google/devtools/build/lib/vfs:ospathpolicy",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",

diff --git a/src/main/java/com/google/devtools/build/lib/util/BUILD b/src/main/java/com/google/devtools/build/lib/util/BUILD
@@ -206,6 +206,7 @@ java_library(
     deps = [
         ":string",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
+        "//src/main/java/com/google/devtools/build/lib/vfs:ospathpolicy",
         "//third_party:guava",
         "//third_party:jsr305",
     ],

diff --git a/src/main/java/com/google/devtools/build/lib/util/FileType.java b/src/main/java/com/google/devtools/build/lib/util/FileType.java
@@ -21,13 +21,17 @@
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
+import com.google.devtools.build.lib.vfs.OsPathPolicy;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.concurrent.Immutable;
 
 /** A base class for FileType matchers. */
 @Immutable
 public abstract class FileType implements Predicate<String> {
+  private static final OsPathPolicy OS = OsPathPolicy.getFilePathOs();
+
   // A special file type
   @AutoCodec @VisibleForSerialization
   public static final FileType NO_EXTENSION =
@@ -63,7 +67,7 @@ static final class SingletonFileType extends FileType {
 
     @Override
     public boolean apply(String path) {
-      return path.endsWith(ext);
+      return OS.endsWith(path, ext);
     }
 
     @Override
@@ -86,7 +90,7 @@ static final class ListFileType extends FileType {
     public boolean apply(String path) {
       // Do not use an iterator based for loop here as that creates excessive garbage.
       for (int i = 0; i < extensions.size(); i++) {
-        if (path.endsWith(extensions.get(i))) {
+        if (OS.endsWith(path, extensions.get(i))) {
           return true;
         }
       }

diff --git a/src/main/java/com/google/devtools/build/lib/vfs/BUILD b/src/main/java/com/google/devtools/build/lib/vfs/BUILD
@@ -8,30 +8,42 @@ filegroup(
     visibility = ["//src:__subpackages__"],
 )
 
+OS_PATH_POLICY_SOURCES = [
+    "OsPathPolicy.java",
+    "UnixOsPathPolicy.java",
+    "WindowsOsPathPolicy.java",
+]
+
 PATH_FRAGMENT_SOURCES = [
     "PathFragment.java",
     "PathFragmentSerializationProxy.java",
     "PathSegmentIterator.java",
-    "OsPathPolicy.java",
-    "UnixOsPathPolicy.java",
-    "WindowsOsPathPolicy.java",
 ]
 
 OUTPUT_SERVICE_SOURCES = [
     "OutputService.java",
 ]
 
+java_library(
+    name = "ospathpolicy",
+    srcs = OS_PATH_POLICY_SOURCES,
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib/util:os",
+        "//src/main/java/com/google/devtools/build/lib/windows:file",
+        "//src/main/java/com/google/devtools/build/lib/windows:windows_short_path",
+        "//third_party:guava",
+    ],
+)
+
 java_library(
     name = "pathfragment",
     srcs = PATH_FRAGMENT_SOURCES,
     deps = [
+        ":ospathpolicy",
         "//src/main/java/com/google/devtools/build/lib/actions:commandline_item",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant",
         "//src/main/java/com/google/devtools/build/lib/util:filetype",
-        "//src/main/java/com/google/devtools/build/lib/util:os",
-        "//src/main/java/com/google/devtools/build/lib/windows:file",
-        "//src/main/java/com/google/devtools/build/lib/windows:windows_short_path",
         "//third_party:error_prone_annotations",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -45,7 +57,7 @@ java_library(
         [
             "*.java",
         ],
-        exclude = PATH_FRAGMENT_SOURCES + OUTPUT_SERVICE_SOURCES,
+        exclude = PATH_FRAGMENT_SOURCES + OUTPUT_SERVICE_SOURCES + OS_PATH_POLICY_SOURCES,
     ),
     deps = [
         ":pathfragment",

diff --git a/src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs/BUILD b/src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs/BUILD
@@ -18,6 +18,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/concurrent",
         "//src/main/java/com/google/devtools/build/lib/util:os",
         "//src/main/java/com/google/devtools/build/lib/vfs",
+        "//src/main/java/com/google/devtools/build/lib/vfs:ospathpolicy",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//third_party:auto_value",
         "//third_party:guava",

diff --git a/src/test/java/com/google/devtools/build/lib/util/BUILD b/src/test/java/com/google/devtools/build/lib/util/BUILD
@@ -88,6 +88,37 @@ java_test(
     ],
 )
 
+# Tests windows specific filetype handling on Unix.
+java_library(
+    name = "FileTypeTests_lib",
+    srcs = ["FileTypeTest.java"],
+
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib/util:filetype",
+        "//src/main/java/com/google/devtools/build/lib/util:os",
+        "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+        "//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
+        "//src/main/java/com/google/devtools/build/lib/vfs",
+        "//third_party:guava",
+        "//third_party:junit4",
+        "//third_party:truth",
+    ],
+)
+
+java_test(
+    name = "FileTypeWindowsTests",
+    size = "small",
+    jvm_flags = [
+        "-Dblaze.os=Windows",
+        "-Dbazel.windows_unix_root=C:/fake/msys",
+    ],
+    test_class = "com.google.devtools.build.lib.AllTests",
+    runtime_deps = [
+        ":FileTypeTests_lib",
+        "//src/test/java/com/google/devtools/build/lib:test_runner",
+    ],
+)
+
 # Tests windows specific path handling on Unix.
 java_library(
     name = "UtilWindowsTests_lib",