Alowing dynamic path to vcredist for Windows Installer, to make build…

…ing on CI easier - dvorka#965
wmhorne · Feb 14, 2019 · 50c8012 · 50c8012
1 parent 7cfa9a1
commit 50c8012
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build/build-installer.bat b/build/build-installer.bat
@@ -13,7 +13,7 @@ if "%ERRORLEVEL%" neq "0" goto :err
 echo ====================================
 echo Building MindForger installer
 echo ====================================
-"%MF_ICSS%" /Qp build\windows\installer\mindforger-setup.iss
+"%MF_ICSS%" /Qp /DVcRedistPath="%VC_REDIST_PATH%" build\windows\installer\mindforger-setup.iss
 if "%ERRORLEVEL%" neq "0" goto :err
 
 :end

diff --git a/build/env.bat b/build/env.bat
@@ -8,4 +8,4 @@ call "C:\software\Qt\5.12.0\msvc2017_64\bin\qtenv2.bat"
 set "PATH=%PATH%;c:\Program Files\CMake\bin;%MF_BASE%\deps\zlib-win\lib"
 :: set path to Inno Setup 5 script compiler
 set "MF_ICSS=c:\Program Files (x86)\Inno Setup 5\ISCC.exe"
-
+set "VC_REDIST_PATH=c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\vcredist_x64.exe"
diff --git a/build/windows/installer/mindforger-setup.iss b/build/windows/installer/mindforger-setup.iss
@@ -33,7 +33,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 
 [Files]
 Source: "..\..\..\\app\release\mindforger.exe"; DestDir: "{app}\bin"; Flags: ignoreversion 64bit
-Source: "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
+Source: "{#VcRedistPath}"; DestDir: "{tmp}"; Flags: deleteafterinstall
 Source: "..\..\..\app\release\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs
 Source: "..\..\..\doc\*"; DestDir: "{app}\Resources\mindforger-repository"; Flags: recursesubdirs
 Source: "..\..\..\deps\zlib-win\lib\zlibwapi.dll"; DestDir: "{app}\bin"