From 04073a896bcfcd972c98cc704fce4d0914c271ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 30 May 2020 23:19:27 +0200
Subject: [PATCH] Windows release: tweaks

---
 .github/workflows/release-windows.yml | 5 +++--
 win_installer/config.wxi              | 5 +++--
 win_installer/cppcheck.wxs            | 4 ++++
 win_installer/productInfo.wxi         | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
index af1c4dba1..9037e5fe6 100644
--- a/.github/workflows/release-windows.yml
+++ b/.github/workflows/release-windows.yml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Build x64 release GUI
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" 
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           cd gui
           qmake HAVE_QCHART=yes
           nmake release
@@ -78,10 +78,11 @@ jobs:
 
       - 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
-          msbuild -m cppcheck.wixproj /p:Platform=x64,ProductVersion=0.123
+          msbuild -m cppcheck.wixproj /p:Platform=x64,ProductVersion=2.0.${{ github.run_number }}
 
       - uses: actions/upload-artifact@v2
         with:
diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index cc670efa3..fc95836b8 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -7,12 +7,13 @@
   <?define PtfsDir = "..\platforms" ?>
   <?define AddonsDir = "..\addons" ?>
   <?define QtDllDir = "..\bin" ?>
+  <?define Z3DllDir = "..\externals\z3\bin" ?>
 
   <?if $(var.Platform) = x64 ?>
-    <?define CrtMergeModule = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Redist\MSVC\14.25.28508\MergeModules\Microsoft_VC142_CRT_x64.msm" ?>
+    <?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x64.msm" ?>
     <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
   <?else?>
-    <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC142_CRT_x86.msm" ?>
+    <?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x86.msm" ?>
     <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
   <?endif?>
 </Include>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index f2fd519b1..4339f65d0 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -20,6 +20,9 @@
           <Component Id='cppcheckcore.dll' Guid='$(var.cppcheckcoreGUID)'>
             <File Id='cppcheckcore.dll' Name='cppcheck-core.dll' DiskId='1' Source='$(var.CliBuildDir)\cppcheck-core.dll' KeyPath='yes' />
           </Component>
+          <Component Id='libz3.dll' Guid='$(var.libz3GUID)'>
+            <File Id='libz3.dll' Name='libz3.dll' DiskId='1' Source='$(var.Z3DllDir)\libz3.dll' KeyPath='yes' />
+          </Component>
           <Component Id='cppcheck.exe' Guid='$(var.cppcheckGUID)'>
             <File Id='cppcheck.exe' Name='cppcheck.exe' DiskId='1' Source='$(var.CliBuildDir)\cppcheck.exe' KeyPath='yes' />
           </Component>
@@ -142,6 +145,7 @@
       Display='expand' Level='1' AllowAdvertise='no' ConfigurableDirectory='INSTALLDIR' >
       <Feature Id='CppcheckCore' Display='hidden' AllowAdvertise='no' Title='Cppcheck-Core' Description='Cppcheck core components' Level='1'>
         <ComponentRef Id='cppcheckcore.dll' />
+        <ComponentRef Id='libz3.dll' />
         <ComponentRef Id='RegistryEntries' />
         <ComponentRef Id='BaseDocs' />
         <ComponentRef Id='MandatoryCfgs' />
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index c6e1a97a3..9dc788c52 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -10,6 +10,7 @@
   <?define ProductUpgradeCode = "7E94124C-1CD1-433F-9423-4614E52300DD" ?>
   <?define cppcheckGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a48" ?>
   <?define cppcheckcoreGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a49" ?>
+  <?define libz3GUID = "5d603179-e59a-4c47-b0aa-531ab1f6456b" ?>
   <?define addonsGUID = "25DACF7E-4D29-890D-433F-6922A391C312" ?>
   <?define guiGUID = "D7D3FF8E-1D82-4215-B59B-4715A748C540" ?>
   <?define qtplatformsGUID = "E2C326DF-11F1-4C05-A955-2E2D2A3B0515" ?>