Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

ci: the .msi finds its icon from the repository root

Jareer8ef9e20c3e57
diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml
index 6d5ade6b..7626de98 100644
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/build-app.yml
@@ -637,7 +637,7 @@ jobs:
# And the .msi, with WiX, for the machines an administrator
# deploys to. See assets/windows/concat.wxs.
dotnet tool install --global wix --version $env:WIX_VERSION | Out-Null
- wix build -arch ${{ matrix.wix }} "-d" "Version=$env:VERSION" "-d" "Stage=$PWD\stage\$name" `
+ wix build -arch ${{ matrix.wix }} "-d" "Version=$env:VERSION" "-d" "Root=$PWD" "-d" "Stage=$PWD\stage\$name" `
-o "stage\$name.msi" assets\windows\concat.wxs
if ($LASTEXITCODE -ne 0) { throw "WiX failed with $LASTEXITCODE" }
if (-not (Test-Path "stage\$name.msi")) { throw "stage\$name.msi is not there" }
diff --git a/assets/windows/concat.wxs b/assets/windows/concat.wxs
index 98db8db0..f7e104aa 100644
--- a/assets/windows/concat.wxs
+++ b/assets/windows/concat.wxs
@@ -8,8 +8,12 @@
Group Policy, Intune, winget - and it installs for the machine, into
Program Files, with a Start menu entry and a clean uninstall. Handed in:
- wix build -arch x64 -d Version=0.2.2 -d Stage=C:\...\stage\Concat-0.2.2-windows-x86_64
+ wix build -arch x64 -d Version=0.2.2 -d Root=C:\...\Concat
+ -d Stage=C:\...\stage\Concat-0.2.2-windows-x86_64
-o stage\Concat-0.2.2-windows-x86_64.msi assets\windows\concat.wxs
+
+ Root is the repository: WiX resolves a source path against where it is
+ run from, not against this file.
-->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- One upgrade code for the life of the product, so a newer .msi
@@ -23,7 +27,7 @@
<MajorUpgrade DowngradeErrorMessage="A newer version of Concat is already installed." />
<MediaTemplate EmbedCab="yes" />
- <Icon Id="concat.ico" SourceFile="..\icons\concat.ico" />
+ <Icon Id="concat.ico" SourceFile="$(var.Root)\assets\icons\concat.ico" />
<Property Id="ARPPRODUCTICON" Value="concat.ico" />
<Property Id="ARPURLINFOABOUT" Value="https://github.com/jub0t/Concat" />