WiX: add custom actions to handle Clang resources

platforms/Windows/CustomActions/CustomActions.cc

@@ -0,0 +1,152 @@
+#include <Windows.h>
+#include <msi.h>
+#include <msiquery.h>
+
+#include <filesystem>
+
+std::wstring get_error_message(const std::error_code& error) {
+    auto message = error.message();
+    auto length = MultiByteToWideChar(CP_THREAD_ACP, 0, message.c_str(), message.size(), nullptr, 0);
+    std::wstring result(length, L'\0');
+    MultiByteToWideChar(CP_THREAD_ACP, 0, message.c_str(), message.size(), &result[0], length);
+    return result;
+}
+
+namespace msi {
+void log(MSIHANDLE hInstall, UINT eMessageType, std::wstring message) noexcept {
+    PMSIHANDLE record = MsiCreateRecord(0);
+    (void)MsiRecordSetStringW(record, 0, message.c_str());
+    (void)MsiProcessMessage(hInstall, INSTALLMESSAGE(eMessageType), record);
+}
+
+void log_last_error(MSIHANDLE hInstall) noexcept {
+    PMSIHANDLE record = MsiGetLastErrorRecord();
+    (void)MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR, record);
+}
+
+std::wstring get_property(MSIHANDLE hInstall, std::wstring name, UINT &result) noexcept {
+    DWORD size = 0;
+
+    result = MsiGetPropertyW(hInstall, name.c_str(), L"", &size);
+    switch (result) {
+    case ERROR_MORE_DATA:
+        break;
+    case ERROR_SUCCESS:
+        result = ERROR_INSTALL_FAILURE;
+        return nullptr;
+    default:
+        log_last_error(hInstall);
+        return nullptr;
+    }
+
+    std::vector<WCHAR> buffer;
+    buffer.resize(size + 1);
+
+    size = buffer.capacity();
+    result = MsiGetPropertyW(hInstall, name.c_str(), buffer.data(), &size);
+    switch (result) {
+    case ERROR_SUCCESS:
+        break;
+    default:
+        log_last_error(hInstall);
+        return nullptr;
+    }
+
+    return {buffer.data(), buffer.capacity()};
+}
+}
+
+extern "C" _declspec(dllexport) UINT __stdcall CopyClangResources(MSIHANDLE hInstall) {
+    UINT result = ERROR_SUCCESS;
+
+    // Get the runtime resource directory path
+    auto resourceDirectory = msi::get_property(hInstall, L"CustomActionData", result);
+    if (result != ERROR_SUCCESS) {
+        return result;
+    }
+    msi::log(hInstall, INSTALLMESSAGE_INFO, L"Swift runtime resources: " + resourceDirectory);
+
+    // Get the source and destination paths
+    std::filesystem::path resourcePath(resourceDirectory);
+    if (resourcePath.has_filename()) {
+        resourcePath = resourcePath.parent_path();
+    }
+    auto sourcePath = resourcePath.parent_path() / "clang";
+    auto destinationPath = resourcePath / "clang";
+
+    msi::log(hInstall, INSTALLMESSAGE_INFO, L"Clang resources: " + sourcePath.wstring());
+    msi::log(hInstall, INSTALLMESSAGE_INFO, L"Clang resources for Swift: " + destinationPath.wstring());
+
+    // Verify that Clang resources contain exactly one top-level directory
+    {
+        int directoryCount = 0, fileCount = 0;
+        for (const auto& entry : std::filesystem::directory_iterator(sourcePath)) {
+            if (entry.is_directory()) {
+                directoryCount++;
+                sourcePath = entry.path();
+            } else {
+                fileCount++;
+            }
+        }
+        if (directoryCount != 1 || fileCount != 0) {
+            msi::log(hInstall, INSTALLMESSAGE_ERROR | MB_OK, L"lib\\clang must contain exactly one directory.");
+            return ERROR_FILE_CORRUPT;
+        }
+    }
+    msi::log(hInstall, INSTALLMESSAGE_INFO, L"Detected Clang version: " + sourcePath.filename().wstring());
+
+    // Copy the contents of the single directory directly to the destination path
+    std::error_code error;
+    auto options = std::filesystem::copy_options::overwrite_existing | std::filesystem::copy_options::recursive;
+
+    std::filesystem::copy(sourcePath, destinationPath, options, error);
+    if (error) {
+        std::wstring errorMessage = L"Error during directory copy: " + get_error_message(error);
+        msi::log(hInstall, INSTALLMESSAGE_ERROR | MB_OK, errorMessage);
+        return ERROR_DISK_OPERATION_FAILED;
+    }
+
+    return result;
+}
+
+extern "C" _declspec(dllexport) UINT __stdcall RemoveClangResources(MSIHANDLE hInstall) {
+    UINT result = ERROR_SUCCESS;
+
+    // Get the directory path for removal
+    auto resourceDirectory = msi::get_property(hInstall, L"_usr_lib_swift", result);
+    if (result != ERROR_SUCCESS) {
+        return result;
+    }
+    msi::log(hInstall, INSTALLMESSAGE_INFO, L"Swift runtime resources: " + resourceDirectory);
+
+    std::filesystem::path resourcePath(resourceDirectory);
+    if (resourcePath.has_filename()) {
+        resourcePath = resourcePath.parent_path();
+    }
+    auto directoryPath = resourcePath / "clang";
+    msi::log(hInstall, INSTALLMESSAGE_INFO, L"Clang resources for Swift: " + directoryPath.wstring());
+
+    // Remove the directory and its contents
+    std::error_code error;
+    auto count = std::filesystem::remove_all(directoryPath, error);
+    if (error) {
+        std::wstring errorMessage = L"Error during directory removal: " + get_error_message(error);
+        msi::log(hInstall, INSTALLMESSAGE_ERROR | MB_OK, errorMessage);
+        return ERROR_DISK_OPERATION_FAILED;
+    } else if (count == 0) {
+        msi::log(hInstall, INSTALLMESSAGE_INFO, L"Clang resources for Swift doesn't exist!");
+    }
+
+    return result;
+}
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved) {
+    switch (ul_reason_for_call) {
+    case DLL_PROCESS_ATTACH:
+    case DLL_PROCESS_DETACH:
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        break;
+    }
+    return TRUE;
+}

