From af3374ffe78858cb63761fa40dc26ea2e9e5bd15 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Sat, 9 Nov 2024 12:02:06 +0200
Subject: [PATCH] Add Microsoft Visual C++ Redistributable installation support

---
 .github/workflows/release.yml   |   9 ++--
 res/windows/wix/bundle.wxs      |  92 ++++++++++++++++++++++++++++++++
 res/windows/wix/icon.png        | Bin 0 -> 8132 bytes
 res/windows/wix/space-acres.wxs |  16 ------
 4 files changed, 98 insertions(+), 19 deletions(-)
 create mode 100644 res/windows/wix/bundle.wxs
 create mode 100644 res/windows/wix/icon.png

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 97f145b..f88b448 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -323,6 +323,9 @@ jobs:
           # & "C:\Program Files (x86)\WiX Toolset v3.11\bin\heat.exe" dir target\wix\gtk4 -gg -sfrag -template:fragment -out target\wix\gtk4.wxs -cg GTK -dr GTK
           
           cargo wix --target ${{ matrix.build.target }} --profile production --no-build --nocapture
+          # Create bundle with Microsoft Visual C++ Redistributable in it
+          Remove-Item target\wix\space-acres.wixobj -Confirm:$false
+          cargo wix --profile release --no-build --nocapture --include res\windows\wix\bundle.wxs -C -ext -C WixBalExtension
 
           Remove-Item target\wix\gtk4 -Recurse -Confirm:$false -ErrorAction SilentlyContinue
         if: runner.os == 'Windows'
@@ -333,7 +336,7 @@ jobs:
           
           dotnet tool install --global AzureSignTool
 
-          (Get-ChildItem -Path target\wix -Include space-acres-*.msi -Recurse) | ForEach-Object {
+          (Get-ChildItem -Path target\wix -Include space-acres-*.exe -Recurse) | ForEach-Object {
             Write("Signing $($_)");
           
             AzureSignTool sign --azure-key-vault-url "${{ secrets.AZURE_KEY_VAULT_URI }}" --azure-key-vault-client-id "${{ secrets.AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.AZURE_TENANT_ID }}" --azure-key-vault-certificate "${{ secrets.AZURE_CERT_NAME }}" --file-digest sha512 --timestamp-rfc3161 http://timestamp.digicert.com -v $($_);
@@ -433,7 +436,7 @@ jobs:
         with:
           name: installer-${{ matrix.build.suffix }}
           path: |
-            target/wix/*.msi
+            target/wix/*.exe
           if-no-files-found: error
         if: runner.os == 'Windows'
 
@@ -442,6 +445,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
-          asset_paths: '["target/wix/*.msi"]'
+          asset_paths: '["target/wix/*.exe"]'
         if: runner.os == 'Windows' && github.event_name == 'push' && github.ref_type == 'tag'
 
diff --git a/res/windows/wix/bundle.wxs b/res/windows/wix/bundle.wxs
new file mode 100644
index 0000000..1879155
--- /dev/null
+++ b/res/windows/wix/bundle.wxs
@@ -0,0 +1,92 @@
+<?xml version='1.0' encoding='windows-1252'?>
+<!--
+  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 directory containing the
+                      binaries (exes) to include. The default would be
+                      "target\release\". If an explicit rustc target triple is
+                      used, i.e. cross-compiling, then the default path would
+                      be "target\<CARGO_TARGET>\<CARGO_PROFILE>",
+                      where "<CARGO_TARGET>" is replaced with the "CargoTarget"
+                      variable value and "<CARGO_PROFILE>" is replaced with the
+                      value from the "CargoProfile" variable. This can also
+                      be overridden manually with the "target-bin-dir" flag.
+  CargoTargetDir    = The path to the directory for the build artifacts, i.e.
+                      "target".
+  CargoProfile      = The cargo profile used to build the binaries
+                      (usually "debug" or "release").
+  Version           = The version for the installer. The default is the
+                      "Major.Minor.Fix" semantic versioning number of the Rust
+                      package.
+-->
+
+<?if $(var.Platform) = "x64" ?>
+    <?define Arch = "x86_64" ?>
+<?else ?>
+    <?define Arch = "arm64" ?>
+<?endif ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'
+     xmlns:bal='http://schemas.microsoft.com/wix/BalExtension'
+     xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'>
+    <Bundle
+        Name='Space Acres'
+        IconSourceFile='res\windows\space-acres.ico'
+        UpgradeCode='ba3cd06f-3967-4bdf-ae00-aa538249fd5a'
+        Manufacturer='Nazar Mokrynskyi'
+        Version='$(var.Version)'>
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense" >
+            <bal:WixStandardBootstrapperApplication
+                LicenseUrl=""
+                LogoFile="res\windows\wix\icon.png"
+                SuppressOptionsUI="yes"
+            />
+        </BootstrapperApplicationRef>
+
+        <!-- Microsoft Visual C++ 2015-2022 Redistributable (x64) runtime msi package version -->
+        <util:ProductSearch
+            Id="VCRedistVersionFound"
+            Result="version"
+            Variable="VCRedistVersionFound"
+            UpgradeCode="36F68A90-239C-34DF-B58C-64B30153CE35" />
+
+        <!-- Microsoft Visual C++ 2015-2022 Redistributable version -->
+        <Variable Name="VCRedistVersionDesired" Type="version" Value="14.40.33816.0" />
+
+        <Chain>
+            <MsiPackage
+                Id="SpaceAcres"
+                Compressed="yes"
+                SourceFile="$(var.CargoTargetDir)\wix\space-acres-$(var.Version)-$(var.Arch).msi"
+                DisplayInternalUI="yes"
+                Visible="no"
+            />
+
+            <ExePackage
+                Id="vc_redist.x64.exe"
+                Name="vc_redist.x64.14.40.33816.0.exe"
+                Cache="no"
+                Compressed="no"
+                PerMachine="yes"
+                Permanent="yes"
+                DetectCondition="VCRedistVersionFound >= VCRedistVersionDesired"
+                DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/368cc6bf-087b-49f9-93e6-ab05b70a58e0/814E9DA5EC5E5D6A8FA701999D1FC3BADDF7F3ADC528E202590E9B1CB73E4A11/VC_redist.x64.exe"
+                InstallCommand="/install /passive /norestart" >
+                <RemotePayload
+                    ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33816"
+                    Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33816"
+                    Version="14.40.33816.0"
+                    Hash="ba92a00f0f55dcae85c1bbd098efe606bd080b3c"
+                    Size="25502344" />
+            </ExePackage>
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/res/windows/wix/icon.png b/res/windows/wix/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e067b219c4b25e5ecd19f6a6bfa42f4fcc8fdf2c
GIT binary patch
literal 8132
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

literal 0
HcmV?d00001

diff --git a/res/windows/wix/space-acres.wxs b/res/windows/wix/space-acres.wxs
index ea8deff..9606911 100644
--- a/res/windows/wix/space-acres.wxs
+++ b/res/windows/wix/space-acres.wxs
@@ -1,20 +1,4 @@
 <?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