From 9854f90db756931747c21d91f22f3f78bfc13b27 Mon Sep 17 00:00:00 2001
From: LGUG2Z <LGUG2Z@fastmail.com>
Date: Thu, 5 Nov 2026 11:48:56 -0800
Subject: [PATCH] build(wix): the komorebi installer ships komorebi-recorder,
 which has no installer of its own

---
 komorebi-recorder/tests/packaging.rs | 118 +------------------------
 komorebi-recorder/wix/License.rtf    | Bin 4525 -> 0 bytes
 komorebi-recorder/wix/main.wxs       | 127 ---------------------------
 wix/main.wxs                         |  10 +++
 4 files changed, 13 insertions(+), 242 deletions(-)
 delete mode 100644 komorebi-recorder/wix/License.rtf
 delete mode 100644 komorebi-recorder/wix/main.wxs

diff --git a/komorebi-recorder/tests/packaging.rs b/komorebi-recorder/tests/packaging.rs
index d7bee2cf..6b94a03d 100644
--- a/komorebi-recorder/tests/packaging.rs
+++ b/komorebi-recorder/tests/packaging.rs
@@ -1,17 +1,10 @@
-//! The Windows installer (`wix/main.wxs`) has to ship every binary the crate builds and has to be
-//! its own product: `WiX` itself only runs on Windows, so these checks are what a Mac or Linux
+//! The recorder ships in the komorebi installer (`wix/main.wxs`), so that installer has to ship every
+//! binary this crate builds: `WiX` itself only runs on Windows, so this check is what a Mac or Linux
 //! machine can say about the installer.
 
 use std::path::Path;
 use std::path::PathBuf;
 
