Skip to content

Commit 156fc59

Browse files
committed
Add rest of commit related to logging msvcrt install
1 parent c454147 commit 156fc59

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

builds/install/arch-specific/win32/FirebirdInstall.iss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@
291291
#define debug_str=""
292292
#endif
293293

294+
#define InstallTimeStamp GetDateTimeString('yyyymmdd-hhnnss','','')
294295

295296
[Setup]
296297
AppName={#MyAppName}
@@ -423,11 +424,11 @@ Name: CopyFbClientAsGds32Task; Description: {cm:CopyFbClientAsGds32Task}; Compon
423424
; due to the changes required to support MSVC15 support for earlier versions is now broken.
424425
#if Int(msvc_runtime_major_version,14) >= 14
425426
#if PlatformTarget != "arm64"
426-
Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_Win32.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_Win32.log"" "; StatusMsg: "Installing MSVC 32-bit runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
427+
Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_Win32.msi"" /l*v ""{code:MsiexecLogDir}\vccrt{#msvc_runtime_library_version}_Win32-{#InstallTimeStamp}.log"" "; StatusMsg: "Installing MSVC 32-bit runtime libraries to system directory"; Check: InstallVCRT; Components: ClientComponent;
427428
#elif PlatformTarget == "x64"
428-
Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_x64.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_x64.log"" "; StatusMsg: "Installing MSVC 64-bit runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
429+
Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_x64.msi"" /l*v ""{code:MsiexecLogDir}\vccrt{#msvc_runtime_library_version}_x64-{#InstallTimeStamp}.log"" "; StatusMsg: "Installing MSVC 64-bit runtime libraries to system directory"; Check: InstallVCRT; Components: ClientComponent;
429430
#elif PlatformTarget == "arm64"
430-
; Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_arm64.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_arm64.log"" "; StatusMsg: "Installing MSVC ARM64 runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
431+
;Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_arm64.msi"" /L*v ""{code:MsiexecLogDir}\vccrt{#msvc_runtime_library_version}_arm64-{#InstallTimeStamp}.log"" "; StatusMsg: "Installing MSVC ARM64 runtime libraries to system directory"; Check: InstallVCRT; Components: ClientComponent;
431432
#endif
432433
#endif
433434

0 commit comments

Comments
 (0)