From a138b7892d4b41a460b8dd8b9466f34e90f65469 Mon Sep 17 00:00:00 2001
From: Hansie Odendaal <39146854+hansieodendaal@users.noreply.github.com>
Date: Fri, 10 Nov 2023 14:05:22 +0200
Subject: [PATCH] fix: fix the windows installer auto build (#5939)

Description
---
Fixed the Windows installer auto-build, ~renamed `tari` to `minotari`~,
updated build script to use an environment variable

Motivation and Context
---
Name change

How Has This Been Tested?
---

What process can a PR reviewer use to test or verify this change?
---

<!-- Checklist -->
<!-- 1. Is the title of your PR in the form that would make nice release
notes? The title, excluding the conventional commit
tag, will be included exactly as is in the CHANGELOG, so please think
about it carefully. -->


Breaking Changes
---

- [x] None
- [ ] Requires data directory on base node to be deleted
- [ ] Requires hard fork
- [ ] Other - Please specify

<!-- Does this include a breaking change? If so, include this line as a
footer -->
<!-- BREAKING CHANGE: Description what the user should do, e.g. delete a
database, resync the chain -->
---
 .github/workflows/base_node_binaries.yml |  8 ++++----
 buildtools/windows_inno_installer.iss    | 10 ++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml
index c0acf132c9..99ed67771d 100644
--- a/.github/workflows/base_node_binaries.yml
+++ b/.github/workflows/base_node_binaries.yml
@@ -351,14 +351,14 @@ jobs:
         run: |
           cd buildtools
           call generate_config.bat
-          "%programfiles(x86)%\Inno Setup 6\iscc.exe" "/DMyAppVersion=${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer" "/DTariSuitePath=${{ github.workspace }}${{ env.TBN_DIST }}" "windows_inno_installer.iss"
+          "%programfiles(x86)%\Inno Setup 6\iscc.exe" "/DMyAppVersion=${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer" "/DMinotariSuite=env.TBN_FILENAME" "/DTariSuitePath=${{ github.workspace }}${{ env.TBN_DIST }}" "windows_inno_installer.iss"
           cd Output
           echo "Compute archive shasum"
-          ${{ env.SHARUN }} "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe" >> "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
+          ${{ env.SHARUN }} "env.TBN_FILENAME-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe" >> "env.TBN_FILENAME-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
           echo "Show the shasum"
-          cat "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
+          cat "env.TBN_FILENAME-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
           echo "Checkum verification archive is "
-          ${{ env.SHARUN }} --check "tari_suite-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
+          ${{ env.SHARUN }} --check "env.TBN_FILENAME-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.builds.name }}-installer.exe.sha256"
 
       - name: Artifact upload for Windows installer
         uses: actions/upload-artifact@v3
diff --git a/buildtools/windows_inno_installer.iss b/buildtools/windows_inno_installer.iss
index ab86bcf9f0..429af655cc 100644
--- a/buildtools/windows_inno_installer.iss
+++ b/buildtools/windows_inno_installer.iss
@@ -21,14 +21,13 @@
 ;      - "<path to console-mode compiler>\ISCC.exe" "/SSignTool=signtool sign
 ;         /tr http://timestamp.digicert.com /f "<path and filename of the certificate>"
 ;         /p <password used to create the certificate> $f"
-;         "/DMyAppVersion=<base node version>" "windows_inno_installer.iss"
+;         "/DMyAppVersion=<version>" "/DMinotariSuite=<suite>" "windows_inno_installer.iss"
 ;  (4) Windows shortcuts
 ;      - To edit any of the *.lnk* files, first copy their icons 
 ;        "<project_root>/buildtools/*.ico" to "%USERPROFILE%\temp\tari_icons"
 
 
 #define MyOrgName "Tari"
-;#define MyAppVersion "?.?.?-???????-release"
 #define MyAppPublisher "The Tari Development Community"
 #define MyAppURL "https://github.com/tari-project/tari"
 #define MyAppSupp "Tari Website"
@@ -49,7 +48,7 @@
 #define MergeMiningExeName "start_xmrig.bat"
 #define ReadmeName "README.txt"
 #ifndef TariSuitePath
-#define public TariSuitePath "..\target\release"
+  #define public TariSuitePath "..\target\release"
 #endif
 
 [Setup]
@@ -59,7 +58,6 @@
 AppId={{35C6E863-EDE5-4CBD-A824-E1418ECB1D1D}
 AppName={#MyOrgName} {#BaseNodeName}
 AppVersion={#MyAppVersion}
-;AppVerName={#BaseNodeName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppSuppURL}
@@ -68,7 +66,7 @@ DefaultDirName={userdocs}\..\.tari-testnet
 DefaultGroupName={#MyOrgName} - Testnet
 AllowNoIcons=yes
 LicenseFile=..\LICENSE
-OutputBaseFilename=tari_suite-{#MyAppVersion}
+OutputBaseFilename={#MinotariSuite}-{#MyAppVersion}
 SetupIconFile=.\tari_logo_black.ico
 Compression=lzma
 SolidCompression=yes
@@ -143,7 +141,7 @@ Name: "{group}\Start {#MergeMiningProxyName}"; Filename: "{app}\runtime\{#MergeM
 Name: "{group}\Start {#MergeMiningName}"; Filename: "{app}\runtime\{#MergeMiningExeName}"; WorkingDir: "{app}"
 Name: "{group}\Start {#TorServicesName}"; Filename: "{app}\runtime\{#TorServicesExeName}"; WorkingDir: "{app}"
 Name: "{group}\{#ReadmeName}"; Filename: "{app}\{#ReadmeName}"; WorkingDir: "{app}"
-Name: "{group}\{cm:ProgramOnTheWeb,{#BaseNodeName}}"; Filename: "{#MyAppURL}"
+Name: "{group}\{cm:TariGit,{#BaseNodeName}}"; Filename: "{#MyAppURL}"
 Name: "{group}\{cm:TariWeb,{#MyAppSupp}}"; Filename: "{#MyAppSuppURL}"
 Name: "{group}\{cm:UninstallProgram,{#MyOrgName} - Testnet}"; Filename: "{uninstallexe}"
 Name: "{userdesktop}\{#MyOrgName} {#AllName}"; Filename: "{app}\runtime\{#AllExeName}"; WorkingDir: "{app}"; Tasks: desktopicon