WiX: add custom action to remove Clang resources

Author: stevapple

platforms/Windows/CustomActions/CustomActions.cc

@@ -16,10 +16,10 @@ void log_last_error(MSIHANDLE hInstall) noexcept {
     (void)MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR, record);
 }
 
-std::wstring get_action_data(MSIHANDLE hInstall, UINT &result) noexcept {
+std::wstring get_property(MSIHANDLE hInstall, std::wstring name, UINT &result) noexcept {
     DWORD size = 0;
 
-    result = MsiGetPropertyW(hInstall, L"CustomActionData", L"", &size);
+    result = MsiGetPropertyW(hInstall, name.c_str(), L"", &size);
     switch (result) {
     case ERROR_MORE_DATA:
         break;
@@ -35,7 +35,7 @@ std::wstring get_action_data(MSIHANDLE hInstall, UINT &result) noexcept {
     buffer.resize(size + 1);
 
     size = buffer.capacity();
-    result = MsiGetPropertyW(hInstall, L"CustomActionData", buffer.data(), &size);
+    result = MsiGetPropertyW(hInstall, name.c_str(), buffer.data(), &size);
     switch (result) {
     case ERROR_SUCCESS:
         break;
@@ -52,7 +52,7 @@ extern "C" _declspec(dllexport) UINT __stdcall CopyClangResources(MSIHANDLE hIns
     UINT result = ERROR_SUCCESS;
 
     // Get the runtime resource directory path
-    auto resourceDirectory = msi::get_action_data(hInstall, result);
+    auto resourceDirectory = msi::get_property(hInstall, L"CustomActionData", result);
     if (result != ERROR_SUCCESS) {
         return result;
     }
@@ -101,6 +101,31 @@ extern "C" _declspec(dllexport) UINT __stdcall CopyClangResources(MSIHANDLE hIns
     return result;
 }
 
+extern "C" _declspec(dllexport) UINT __stdcall RemoveClangResources(MSIHANDLE hInstall) {
+    UINT result = ERROR_SUCCESS;
+
+    // Get the directory path for removal
+    auto directory = msi::get_property(hInstall, L"_usr_lib_swift_clang", result);
+    if (result != ERROR_SUCCESS) {
+        return result;
+    }
+    std::filesystem::path directoryPath(directory);
+    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::string errorMessage = "Error during directory removal: " + error.message();
+        msi::log(hInstall, INSTALLMESSAGE_ERROR | MB_OK, {errorMessage.begin(), errorMessage.end()});
+        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:

platforms/Windows/toolchain-amd64.wxs

@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Package
       Language="1033"
       Manufacturer="swift.org"
@@ -72,6 +72,8 @@
                       </Directory>
                     </Directory>
                     <Directory Id="_usr_lib_swift" Name="swift">
+                      <Directory Id="_usr_lib_swift_clang" Name="clang">
+                      </Directory>
                       <Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
                       </Directory>
                       <Directory Id="_usr_lib_swift_migrator" Name="migrator">
@@ -589,10 +591,15 @@
                   Execute="deferred"
                   Impersonate="no"
                   Return="check" />
+    <CustomAction Id="RemoveClangResources"
+                  BinaryRef="CustomActions"
+                  DllEntry="RemoveClangResources"
+                  Impersonate="no" />
 
     <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>

platforms/Windows/toolchain-arm64.wxs

@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Package
       Language="1033"
       Manufacturer="swift.org"
@@ -72,6 +72,8 @@
                       </Directory>
                     </Directory>
                     <Directory Id="_usr_lib_swift" Name="swift">
+                      <Directory Id="_usr_lib_swift_clang" Name="clang">
+                      </Directory>
                       <Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
                       </Directory>
                       <Directory Id="_usr_lib_swift_migrator" Name="migrator">
@@ -589,10 +591,15 @@
                   Execute="deferred"
                   Impersonate="no"
                   Return="check" />
+    <CustomAction Id="RemoveClangResources"
+                  BinaryRef="CustomActions"
+                  DllEntry="RemoveClangResources"
+                  Impersonate="no" />
 
     <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>