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/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=
 
@@ -57,13 +58,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
 
@@ -118,31 +119,31 @@ goto :END
 ::===============================
 :: Set up the compiler environment
 
-if DEFINED VS170COMNTOOLS (
-@devenv /? >nul 2>nul
-@if errorlevel 9009 (call "%VS170COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS170COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
+@if DEFINED VS170COMNTOOLS (
+  devenv /? >nul 2>nul
+  if errorlevel 9009 (call "%VS170COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS170COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
 ) else (
-if DEFINED VS160COMNTOOLS (
-@devenv /? >nul 2>nul
-@if errorlevel 9009 (call "%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
-) else (
-if DEFINED VS150COMNTOOLS (
-@devenv /? >nul 2>nul
-@if errorlevel 9009 (call "%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
-) else (
-if DEFINED VS140COMNTOOLS (
-@devenv /? >nul 2>nul
-@if errorlevel 9009 (call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
-) else (
-if DEFINED VS120COMNTOOLS (
-@devenv /? >nul 2>nul
-@if errorlevel 9009 (call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
-) else (
-@goto :HELP
-)
-)
-)
-)
+  if DEFINED VS160COMNTOOLS (
+    devenv /? >nul 2>nul
+    if errorlevel 9009 (call "%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
+  ) else (
+    if DEFINED VS150COMNTOOLS (
+      devenv /? >nul 2>nul
+      if errorlevel 9009 (call "%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
+    ) else (
+      if DEFINED VS140COMNTOOLS (
+        devenv /? >nul 2>nul
+        if errorlevel 9009 (call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
+      ) else (
+        if DEFINED VS120COMNTOOLS (
+          devenv /? >nul 2>nul
+          if errorlevel 9009 (call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo    The file: & @echo      "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo    has already been executed.)
+        ) else (
+          goto :HELP
+        )
+      )
+    )
+  )
 )
 goto :END
 ::---------