From d1d60999ad91193a0186983c71a2fcfbb9c9dd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 16 Oct 2021 13:59:39 +0200
Subject: [PATCH] win_installer: update building. all files needed are
 collected in a single folder. the 'deploy' artifact will contain all the
 files.

---
 .github/workflows/release-windows.yml | 22 +++++++++++++++++++---
 win_installer/config.wxi              | 18 +++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
index c77e8a653..41d775e9d 100644
--- a/.github/workflows/release-windows.yml
+++ b/.github/workflows/release-windows.yml
@@ -81,11 +81,27 @@ jobs:
       - name: Build CLI x64 release configuration using MSBuild
         run: msbuild -m cppcheck.sln /t:cli /p:Configuration=Release-PCRE /p:Platform=x64
 
+      - name: Collect files
+        run: |
+          move Build\gui win_installer\files
+          mkdir win_installer\files\addons
+          copy addons\*.* win_installer\files\addons
+          mkdir win_installer\files\cfg
+          copy cfg\*.cfg win_installer\files\cfg
+          mkdir win_installer\files\platforms
+          copy platforms\*.xml win_installer\files\platforms
+          copy bin\cppcheck.exe win_installer\files
+          copy bin\cppcheck-core.dll win_installer\files
+          copy externals\z3\bin\libz3.dll win_installer\files
+          mkdir win_installer\files\help
+          xcopy /s gui\help win_installer\files\help
+          del win_installer\files\translations\*.qm
+          move gui\*.qm win_installer\files\translations
+
+
       - name: Build Installer
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          mkdir bin
-          xcopy /S Build\gui bin
           cd win_installer
           REM Read ProductVersion
           for /f "tokens=4 delims= " %%a in ('find "ProductVersion" productInfo.wxi') do set PRODUCTVER=%%a
@@ -102,4 +118,4 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: deploy
-          path: Build\gui
+          path: win_installer\files
diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index f37694229..c08a42042 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define CliBuildDir = "..\bin" ?>
-  <?define GuiBuildDir = "..\bin" ?>
-  <?define GuiHelpDir = "..\gui\help" ?>
-  <?define TranslationsDir = "..\gui" ?>
-  <?define CfgsDir = "..\cfg" ?>
-  <?define PtfsDir = "..\platforms" ?>
-  <?define AddonsDir = "..\addons" ?>
-  <?define QtDllDir = "..\bin" ?>
-  <?define Z3DllDir = "..\externals\z3\bin" ?>
+  <?define CliBuildDir = "files" ?>
+  <?define GuiBuildDir = "files" ?>
+  <?define GuiHelpDir = "files\help" ?>
+  <?define TranslationsDir = "files\translations" ?>
+  <?define CfgsDir = "files\cfg" ?>
+  <?define PtfsDir = "files\platforms" ?>
+  <?define AddonsDir = "files\addons" ?>
+  <?define QtDllDir = "files" ?>
+  <?define Z3DllDir = "files" ?>
 
   <?if $(var.Platform) = x64 ?>
     <?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x64.msm" ?>