From 4cb730bc9a967fa21aeeb0ad01a9d67c482bfea9 Mon Sep 17 00:00:00 2001
From: Matthew Maxwell <maxwellmattryan@gmail.com>
Date: Sat, 16 Nov 2024 03:37:23 -0600
Subject: [PATCH] Add step to move binaries on Windows

---
 .github/workflows/reusable.build.yml | 10 ++++++++--
 packaging/Rotor.iss                  | 19 +++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/reusable.build.yml b/.github/workflows/reusable.build.yml
index b87e393..327e817 100644
--- a/.github/workflows/reusable.build.yml
+++ b/.github/workflows/reusable.build.yml
@@ -74,11 +74,17 @@ jobs:
         run: |
           curl -LO "https://github.com/Tracktion/pluginval/releases/download/v1.0.3/pluginval_Windows.zip"
           7z x pluginval_Windows.zip
-          ./pluginval.exe --strictness-level 10 --verbose --validate "${{ env.VST3_PATH }}/Contents/x86_64-win/Rotor.vst3"
+          ./pluginval.exe --strictness-level 10 --verbose --validate "${{ env.VST3_PATH }}/Contents/x86_64-win/${{ env.PLUGIN_NAME }}.vst3"
+
+      - name: Move Binaries (Windows)
+        if: ${{ runner.os == 'Windows' }}
+        run: |
+          mkdir -p dist
+          mv "${{ env.VST3_PATH }}/Contents/x86_64-win/${{ env.PLUGIN_NAME }}.vst" dist
 
       - name: Upload VST3 (Windows)
         if: ${{ inputs.upload_artifacts && runner.os == 'Windows' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
-          path: ${{ env.VST3_PATH }}/Contents/x86_64-win/Rotor.vst3
+          path: dist
diff --git a/packaging/Rotor.iss b/packaging/Rotor.iss
index e58fc9c..4c71b97 100644
--- a/packaging/Rotor.iss
+++ b/packaging/Rotor.iss
@@ -10,18 +10,19 @@ Name: "custom"; Description: "Custom installation"; Flags: iscustom
 
 ; Components are used inside the script and can be composed of a set of Types
 [Components]
-name: "vst3"; Description: "VST3 plugin"; Types: standard custom
+name: "vst3"; Description: "VST3 Plugin (.vst3)"; Types: standard custom
 
 [Setup]
-ArchitecturesInstallIn64BitMode=x64compatible
-ArchitecturesAllowed=x64compatible
 AppName={#PluginName}
-OutputBaseFilename={#PluginName}-{#Version}-Windows
-AppCopyright=Copyright (C) {#Year} {#Publisher}
-AppPublisher={#Publisher}
 AppVersion={#Version}
+AppPublisher={#Publisher}
+AppCopyright=Copyright (C) {#Year} {#Publisher}
+ArchitecturesAllowed=x64compatible
+ArchitecturesInstallIn64BitMode=x64compatible
 DefaultDirName="{commoncf64}\VST3\{#PluginName}.vst3"
 DisableDirPage=yes
+OutputBaseFilename={#PluginName}-{#Version}-Windows
+UsePreviousAppDir=no
 
 ; READ THE FOLLOWING!
 LicenseFile="EULA"
@@ -29,9 +30,3 @@ LicenseFile="EULA"
 ; MSVC adds an .ilk file when building; it should be excluded
 [Files]
 Source: "..\{#PluginName}.vst3"; DestDir: "{commoncf64}\VST3\{#PluginName}.vst3"; Components: vst3
-
-[Run]
-Filename: "{cmd}"; \
-    WorkingDir: "{commoncf64}\VST3"; \
-    Parameters: "/C mklink /D ""{commoncf64}\VST3\{#PluginName}Data"" ""{commonappdata}\{#PluginName}"""; \
-    Flags: runascurrentuser; Components: vst3