-/// komorebi's own installer: reusing its `UpgradeCode` would make the two products upgrade and
-/// uninstall each other.
-const KOMOREBI_UPGRADE_CODE: &str = "F8B967B5-7E7B-4E3A-895B-B789EC898B54";
-
-/// komorebi's `PATH` component, which the installer tracks the `PATH` entry by.
-const KOMOREBI_PATH_COMPONENT: &str = "6C6DF276-06C4-4675-BDED-48C5C2BC9BC5";
-
 fn repository() -> PathBuf {
     Path::new(env!("CARGO_MANIFEST_DIR"))
         .parent()
@@ -23,28 +16,6 @@ fn installer() -> String {
     std::fs::read_to_string(repository().join("wix/main.wxs")).expect("wix/main.wxs")
 }
 
-/// The value of attribute `name` on the first element of `tag` in the installer.
-fn attribute(text: &str, tag: &str, name: &str) -> String {
-    let start = text
-        .find(&format!("<{tag} "))
-        .unwrap_or_else(|| panic!("no <{tag}> in the installer"));
-    let element = &text[start..start + text[start..].find('>').expect("a closed tag")];
-    let key = format!("{name}='");
-    let value = element
-        .find(&key)
-        .unwrap_or_else(|| panic!("<{tag}> has no {name}"))
-        + key.len();
-    element[value..][..element[value..].find('\'').expect("a closed value")].to_string()
-}
-
-fn is_guid(text: &str) -> bool {
-    let parts: Vec<&str> = text.split('-').collect();
-    parts.iter().map(|part| part.len()).collect::<Vec<_>>() == [8, 4, 4, 4, 12]
-        && parts
-            .iter()
-            .all(|part| part.chars().all(|c| c.is_ascii_hexdigit()))
-}
-
 /// The binaries cargo builds for this crate: the package's own (`src/main.rs`) and one for each
 /// file in `src/bin`.
 fn binaries() -> Vec<String> {
@@ -68,7 +39,7 @@ fn binaries() -> Vec<String> {
 }
 
 #[test]
-fn every_binary_the_crate_builds_is_in_the_installer() {
+fn every_binary_the_crate_builds_is_in_the_komorebi_installer() {
     let text = installer();
     for name in binaries() {
         assert!(
@@ -81,86 +52,3 @@ fn every_binary_the_crate_builds_is_in_the_installer() {
         );
     }
 }
-
-#[test]
-fn the_installer_installs_nothing_the_crate_does_not_build() {
-    let text = installer();
-    let built = binaries();
-    for piece in text.split("Name='").skip(1) {
-        let name = &piece[..piece.find('\'').expect("a closed value")];
-        if let Some(binary) = name.strip_suffix(".exe") {
-            assert!(
-                built.iter().any(|built| built == binary),
-                "wix/main.wxs installs {name}, which this crate does not build"
-            );
-        }
-    }
-}
-
-#[test]
-fn the_installer_is_its_own_product() {
-    let text = installer();
-
-    let upgrade_code = attribute(&text, "Product", "UpgradeCode");
-    assert!(
-        is_guid(&upgrade_code),
-        "UpgradeCode is not a GUID: {upgrade_code}"
-    );
-    assert!(
-        !upgrade_code.eq_ignore_ascii_case(KOMOREBI_UPGRADE_CODE),
-        "UpgradeCode is komorebi's: the two products would replace each other"
-    );
-    assert_eq!(attribute(&text, "Product", "Name"), env!("CARGO_PKG_NAME"));
-
-    assert!(
-        !text
-            .to_uppercase()
-            .contains(&KOMOREBI_PATH_COMPONENT.to_uppercase()),
-        "the PATH component has komorebi's GUID"
-    );
-    let path_guid = attribute(&text, "Component Id='Path'", "Guid");
-    assert!(
-        is_guid(&path_guid),
-        "the PATH component's Guid: {path_guid}"
-    );
-}
-
-#[test]
-fn the_license_the_installer_shows_is_there_and_is_the_projects() {
-    let rtf = std::fs::read_to_string(repository().join("wix/License.rtf")).expect("License.rtf");
-    assert!(
-        rtf.contains("Komorebi License"),
-        "not the project's license"
-    );
-    assert!(rtf.contains("Version 2.0.0"), "not the project's license");
-    assert!(
-        installer().contains("wix\\License.rtf"),
-        "main.wxs does not refer to wix\\License.rtf"
-    );
-}
-
-#[test]
-fn the_installer_shows_the_icon_the_executables_carry() {
-    let text = installer();
-
-    let id = attribute(&text, "Icon", "Id");
-    let source = attribute(&text, "Icon", "SourceFile");
-    assert!(
-        text.contains(&format!("<Property Id='ARPPRODUCTICON' Value='{id}'")),
-        "Apps & features is not told to show the icon {id}"
-    );
-    assert!(
-        repository().join(source.replace('\\', "/")).is_file(),
-        "wix/main.wxs takes its icon from {source}, which is not there"
-    );
-
-    // the resource build.rs compiles into the executables names the same file
-    let resource =
-        std::fs::read_to_string(Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/watermelon.rc"))
-            .expect("assets/watermelon.rc");
-    let icon = source.rsplit('\\').next().expect("a file name");
-    assert!(
-        resource.contains(&format!("\"{icon}\"")),
-        "the executables carry an icon other than the installer's {icon}: {resource}"
-    );
-}
diff --git a/komorebi-recorder/wix/License.rtf b/komorebi-recorder/wix/License.rtf
deleted file mode 100644
index 3cc0c53300ef2af7cb004df6fc03d2a0154e09e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4525
zcmbtY!H(ND5bZfY{(;CI+8VB5JKGdRPeFpBiw12_qyd7c2U?<Rb|q3FDXVU<|K2wo
zQkJ|fdgw)1OXP6o&6_vF{am<EZwhI=j*qh2Z?@lVi%Qk?x-hoarENPI=tU#VezSi5
zJpWxQ`t`Y}tqEb*;E#1t`$2nO)SdgZE$Z?homXKkUOFwCA08f_KKWcMioG(*$zYxM
zO_v8%ZP#M6UaeQ#?ThW^fmXDw42QR_Xe;fz*9soCgOlBzsgwzu+uOBxD2`eU_u5pq
zMPF{j(<enIT~&CwU9St@Y`=SfXWKVn!+vdV3ku+SaU*`Vt#xXr#T#8J;}z}X{ZF5~
zSI%o|#1{Unryp)^#LKc&U67`n?YJ|-x=J|_tk|m{q&bO(4T~NQ<HJFDC4zFTUy76M
zMcaF<+dGvEVJFtKLVB^Y;UIi)x(veZ8oieR?s!<OL}^W>`6qVBreXhJ(d85U>cZz&
zwmUh!KZI++zB{P25xLkqX@ZabNgS28<xpxYfs?}9It<dCJ+G`#N99i8pv|7ci|66}
zpb^Y;6Mo1b2HQ6k`-y0k17(!Zrgks@oF-0v=_j6OBXkht2O#F{9Wd1)s7iFb>#SER
z@sl0ModmQz32T~@0FQv_t`BVA1G1dO(pE~?dhVwzOC*&7;@pUjud@YWM<UK2U$GlE
zqj`M%CL#9qg$u2`R{|A*7?I9wpAF<gUZu~Y{hPF5Vw9K=Nrc#p4VO5MuH;BLUEruN
zY5?}`9xRg{m?02=%?5H>FZpvVY~I1ocav<*C}f1Jn60vzBr($|Sl&Nz7o5|8W=sX8
z2s<BVXC*!$f4u)}Z<^!Mf&%{hCMGhHcWRU^5Z`k2%-EcyGrM-DNRN+?^1~(`W$6;d
zi+#L{pZ^!Y8Ld)rh_mOpE~ZC9%HGNVCCxmZe*9N|1lj=Y$%tPH0uVx<h*Fy1PaDcc
z>efd9c`v9~N|OyOiJCiwK0|e}YtG7&PFhCGk@HbG&QgK2^!}V%X8I-eZ@~m>K*Ha>
z^3zDi4?X0EqH&OE>B_@WsK0=qZV~P>DsNCe&^cJe7Kk)Ew6PkB1j2Sbq`DOM#tx0D
z_G(EP;8T6*s}p`ZeFT2I8+MfoQX4+uV0Vb5bM{YF2DAu??x&#X$er&sy@}4D8ED(5
z5bVw?ccfmljHI<acOGcCE;S)f{i1D^E75v|>^e9Yd&!c0&>q-v-15Kq@}ty_0G#57
zA`~q|=pc_uJgaF1EIt#l-S~*;thUBx$VM7DtOVGWTcbe3fS!RCkaS{8dzr~!toRl0
zX>344o8|I~9rQ;#MAkrEeM}HFd%`lH)%hBRs8`#X{h75<l6`!%MhVq;V2oXzLt{Y!
zz=d<ytetInf9#(`l0;iDer97Ou0^Zcu1U=-Iuql|7A^ruRf~b>a%{P)Q%^vTAv=Sk
zwrE7GJ+2>ed(^qyZ6UXb(HJgLhm4Nr1;kKdI2q-7j%^KS%+!D(cq9oC6EJa1{g`ZJ
zDlatnS!oz*PAhRY%|o0zaU`jmNA}8tz)(U$a`kvY=Gcdc%}7CNc+}~3>L8n%LWzk^
z2V5fjUfYHzF1E%`uuIh1VQ32wg@`mJAY!YoHNwMWLV&XpVZgx&u_}1?G1|nknBX{Q
zWEdi^Dq<PF@c{K`W?~~$8BtbY2VyZJYl0-RCW@<pQDnSPn8uSPLm5nuL5rzEdJD(F
z(YkM_LxYH#^kkgcMkm<-%^iVen9j)(A_G<NL3NQW7?vEg3#0%>94}3+EKS<5f#+LM
z$y03bSgiDs@FEOLjBQ-mGzmig;Lj{T-j5v57{hP*iIxU+c%$V`H#($(;!lgk;w98b
zqS{jvk^>!K2lzKD3W5YJ2)s<5LsZ#DEGg+|LWW?VedS3!wTG!93>xlJx^^TJvxY{z
zpc)}_6;wV>f=<U4Mgq>GPsTke6)Zzk*$eD6GW1{`FC5ExnF@^T(v^t5H)>CV7nRHk
z5U>S)0xU>~Hhh<uej%bS7EC1T77HK|A%ab$tLkA9PCycXF%E%*GUp-UY$jcDB3GiV
ztT<;|`OREMW1+JRd6c>#+#buutXvn154MM02RX#B2PRWCueuuVTG7?GXy)x>o0MN%
zdd-QQCR7<s4txpR;T-xkn!3U@)*p12x+>6#SDG;m*6pRye@9J$e@PsoD1ix>3z{C3
z%U8MSYC;~%V|R_>Yyp0}*^u^(ib`Azj=t4rAI>WfNelJMi;}v)?(`^>-(vBK?PRL7
z3O!QT0ata3k0^yE>T&%I7$|V1qADf8rN<RNRyAh2gb*hZV9<gNH!}QXF^)%(z(fOG
zH(-BkF2t42f^#(dL)wlus1!-`8e$V=a=a?S+vIChI+R&5jPoe_bjY=&W_?6f37_nL
ze$BTR$SXX}g$nmMl##R}?zu`YPQr`?`wSk4bG{T`y$(C|sn@ZFAlC`B)S$9k$v*yd
G^2I+zX-7u@

diff --git a/komorebi-recorder/wix/main.wxs b/komorebi-recorder/wix/main.wxs
deleted file mode 100644
index e2c4cb69..00000000
--- a/komorebi-recorder/wix/main.wxs
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='windows-1252'?>
-<!--
-  Copyright (C) 2017 Christopher R. Field.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-  The "cargo wix" subcommand provides a variety of predefined variables available
-  for customization of this template. The values for each variable are set at
-  installer creation time. The following variables are available:
-
-  TargetTriple      = The rustc target triple name.
-  TargetEnv         = The rustc target environment. This is typically either
-                      "msvc" or "gnu" depending on the toolchain downloaded and
-                      installed.
-  TargetVendor      = The rustc target vendor. This is typically "pc", but Rust
-                      does support other vendors, like "uwp".
-  CargoTargetBinDir = The complete path to the binary (exe). The default would
-                      be "target\release\<BINARY_NAME>.exe" where
-                      "<BINARY_NAME>" is replaced with the name of each binary
-                      target defined in the package's manifest (Cargo.toml). If
-                      a different rustc target triple is used than the host,
-                      i.e. cross-compiling, then the default path would be
-                      "target\<CARGO_TARGET>\<CARGO_PROFILE>\<BINARY_NAME>.exe",
-                      where "<CARGO_TARGET>" is replaced with the "CargoTarget"
-                      variable value and "<CARGO_PROFILE>" is replaced with the
-                      value from the `CargoProfile` variable.
-  CargoTargetDir    = The path to the directory for the build artifacts, i.e.
-                      "target".
-  CargoProfile      = Either "debug" or `release` depending on the build
-                      profile. The default is "release".
-  Version           = The version for the installer. The default is the
-                      "Major.Minor.Fix" semantic versioning number of the Rust
-                      package.
--->
-
-<!--
-  Please do not remove these pre-processor If-Else blocks. These are used with
-  the `cargo wix` subcommand to automatically determine the installation
-  destination for 32-bit versus 64-bit installers. Removal of these lines will
-  cause installation errors.
--->
-<?if $(sys.BUILDARCH) = x64 or $(sys.BUILDARCH) = arm64?>
-<?define PlatformProgramFilesFolder = "ProgramFiles64Folder"?>
-<?else ?>
-<?define PlatformProgramFilesFolder = "ProgramFilesFolder"?>
-<?endif ?>
-
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-
-  <!--
-    The identifiers below belong to this product alone. `UpgradeCode` is what lets a newer
-    installer replace an older one, and the GUID of the `Path` component is what the installer
-    tracks the PATH entry by; reusing either from another product (komorebi has its own) would
-    make the two upgrade and uninstall each other.
-  -->
-  <Product Id='*' Name='komorebi-recorder' UpgradeCode='720EAF41-F769-4E8D-8C47-9BD62A92F107' Manufacturer='LGUG2Z' Language='1033' Codepage='1252' Version='$(var.Version)'>
-
-    <Package Id='*' Keywords='Installer' Description='Synchronized screen, log and trace capture for komorebi bug reproduction' Manufacturer='LGUG2Z' InstallerVersion='500' Languages='1033' Compressed='yes' InstallScope='perMachine' SummaryCodepage='1252' />
-
-    <MajorUpgrade Schedule='afterInstallInitialize' DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.' />
-
-    <Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-    <Property Id='DiskPrompt' Value='komorebi-recorder Installation' />
-
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
-        <Directory Id='APPLICATIONFOLDER' Name='komorebi-recorder'>
-          <Component Id='License' Guid='*'>
-            <File Id='LicenseFile' Name='License.rtf' DiskId='1' Source='wix\License.rtf' KeyPath='yes' />
-          </Component>
-
-          <Directory Id='Bin' Name='bin'>
-            <Component Id='Path' Guid='F8CA04B7-C3A0-42D2-8C02-B38EBAA8842F' KeyPath='yes'>
-              <Environment Id='PATH' Name='PATH' Value='[Bin]' Permanent='no' Part='last' Action='set' System='yes' />
-            </Component>
-            <Component Id='binary0' Guid='*'>
-              <File Id='exe0' Name='komorebi-recorder.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebi-recorder.exe' KeyPath='yes' />
-            </Component>
-            <Component Id='binary1' Guid='*'>
-              <File Id='exe1' Name='komorebi-recorder-gui.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebi-recorder-gui.exe' KeyPath='yes' />
-            </Component>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <Feature Id='Binaries' Title='Application' Description='Installs all binaries and the license.' Level='1' ConfigurableDirectory='APPLICATIONFOLDER' AllowAdvertise='no' Display='expand' Absent='disallow'>
-      <ComponentRef Id='License' />
-
-      <ComponentRef Id='binary0' />
-
-      <ComponentRef Id='binary1' />
-
-      <Feature Id='Environment' Title='PATH Environment Variable' Description='Add the install location of the [ProductName] executable to the PATH system environment variable. This allows the [ProductName] executable to be called from any location.' Level='1' Absent='allow'>
-        <ComponentRef Id='Path' />
-      </Feature>
-    </Feature>
-
-    <SetProperty Id='ARPINSTALLLOCATION' Value='[APPLICATIONFOLDER]' After='CostFinalize' />
-
-    <Property Id='ARPHELPLINK' Value='https://github.com/LGUG2Z/komorebi-recorder' />
-
-    <!-- the icon of the entry in Apps & features; the executables carry the same one -->
-    <Icon Id='watermelon.ico' SourceFile='komorebi-recorder\assets\watermelon.ico' />
-    <Property Id='ARPPRODUCTICON' Value='watermelon.ico' />
-
-    <UI>
-      <UIRef Id='WixUI_FeatureTree' />
-    </UI>
-
-    <WixVariable Id='WixUILicenseRtf' Value='wix\License.rtf' />
-
-  </Product>
-
-</Wix>
diff --git a/wix/main.wxs b/wix/main.wxs
index 60f3deee..3a7a30ec 100644
--- a/wix/main.wxs
+++ b/wix/main.wxs
@@ -104,6 +104,12 @@
             <Component Id='binary5' Guid='*'>
               <File Id='exe5' Name='komorebi-shortcuts.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebi-shortcuts.exe' KeyPath='yes' />
             </Component>
+            <Component Id='binary6' Guid='*'>
+              <File Id='exe6' Name='komorebi-recorder.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebi-recorder.exe' KeyPath='yes' />
+            </Component>
+            <Component Id='binary7' Guid='*'>
+              <File Id='exe7' Name='komorebi-recorder-gui.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebi-recorder-gui.exe' KeyPath='yes' />
+            </Component>
           </Directory>
         </Directory>
       </Directory>
@@ -128,6 +134,10 @@
 
       <ComponentRef Id='binary5' />
 
+      <ComponentRef Id='binary6' />
+
+      <ComponentRef Id='binary7' />
+
       <Feature Id='Environment' Title='PATH Environment Variable' Description='Add the install location of the [ProductName] executable to the PATH system environment variable. This allows the [ProductName] executable to be called from any location.' Level='1' Absent='allow'>
         <ComponentRef Id='Path' />
       </Feature>