[ClangAstParser] Consolidates includes for Windows platforms

Author: joaobispo

ClangAstParser/src/pt/up/fe/specs/clang/ClangAstFileResource.java

@@ -19,11 +19,9 @@
 
 public enum ClangAstFileResource implements Supplier<FileResourceProvider> {
 
-    LIBC_CXX_LLVM(ClangAstWebResource.LIBC_CXX_LLVM),
-    LIBC_CXX_WIN32(ClangAstWebResource.LIBC_CXX_WIN32),
-    LIBC_CXX_LINUX(ClangAstWebResource.LIBC_CXX_LINUX),
     LIBC_CXX_LINUX_COMPLETE(ClangAstWebResource.LIBC_CXX_LINUX_COMPLETE),
     LIBC_CXX_MACOS_COMPLETE(ClangAstWebResource.LIBC_CXX_MACOS_COMPLETE),
+    LIBC_CXX_WIN32_COMPLETE(ClangAstWebResource.LIBC_CXX_WIN32_COMPLETE),
     OPENMP_INCLUDES(ClangAstWebResource.OPENMP_INCLUDES),
     CUDA_LIB(ClangAstWebResource.CUDA_LIB),
     WIN_EXE(ClangAstWebResource.WIN_EXE),

ClangAstParser/src/pt/up/fe/specs/clang/ClangAstWebResource.java

@@ -20,11 +20,9 @@ public interface ClangAstWebResource {
     String ROOT_16_0_5 = "https://github.com/specs-feup/clava/releases/download/clang_ast_dumper_16.0.5/";
     String ROOT_12_0_7 = "https://github.com/specs-feup/clava/releases/download/clang_ast_dumper_v12.0.7.1/";
 
-    WebResourceProvider LIBC_CXX_LLVM = WebResourceProvider.newInstance(ROOT_16_0_5, "libc_cxx_llvm.zip", "v16.0.5");
-    WebResourceProvider LIBC_CXX_WIN32 = WebResourceProvider.newInstance(ROOT_16_0_5, "libc_cxx_win32.zip", "v16.0.5");
-    WebResourceProvider LIBC_CXX_LINUX = WebResourceProvider.newInstance(ROOT_16_0_5, "libc_cxx_linux.zip", "v16.0.5");
     WebResourceProvider LIBC_CXX_LINUX_COMPLETE = WebResourceProvider.newInstance(ROOT_16_0_5, "libc_cxx_linux_complete.zip", "v16.0.5");
     WebResourceProvider LIBC_CXX_MACOS_COMPLETE = WebResourceProvider.newInstance(ROOT_16_0_5, "libc_cxx_macos_complete.zip", "v16.0.6");
+    WebResourceProvider LIBC_CXX_WIN32_COMPLETE = WebResourceProvider.newInstance(ROOT_16_0_5, "libc_cxx_win32_complete.zip", "v16.0.5");
 
     WebResourceProvider OPENMP_INCLUDES = WebResourceProvider.newInstance(ROOT_16_0_5, "openmp_includes.zip");
 

ClangAstParser/src/pt/up/fe/specs/clang/ClangResources.java

@@ -251,10 +251,7 @@ else if (SupportedPlatform.getCurrentPlatform().isLinux()) {
             }
             // Windows
             else if (SupportedPlatform.getCurrentPlatform().isWindows()) {
-                var builtinResource = CLANG_AST_RESOURCES.get(ClangAstFileResource.LIBC_CXX_LLVM);
-                includesZips.add(getVersionedResource(builtinResource, builtinResource.version()));
-
-                var windowsBuiltinResource = CLANG_AST_RESOURCES.get(ClangAstFileResource.LIBC_CXX_WIN32);
+                var windowsBuiltinResource = CLANG_AST_RESOURCES.get(ClangAstFileResource.LIBC_CXX_WIN32_COMPLETE);
                 includesZips.add(getVersionedResource(windowsBuiltinResource, windowsBuiltinResource.version()));
             } else {
                 throw new RuntimeException("Unsupported platform: " + SupportedPlatform.getCurrentPlatform());