Misc

Author: reevespaul

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

@@ -9,7 +9,7 @@ documentatation i18n should be available separately. I18n is a
 good thing, but bloating the installer with large amounts of translated
 documentation is not desirable. 
 
-The current version of InnoSetup used by Firebird - 5.5.8 - provides 
+The current version of InnoSetup used by Firebird - 6.2.1 - provides 
 generic support for the following languages:
 
 	BrazilianPortuguese, Catalan, Corsican, Czech, Danish, Dutch, Finnish, French,

builds/win32/msvc15/VCCRT_Shared_Body.wxi

@@ -1,34 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?><Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <Product Id="$(var.PRODUCT_ID)"
+
     Name="MSI to redistribute MS Visual Studio Runtime libraries for $(var.CPUArch)"
-	Language="1033"
-	Version="$(var.MS_CRT_VER)"
-	Manufacturer="$(var.MANUFACTURER)"
-	UpgradeCode="$(var.UPGRADE_CODE)"
-	>
+    Language = "1033"
+    Version = "$(var.MS_CRT_VER)"
+    Manufacturer = "$(var.MANUFACTURER)"
+    UpgradeCode = "$(var.UPGRADE_CODE)"
+    >
 
   <!-- NOTE - InstallerVersion is hard-coded to 405 - this indicates Windows
       Installer 4.5 is the minimum required version. Of course there is no
       product called Windows Installer on your computer. It is actually msiexec -->
-  <Package Id="$(var.PACKAGE_ID)"
-		Description="$(var.DESCRIPTION)"
-		Comments="$(var.COMMENTS)"
-		Manufacturer="$(var.MANUFACTURER)"
-		InstallerVersion="405"
-		Compressed="yes"
-		Platform="$(var.CPUArch)"
-	/>
-
-    <Media Id="1" Cabinet="VCCRT.cab" EmbedCab="yes"
-	/>
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Merge Id="CRT" Language="0" SourceFile="$(var.MSMDIR)\$(var.MSM)" DiskId="1"  />
+  <Package Id = "$(var.PACKAGE_ID)"
+        Description = "$(var.DESCRIPTION)"
+        Comments = "$(var.COMMENTS)"
+        Manufacturer = "$(var.MANUFACTURER)"
+        InstallerVersion = "405"
+        Compressed = "yes"
+        Platform = "$(var.CPUArch)"
+    />
+
+    <Media Id = "1" Cabinet="VCCRT.cab" EmbedCab = "yes"
+    />
+
+    <Directory Id = "TARGETDIR" Name = "SourceDir">
+      <Merge Id="CRT" Language = "0" SourceFile = "$(var.MSMDIR)\$(var.MSM)" DiskId = "1"  />
     </Directory>
 
-    <Feature Id="CRT_WinSXS" Title="CRT WinSXS" Level="1">
-      <MergeRef Id="CRT" />
+    <Feature Id="CRT_WinSXS" Title = "CRT WinSXS" Level = "1">
+      <MergeRef Id = "CRT" />
     </Feature>
 
     <InstallExecuteSequence>

builds/win32/run_all.bat

@@ -9,6 +9,7 @@ set FBBUILD_BUILDTYPE=release
 set FBBUILD_INCLUDE_PDB=
 set FBBUILD_MAKE_KITS_ONLY=
 set FBBUILD_BUILD_ONLY=0
+set FBBUILD_KITS=ISX ZIP
 set FBBUILD_TEST_ONLY=
 set FB2_SNAPSHOT=
 
@@ -61,13 +62,13 @@ if "%FBBUILD_BUILD_ONLY%"=="1" goto :END
 :MAKE_KITS
 :: Package everything up
 pushd ..\install\arch-specific\win32
-call BuildExecutableInstall ISX ZIP EMB %FBBUILD_BUILDTYPE%
+call BuildExecutableInstall %FBBUILD_KITS% %FBBUILD_BUILDTYPE%
 if "%ERRLEV%"=="1" (
   @echo Oops - some sort of error during packaging & popd & goto :END
 )
 if defined FBBUILD_INCLUDE_PDB (
   set /A FBBUILD_PACKAGE_NUMBER-=1
-  call BuildExecutableInstall ISX ZIP EMB %FBBUILD_BUILDTYPE% PDB
+  call BuildExecutableInstall %FBBUILD_KITS% %FBBUILD_BUILDTYPE% PDB
 )
 popd