Browse Source

UCRT Path changes

George King 1 year ago
parent
commit
2242caede6
2 changed files with 18 additions and 10 deletions
  1. 9 1
      CI/wininstaller/build_installer.cmd
  2. 9 9
      CI/wininstaller/installer.iss

+ 9 - 1
CI/wininstaller/build_installer.cmd

@@ -23,7 +23,6 @@ for %%i in ("%BaseDir%") do set "BaseDir=%%~fi"
 
 REM Define specific subdirectories relative to the base directory
 set "SourceFilesPath=%BaseDir%bin\Release"
-set "UCRTFilesPath=%BaseDir%CI\wininstaller\ucrt"
 set "LangPath=%BaseDir%CI\wininstaller\lang"
 set "LicenseFile=%BaseDir%license.txt"
 set "IconFile=%BaseDir%clientapp\icons\vcmi.ico"
@@ -38,6 +37,15 @@ if exist "%WinDir%\SysWow64" (
     set "ProgFiles=%programfiles%"
 )
 
+REM Dynamically locate the UCRT path
+set "UCRTBasePath=%ProgFiles%\Windows Kits\10\Redist"
+set "UCRTFilesPath="
+for /d %%d in ("%UCRTBasePath%\*") do (
+    if exist "%%d\ucrt\DLLs" (
+        set "UCRTFilesPath=%%d\ucrt\DLLs"
+    )
+)
+
 REM Verify Inno Setup is installed
 if not exist "%ProgFiles%\Inno Setup %InnoSetupVer%\ISCC.exe" (
     echo.

+ 9 - 9
CI/wininstaller/installer.iss

@@ -18,17 +18,17 @@
 
 ; Manual preprocessor definitions are provided using ISCC.exe parameters.
 
-; #define AppVersion "1.6.1"
+; #define AppVersion "1.6.2"
 ; #define AppBuild "1122334455A"
-; #define InstallerArch "x86"
+; #define InstallerArch "x64"
 ; 
-; #define SourceFilesPath "C:\_VCMI_Source_v2\_files_x86"
-; #define UCRTFilesPath "C:\_VCMI_Source_v2\CI\wininstaller\ucrt"
-; #define LangPath "C:\_VCMI_Source_v2\CI\wininstaller\lang"
-; #define LicenseFile "C:\_VCMI_Source_v2\license.txt"
-; #define IconFile "C:\_VCMI_Source_v2\clientapp\icons\vcmi.ico"
-; #define SmallLogo "C:\_VCMI_Source_v2\CI\wininstaller\vcmismalllogo.bmp"
-; #define WizardLogo "C:\_VCMI_Source_v2\CI\wininstaller\vcmilogo.bmp"
+; #define SourceFilesPath "C:\_VCMI_source\bin\Release"
+; #define UCRTFilesPath "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.22621.0\ucrt\DLLs"
+; #define LangPath "C:\_VCMI_Source\CI\wininstaller\lang"
+; #define LicenseFile "C:\_VCMI_Source\license.txt"
+; #define IconFile "C:\_VCMI_Source\clientapp\icons\vcmi.ico"
+; #define SmallLogo "C:\_VCMI_Source\CI\wininstaller\vcmismalllogo.bmp"
+; #define WizardLogo "C:\_VCMI_Source\CI\wininstaller\vcmilogo.bmp"
 
 #define VCMIFolder "VCMI"