platforms/Windows/CustomActions/CustomActions.vcxproj

@@ -0,0 +1,91 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="16.0">
+  <ItemGroup>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <ProjectGuid>{84027311-67A4-4351-AD3A-53529767BFA0}</ProjectGuid>
+    <RootNamespace>SwiftInstaller</RootNamespace>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+  <PropertyGroup>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <TargetName>CustomActions</TargetName>
+
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+
+    <PlatformToolset Condition="'$(PlatformToolset)' == ''">$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>$(PlatformToolset)</PlatformToolset>
+
+    <IntDir>.output\$(Configuration)\$(PlatformShortName)\obj\</IntDir>
+    <OutDir>.output\$(Configuration)\$(PlatformShortName)\bin\</OutDir>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PreprocessorDefinitions>VC_EXTRALEAN;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>msi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)' == 'Debug'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)' == 'Release'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <ItemGroup>
+    <ClCompile Include="CustomActions.cc" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Targets"/>
+</Project>

platforms/Windows/bld/bld.wixproj

@@ -12,6 +12,13 @@
     <PackageReference Include="WixToolset.Heat" Version="4.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\CustomActions\CustomActions.vcxproj">
+      <Name>CustomActions</Name>
+      <SetConfiguration>Configuration=Release</SetConfiguration>
+    </ProjectReference>
+  </ItemGroup>
+
   <ItemGroup>
     <HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\clang">
       <ComponentGroupName>ClangResources</ComponentGroupName>

platforms/Windows/bld/bld.wxs

@@ -348,5 +348,28 @@
 
       <ComponentGroupRef Id="EnvironmentVariables" />
     </Feature>
+
+    <!-- CustomActions -->
+    <Binary Id="CustomActions" SourceFile="$(CustomActions.TargetDir)\CustomActions.dll" />
+
+    <CustomAction Id="CopyClangResources.SetProperty"
+                  Property="CopyClangResources"
+                  Value="[_usr_lib_swift]" />
+    <CustomAction Id="CopyClangResources"
+                  BinaryRef="CustomActions"
+                  DllEntry="CopyClangResources"
+                  Execute="deferred"
+                  Impersonate="no"
+                  Return="check" />
+    <CustomAction Id="RemoveClangResources"
+                  BinaryRef="CustomActions"
+                  DllEntry="RemoveClangResources"
+                  Return="check" />
+
+    <InstallExecuteSequence>
+      <Custom Action="CopyClangResources.SetProperty" Before="CopyClangResources" />
+      <Custom Action="CopyClangResources" After="InstallFiles" Condition="NOT REMOVE" />
+      <Custom Action="RemoveClangResources" Before="RemoveFiles" Condition='REMOVE="ALL"' />
+    </InstallExecuteSequence>
   </Package>
 </Wix>