misc tidy up

Author: reevespaul

builds/install/arch-specific/win32/BuildExecutableInstall.bat

@@ -163,7 +163,7 @@ if "%FB2_SNAPSHOT%"=="1" (
 )
 
 :: Set up our final destination
-set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
+@set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
 @if not exist "%FBBUILD_INSTALL_IMAGES%" ( mkdir "%FBBUILD_INSTALL_IMAGES%" )
 
 :: Determine Product Status
@@ -223,6 +223,7 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
 @if not exist %FB_OUTPUT_DIR%\system32 (
   mkdir %FB_OUTPUT_DIR%\system32
 )
+
 :: Note the confusion of RT library numbers here! These notes, as of time of
 :: writing 2021-12-21, are accurate for current versions of Visual Studio
 :: - 2017, 2019, 2022. Basic MS runtime version is v140. Except that is only
@@ -390,10 +391,12 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do (
   if not exist %FB_OUTPUT_DIR%\system32\vccrt%MSVC_RUNTIME_LIBRARY_VERSION%_%FB_TARGET_PLATFORM%.msi (
     "%WIX%\bin\candle.exe" -v -sw1091 %FB_ROOT_PATH%\builds\win32\msvc%MSVC_VERSION%\VCCRT_%FB_TARGET_PLATFORM%.wxs -out %FB_GEN_DIR%\vccrt_%FB_TARGET_PLATFORM%.wixobj
     if ERRORLEVEL 1 (
-        ( call :ERROR Could not generate wixobj for MSVC Runtime MSI ) & ( goto :EOF )
+      call :ERROR Could not generate wixobj for MSVC Runtime MSI %MSVC_RUNTIME_LIBRARY_VERSION%  &  goto :EOF
     ) else (
-        "%WIX%\bin\light.exe" -sw1076 %FB_GEN_DIR%\vccrt_%FB_TARGET_PLATFORM%.wixobj -out %FB_OUTPUT_DIR%\system32\vccrt%MSVC_RUNTIME_LIBRARY_VERSION%_%FB_TARGET_PLATFORM%.msi
-        if ERRORLEVEL 1 ( ( call :ERROR Could not generate MSVCC Runtime MSI %MSVC_RUNTIME_LIBRARY_VERSION% ) & ( goto :EOF ) )
+      "%WIX%\bin\light.exe" -sw1076 %FB_GEN_DIR%\vccrt_%FB_TARGET_PLATFORM%.wixobj -out %FB_OUTPUT_DIR%\system32\vccrt%MSVC_RUNTIME_LIBRARY_VERSION%_%FB_TARGET_PLATFORM%.msi
+      if ERRORLEVEL 1 (
+        call :ERROR Could not generate MSVCC Runtime MSI %MSVC_RUNTIME_LIBRARY_VERSION% & goto :EOF
+      )
     )
   ) else (
     echo   Using an existing build of %FB_OUTPUT_DIR%\system32\vccrt%MSVC_RUNTIME_LIBRARY_VERSION%_%FB_TARGET_PLATFORM%.msi

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

@@ -726,6 +726,7 @@ begin
 end;
 
 
+
 function InitializeSetup(): Boolean;
 var
   i: Integer;
@@ -749,9 +750,9 @@ begin
 
   if ((pos('HELP',Uppercase(CommandLine)) > 0) or
     (pos('--',Uppercase(CommandLine)) > 0) )
-//	or
-//    (pos('/?',Uppercase(CommandLine)) > 0) or		// InnoSetup displays its own help if these switches are passed.
-//    (pos('/H',Uppercase(CommandLine)) > 0) ) 		// Note also that our help scren only appears after the Choose Language dialogue :-(
+//  or
+//    (pos('/?',Uppercase(CommandLine)) > 0) or // InnoSetup displays its own help if these switches are passed.
+//    (pos('/H',Uppercase(CommandLine)) > 0) )  // Note also that our help screen only appears after the Choose Language dialogue :-(
   then begin
     ShowHelpDlg;
     result := False;
@@ -1157,7 +1158,7 @@ begin
       //Move lang specific readme from doc dir to root of install.
       if NonDefaultLanguage then begin
         ReadMeFileStr := ExpandConstant('{cm:ReadMeFile}');
-        if FileCopy(GetAppPath+'\doc\'+ReadMeFileStr, GetAppPath+'\'+ReadMeFileStr, false) then
+        if CopyFile(GetAppPath+'\doc\'+ReadMeFileStr, GetAppPath+'\'+ReadMeFileStr, false) then
           DeleteFile(GetAppPath+'\doc\'+ReadMeFileStr);
       end;
 
@@ -1306,7 +1307,7 @@ begin
   Result := True;
   case CurPageID of
     AdminUserPage.ID : begin
-    { check user has entered new sysdba password correctly. }
+      { check user has entered new sysdba password correctly. }
       i := CompareStr(AdminUserPage.Values[0],AdminUserPage.Values[1]);
       If  not (i = 0) then begin
         Result := False;