Fix #8407 InnoSetup based installer deletes msiexec log of runtime libraries install

Fix #8408 Add option to disable install of MS VCRT runtime libraries via a scripted install

Author: reevespaul

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

@@ -275,6 +275,7 @@
 #define debug_str=""
 #endif
 
+#define InstallTimeStamp GetDateTimeString('yyyymmdd-hhnnss','','')
 
 [Setup]
 AppName={#MyAppName}
@@ -398,9 +399,9 @@ Name: CopyFbClientAsGds32Task; Description: {cm:CopyFbClientAsGds32Task}; Compon
 [Run]
 ; due to the changes required to support MSVC15 support for earlier versions is now broken.
 #if Int(msvc_runtime_major_version,14) >= 14
-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;
+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;
 #if PlatformTarget == "x64"
-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;
+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;
 #endif
 #endif
 
@@ -655,6 +656,10 @@ Var
 
   init_secdb: integer;          // Is set to UNDEFINED by default in InitializeSetup
 
+  msilogdir: String;               // Path to store logs from msiexec
+
+  novcrt: Boolean;              // Do not install the VC runtime libs
+
 #ifdef setuplogging
 // Not yet implemented - leave log in %TEMP%
 //  OkToCopyLog : Boolean;        // Set when installation is complete.
@@ -715,13 +720,17 @@ begin
   if pos('FORCE',Uppercase(CommandLine)) > 0 then
     ForceInstall:=True;
 
+  if pos('NOMSVCRT', Uppercase(CommandLine) ) > 0 then
+    novcrt := true;
 
-    cmdParams := TStringList.create;
-    for i:=0 to ParamCount do begin
-      cmdParams.add(ParamStr(i));
-      if pos('SYSDBAPASSWORD', Uppercase(ParamStr(i)) ) > 0 then
-        SYSDBAPassword := Copy(ParamStr(i),Length('/SYSDBAPASSWORD=')+1,Length(ParamStr(i))-Length('/SYSDBAPASSWORD=') );
-    end;
+  cmdParams := TStringList.create;
+  for i:=0 to ParamCount do begin
+    cmdParams.add(ParamStr(i));
+    if pos('SYSDBAPASSWORD', Uppercase(ParamStr(i)) ) > 0 then
+      SYSDBAPassword := SplitKeyValue( ParamStr(i), false );
+    if pos('MSILOGDIR', Uppercase( ParamStr(i) ) ) > 0 then
+      msilogdir := SplitKeyValue( ParamStr(i), false );
+  end;
 #ifdef iss_debug
     ShowDebugDlg(cmdParams.text,'');
 #endif
@@ -1261,6 +1270,26 @@ begin
   end;
 end;
 
+function MsiexecLogDir( nullstr: String ): String;
+begin
+  if msilogdir = '' then
+    msilogdir := ExpandConstant('{tmp}');
+  Result := msilogdir;
+end;
+
+function InstallVCRT: boolean;
+begin
+  if novcrt then begin
+    Result := false;
+    exit;
+  end;
+  if HasNotWI30 then
+    Result := false
+  else
+    Result := true;
+
+end;
+
 begin
 end.
 

builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc

@@ -53,6 +53,7 @@ Function Prototypes
   function GetInstalledVersion(BinaryFile: String): Array of Integer;
   function ConvertIBVerStrToFbVerStr( VerStr: String) : String;
   function GetRegistryEntry(RegKey, RegEntry: string): String;
+  function SplitKeyValue( AString: String; theKey: Boolean): String;
 
  *)
 
@@ -477,4 +478,26 @@ begin
       RegQueryStringValue(RootKey, RegKey, RegEntry, Result);
 end;
 
+
+// Split a key value pair in two and return the value by default
+function SplitKeyValue( AString: String; theKey: Boolean): String;
+var
+ apos: integer;
+ akey: String;
+ avalue: String;
+begin
+  Result := '';
+  apos := pos( '=', AString );
+  if apos <> 0 then begin
+    akey := Copy( Astring, 1, apos - 1 );
+    aValue := Copy ( AString, apos + 1, length (Astring) - apos );
+  end;
+  if theKey then 
+    Result := aKey
+  else 
+    Result := aValue;
+end;
+
+
+
 // kate: replace-tabs on; indent-width 2; tab-width 2; replace-tabs-save on; syntax Pascal;

builds/install/arch-specific/win32/installation_scripted.txt

@@ -41,6 +41,8 @@ HELP
 /MERGETASKS="comma separated list of task names"
 /SYSDBAPASSWORD="masterkey"
 /FORCE
+/MSILOGDIR="Path to log output from installation of VC runtimes."
+/NOMSVCRT
 
 Setup parameters specific to the Firebird Uninstaller
 /CLEAN
@@ -72,7 +74,7 @@ HELP
 
   would be required for a client only install.
 
-  NOTE - If a full server install is required there is no need to 
+  NOTE - If a full server install is required there is no need to
   specify /COMPONENTS. All three are chosen by default.
 
 
@@ -137,6 +139,29 @@ HELP
   Its your choice.
 
 
+/MSILOGDIR="Path to log output from installation of the redistributable
+  VC runtime libraries."
+
+  This is to help debug problems arising from running the vc runtime
+  installer. There is no need to set this unless installation of the
+  runtimes causes the installation of Firebird to trigger a reboot of
+  Windows. The log may help debug the problem.
+
+
+/NOMSVCRT
+
+  Set this to disable installation of the redistributable MS VCRT
+  runtime libraries that are included in the Firebird binary installer.
+  Firebird comes with a stripped down set of the redistributable runtime
+  libraries. If you wish to deploy the libraries via another means then
+  you may use this switch to exclude installation of the MSI runtime
+  libraries that are provided by the Firebird project.
+
+  In general use of this switch is not recommended unless you have
+  problems with installation of the runtimes requiring a reboot of
+  Windows. Excluding their installation may prevent Firebird from
+  running if the required libraries are not available.
+
 
 Parameters specific to Firebird uninstalls
 ------------------------------------------