WiX installer: Allow v1.0 to coexist with v0.20

- Changed UpgradeCode to distinguish v1.x from v0.x products
- Replaced MajorUpgrade with custom Upgrade element for v1.x only
- Set fixed ProductCode for v1.x family (enables upgrades within v1.x)
- Automatic version-based folder naming (DataLab_v{major} / DataLab {major}.{minor})
- Updated makewxs.py to generate install/display folder names from version

This allows v0.20 and v1.0+ to be installed side-by-side while ensuring
v1.x versions properly upgrade each other (v1.0.1 replaces v1.0.0, etc.)

Author: PierreRaybaut

wix/generic-DataLab.wxs

@@ -1,8 +1,16 @@
 <!-- Copyright (c) DataLab Platform Developers, BSD 3-Clause license, see LICENSE file. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
     xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-    <Package Name="DataLab" ProductCode="4ad79deb-5cf7-481c-a242-28c66b8a53ef" Language="1033" Version="{version}" Codepage="1252" Manufacturer="DataLab Platform Developers" UpgradeCode="538c2966-2bcd-4bd4-b20a-9acb161a1614" InstallerVersion="200" Scope="perUserOrMachine">
-        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <Package Name="DataLab" ProductCode="b9f2e8d4-7c3a-4f1b-9e6d-5a8c2f1b4e9a" Language="1033" Version="{version}" Codepage="1252" Manufacturer="DataLab Platform Developers" UpgradeCode="e7a3f5c1-9d84-4b2a-a6f1-2c5d8e9b7a31" InstallerVersion="200" Scope="perUserOrMachine">
+        <Upgrade Id="e7a3f5c1-9d84-4b2a-a6f1-2c5d8e9b7a31">
+            <UpgradeVersion Minimum="1.0.0" Maximum="{version}" IncludeMinimum="yes" IncludeMaximum="no" OnlyDetect="no" Property="PREVIOUSVERSIONSINSTALLED" />
+            <UpgradeVersion Minimum="{version}" OnlyDetect="yes" Property="NEWERVERSIONDETECTED" />
+        </Upgrade>
+        <CustomAction Id="PreventDowngrade" Error="A newer version of [ProductName] is already installed." />
+        <InstallExecuteSequence>
+            <Custom Action="PreventDowngrade" After="FindRelatedProducts" Condition="NEWERVERSIONDETECTED" />
+            <RemoveExistingProducts After="InstallInitialize" />
+        </InstallExecuteSequence>
         <Icon Id="DataLab.exe" SourceFile=".\resources\DataLab.ico" />
         <Icon Id="DataLabResetIcon" SourceFile=".\resources\DataLab-Reset.ico" />
         <WixVariable Id="WixUILicenseRtf" Value=".\wix\license.rtf" />
@@ -28,12 +36,12 @@
             <Custom Action="PreviousVersionFoundMsg" After="CostInitialize" Condition="NSIS_UNINSTALL_STRING" />
         </InstallUISequence>
         <StandardDirectory Id="ProgramFilesFolder">
-            <Directory Id="INSTALLFOLDER" Name="DataLab">
+            <Directory Id="INSTALLFOLDER" Name="{install_folder_name}">
                 <!-- Automatically inserted directories -->
             </Directory>
         </StandardDirectory>
         <StandardDirectory Id="ProgramMenuFolder">
-            <Directory Id="ApplicationProgramsFolder" Name="DataLab" />
+            <Directory Id="ApplicationProgramsFolder" Name="{display_folder_name}" />
         </StandardDirectory>
     </Fragment>
     <Fragment>
@@ -43,11 +51,11 @@
             </Component>
             <!-- Automatically inserted components -->
             <Component Id="PC_Shortcuts" Directory="ApplicationProgramsFolder" Guid="858c3c36-978e-4edb-a2c3-cf5c91588bcf">
-                <Shortcut Id="ApplicationStartMenuShortcut" Name="DataLab" Description="DataLab" Target="[INSTALLFOLDER]\DataLab.exe" WorkingDirectory="INSTALLFOLDER" />
-                <Shortcut Id="ResetApplicationStartMenuShortcut" Name="Reset DataLab" Description="Resets DataLab configuration" Target="[INSTALLFOLDER]\DataLab.exe" Arguments="--reset" WorkingDirectory="INSTALLFOLDER" Icon="DataLabResetIcon" />
-                <Shortcut Id="UninstallProductShortcut" Name="Uninstall DataLab" Description="Uninstalls DataLab" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" WorkingDirectory="INSTALLFOLDER" />
+                <Shortcut Id="ApplicationStartMenuShortcut" Name="{display_folder_name}" Description="{display_folder_name}" Target="[INSTALLFOLDER]\DataLab.exe" WorkingDirectory="INSTALLFOLDER" />
+                <Shortcut Id="ResetApplicationStartMenuShortcut" Name="Reset {display_folder_name}" Description="Resets {display_folder_name} configuration" Target="[INSTALLFOLDER]\DataLab.exe" Arguments="--reset" WorkingDirectory="INSTALLFOLDER" Icon="DataLabResetIcon" />
+                <Shortcut Id="UninstallProductShortcut" Name="Uninstall {display_folder_name}" Description="Uninstalls {display_folder_name}" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" WorkingDirectory="INSTALLFOLDER" />
                 <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" />
-                <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\DataLab" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+                <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\{install_folder_name}" Name="installed" Type="integer" Value="1" KeyPath="yes" />
             </Component>
         </ComponentGroup>
     </Fragment>

wix/makewxs.py

@@ -64,6 +64,16 @@ def make_wxs(product_name: str, version: str) -> None:
     version_msi = re.sub(r"\.dev\d+$", ".0", version_msi)
     version_msi = re.sub(r"(rc|a|b)\d+$", ".0", version_msi)
 
+    # Generate version-based names for folders
+    # Extract major.minor version (e.g., "1.0" from "1.0.0")
+    major_minor = ".".join(version_msi.split(".")[:2])
+    # Extract major version for technical folder name (e.g., "1" from "1.0.0")
+    major_version = version_msi.split(".")[0]
+    # Technical folder name: "DataLab_v1"
+    install_folder_name = f"{product_name}_v{major_version}"
+    # User-friendly folder name: "DataLab 1.0"
+    display_folder_name = f"{product_name} {major_minor}"
+
     wix_dir = osp.abspath(osp.dirname(__file__))
     proj_dir = osp.join(wix_dir, os.pardir)
     dist_dir = osp.join(proj_dir, "dist", product_name)
@@ -152,6 +162,8 @@ def make_wxs(product_name: str, version: str) -> None:
     wxs = insert_text_after(dir_str, "<!-- Automatically inserted directories -->", wxs)
     wxs = insert_text_after(comp_str, "<!-- Automatically inserted components -->", wxs)
     wxs = wxs.replace("{version}", version_msi)
+    wxs = wxs.replace("{install_folder_name}", install_folder_name)
+    wxs = wxs.replace("{display_folder_name}", display_folder_name)
     with open(output_path, "w", encoding="utf-8") as fd:
         fd.write(wxs)
     print("Successfully created:", output_path)