wix4

Author: cmbant

scripts/create_windows_msi.py

@@ -4,13 +4,13 @@
 Uses the WiX Toolset v4 to create the installer.
 
 Requirements:
-    - .NET SDK 6.0 or later
     - WiX Toolset v4 installed as a .NET tool (dotnet tool install --global wix)
 
 Features:
-    - Creates a deterministic Product ID based on version number
+    - Includes all files and subdirectories from the input directory
     - Allows same-version upgrades to replace existing installations
     - Properly handles upgrades to prevent duplicate entries in Add/Remove Programs
+    - Creates start menu shortcuts
 
 Usage:
     python scripts/create_windows_msi.py --input-dir dist/GetDistGUI --output-dir dist --version 1.6.3
@@ -43,18 +43,6 @@ def find_version():
 def check_wix_installed():
     """Check if WiX Toolset v4 is installed"""
     try:
-        # First check if .NET SDK is installed
-        dotnet_result = subprocess.run(["dotnet", "--version"],
-                                     stdout=subprocess.PIPE,
-                                     stderr=subprocess.PIPE,
-                                     text=True,
-                                     check=False)
-
-        if dotnet_result.returncode != 0:
-            print(f".NET SDK check failed: {dotnet_result.stderr.strip()}")
-            print("ERROR: .NET SDK 6.0 or later is required for WiX v4")
-            return False
-
         # Try to run wix.exe to check if WiX v4 is installed
         result = subprocess.run(["wix", "--version"],
                                stdout=subprocess.PIPE,
@@ -78,8 +66,7 @@ def install_wix():
     """Provide instructions for installing WiX Toolset v4"""
     print("WiX Toolset v4 not found.")
     print("\nPlease install WiX Toolset v4 manually:")
-    print("1. Install the .NET SDK 6.0 or later")
-    print("2. Run: dotnet tool install --global wix --version 6.0.0")
+    print("Run: dotnet tool install --global wix --version 6.0.0")
     print("")
     return False
 
@@ -177,19 +164,36 @@ def create_wix_files(input_dir, version):
     # Use forward slashes for paths to avoid escaping issues
     input_dir_forward = input_dir.replace('\\', '/')
 
-    # Get a list of all files in the directory except GetDistGUI.exe
+    # Get a list of all files in the directory and subdirectories
     files = []
-    for file in os.listdir(input_dir):
-        if file != "GetDistGUI.exe" and os.path.isfile(os.path.join(input_dir, file)):
-            files.append(file)
+    file_id_counter = 1
+
+    # Walk through all directories and files
+    for root, _, filenames in os.walk(input_dir):  # Use _ to indicate unused variable
+        rel_dir = os.path.relpath(root, input_dir).replace('\\', '/')
+        if rel_dir == '.':
+            rel_dir = ''
+        else:
+            rel_dir += '/'
+
+        for filename in filenames:
+            if os.path.join(root, filename) == os.path.join(input_dir, "GetDistGUI.exe"):
+                continue  # Skip the main executable, it's handled separately
+
+            rel_path = rel_dir + filename
+            files.append((rel_path, file_id_counter))
+            file_id_counter += 1
 
     # Create component entries for each file
     file_components = ""
-    for i, file in enumerate(files):
-        file_id = f"File{i+1}"
+    for rel_path, id_num in files:
+        file_id = f"File{id_num}"
+        component_id = f"Component{id_num}"
+
+        # Add component for this file
         file_components += f"""
-            <Component Id="Component{i+1}" Guid="*">
-                <File Id="{file_id}" Source="{input_dir_forward}/{file}" KeyPath="yes" />
+            <Component Id="{component_id}" Guid="*">
+                <File Id="{file_id}" Source="{input_dir_forward}/{rel_path}" KeyPath="yes" />
             </Component>"""
 
     components_content = f"""<?xml version="1.0" encoding="UTF-8"?>