Use WiX for creating msi

Author: spoorcc

.github/workflows/build.yml

@@ -35,15 +35,27 @@ jobs:
           python-version: '3.13'
 
       - name: Set up Ruby
+        if: ${{ matrix.platform != 'windows-latest' }}
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.2   # or any version you need
 
       - name: Install fpm
+        if: ${{ matrix.platform != 'windows-latest' }}
         run: |
           gem install --no-document fpm
           fpm --version
 
+      - name: Add msbuild to PATH
+        if: ${{ matrix.platform == 'windows-latest' }}
+        uses: microsoft/setup-msbuild@v2
+      - name: Install WiX
+        if: ${{ matrix.platform == 'windows-latest' }}
+        run: |
+          dotnet tool install --global wix --version 6.0.2
+          echo "$env:USERPROFILE\.dotnet\tools" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          wix --version
+
       - name: ccache
         uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639 # v1.2
         if: ${{ matrix.platform != 'windows-latest' }}

script/package.py

@@ -3,6 +3,8 @@
 import shutil
 import subprocess
 import sys
+import uuid
+import xml.etree.ElementTree as ET
 from pathlib import Path
 
 from dfetch import __version__
@@ -95,33 +97,66 @@ def package_macos() -> None:
     run_command(cmd)
 
 
+def check_wix_installed():
+    """Check if WiX Toolset v4 is installed (candle.exe & light.exe)."""
+    wix = shutil.which("wix.exe")
+    if not wix:
+        print(
+            "Error: WiX Toolset v4 is required but not found.\n"
+            "Please install it from https://wixtoolset.org/releases/\n"
+            "and ensure 'wig.exe' is in your PATH."
+        )
+        sys.exit(1)
+
+
+def generate_wix_xml(build_dir: Path, output_wxs: Path) -> None:
+    """Generate a minimal WiX v4 XML including all files in build_dir."""
+    wix = ET.Element("Wix", xmlns="http://wixtoolset.org/schemas/v4/wxs")
+    package = ET.SubElement(
+        wix,
+        "Package",
+        Name=PACKAGE_NAME,
+        Manufacturer=MAINTAINER,
+        Version=__version__,
+        UpgradeCode=str(uuid.uuid4()),
+    )
+
+    ET.SubElement(package, "Files", Include=str(build_dir / "**"))
+
+    ET.SubElement(package, "Property", Id="ARPCOMMENTS", Value=DESCRIPTION)
+
+    tree = ET.ElementTree(wix)
+    tree.write(output_wxs, encoding="utf-8", xml_declaration=True)
+
+
+def generate_wix_proj(output_proj: Path, wix_file: Path) -> None:
+    """Generate a minimal WiX SDK project referencing the .wxs file."""
+    project = ET.Element("Project", Sdk="WixToolset.Sdk/6.0.2")
+
+    item_group = ET.SubElement(project, "ItemGroup")
+    ET.SubElement(item_group, "Wix", Include=str(wix_file))
+
+    tree = ET.ElementTree(project)
+    tree.write(output_proj, encoding="utf-8", xml_declaration=True)
+
+
 def package_windows() -> None:
-    """Package the build directory into a .msi installer for Windows."""
-    cmd = [
-        "fpm",
-        "-s",
-        "dir",
-        "-t",
-        "msi",
-        "-n",
-        PACKAGE_NAME,
-        "-v",
-        __version__,
-        "-C",
-        str(BUILD_DIR),
-        "--description",
-        DESCRIPTION,
-        "--maintainer",
-        MAINTAINER,
-        "--url",
-        URL,
-        "--license",
-        LICENSE,
-        "-p",
-        f"{OUTPUT_DIR}/{PACKAGE_NAME}_{__version__}.msi",
-        ".",
-    ]
-    run_command(cmd)
+    """Package the build directory into a .msi installer for Windows using WiX v4."""
+    OUTPUT_DIR.mkdir(parents=True, exist_ok=True)
+    wix_file = OUTPUT_DIR / f"{PACKAGE_NAME}.wxs"
+    wix_proj = OUTPUT_DIR / f"{PACKAGE_NAME}.wixproj"
+    msi_file = OUTPUT_DIR / f"{PACKAGE_NAME}_{__version__}.msi"
+
+    generate_wix_xml(BUILD_DIR, wix_file)
+    generate_wix_proj(wix_proj, wix_file)
+
+    check_wix_installed()
+
+    run_command(
+        ["dotnet", "build", str(wix_proj), "-c", "Release", "-o", str(OUTPUT_DIR)]
+    )
+
+    print(f"MSI generated at {msi_file}")
 
 
 def main() -> None: