misc tidy up.

Author: reevespaul

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

@@ -16,6 +16,8 @@
 ::
 ::=============================================================================
 @echo off
+@set SCRIPT_FULL_NAME=%~d0%~p0%~n0%~x0
+@set SCRIPT_SHORT_NAME=%~n0%~x0
 
 @goto :MAIN
 @goto :EOF
@@ -297,6 +299,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
 
 @echo   Copying other documentation...
 @copy  %FB_GEN_DIR%\readmes\installation_readme.txt %FB_OUTPUT_DIR%\doc\installation_readme.txt > nul
+@copy  %FB_GEN_DIR%\readmes\installation_scripted.txt %FB_OUTPUT_DIR%\doc\installation_scripted.txt > nul
 @copy %FB_OUTPUT_DIR%\doc\WhatsNew %FB_OUTPUT_DIR%\doc\WhatsNew.txt > nul
 @del %FB_OUTPUT_DIR%\doc\WhatsNew
 
@@ -675,7 +678,7 @@ goto :EOF
 :: errorlevel gets reset automatically so capture it before we lose it.
 @set ERRLEV=%ERRORLEVEL%
 @echo.
-@echo   Error %ERRLEV% in BuildExecutableInstall
+@echo   Error code %ERRLEV% in %SCRIPT_SHORT_NAME%
 @echo     %*
 @echo.
 ::End of ERROR

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

@@ -30,7 +30,7 @@
   o EnumerateObjectList;
      - Simple demonstration of object enumeration.
 
-  o Show Help   
+  o Show Help
     - CreateHelpDlg;
     - ShowHelpDlg: Integer;
     - CloseHelpDlg;

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

@@ -40,6 +40,17 @@
 ;     server. They must be stopped manually.
 ;
 ;
+;   Debugging this script
+;
+;   You need to run BuildExecutableInstall.bat to create the correct environment.
+;   If you have built firebird from run_all.bat you need to switch to the install
+;   script directory:
+;     pushd ..\install\arch-specific\win32
+;
+;   After that you should be able to compile and debug the script from the command
+;   line thus:
+;     "%INNO5_SETUP_PATH%"\compil32.exe FirebirdInstall_30.iss
+;
 ;
 #define MyAppPublisher "Firebird Project"
 #define MyAppURL "http://www.firebirdsql.org/"
@@ -511,7 +522,7 @@ Source: {#FilesDir}\help\*.*; DestDir: {app}\help; Components: DevAdminComponent
 Source: {#FilesDir}\include\*.*; DestDir: {app}\include; Components: DevAdminComponent; Flags: ignoreversion recursesubdirs createallsubdirs;
 Source: {#FilesDir}\intl\fbintl.dll; DestDir: {app}\intl; Components: ServerComponent; Flags: sharedfile ignoreversion;
 Source: {#FilesDir}\intl\fbintl.conf; DestDir: {app}\intl; Components: ServerComponent; Flags: onlyifdoesntexist
-Source: {#FilesDir}\lib\*.*; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion;
+Source: {#FilesDir}\lib\*.lib; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion;
 #if PlatformTarget == "x64"
 Source: {#WOW64Dir}\lib\*.lib; DestDir: {app}\WOW64\lib; Components: DevAdminComponent; Flags: ignoreversion
 #endif
@@ -649,8 +660,8 @@ 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 :-(
+//    (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;
@@ -1221,7 +1232,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;

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

@@ -72,7 +72,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.
 
 
@@ -107,6 +107,7 @@ HELP
 
     UseSuperServerTask,UseServiceTask,AutoStartTask,CopyFbClientToSysTask
 
+
 /MERGETASKS="comma separated list of task names"
 
   Like the /TASKS parameter, except the specified tasks will be merged

builds/win32/clean_all.bat

@@ -6,8 +6,8 @@
 set FB_CLEAN_SHARED=
 
 :: Read the command line
-for %%v in ( %* )  do (
-( if /I "%%v"=="REALCLEAN" (set FB_CLEAN_SHARED=1) )
+@for %%v in ( %* )  do (
+  ( if /I "%%v"=="REALCLEAN" (set FB_CLEAN_SHARED=1) )
 )
 
 @echo Cleaning temporary directories...
@@ -27,20 +27,20 @@ for %%v in ( %* )  do (
 
 :: Removing these might screw up parallel builds.
 :: So let's be sure we mean it.
-if defined FB_CLEAN_SHARED (
+@if defined FB_CLEAN_SHARED (
 
-@echo Cleaning icu Shared dirs...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\include
+  echo Cleaning icu Shared dirs...
+  rmdir /S /Q %FB_ROOT_PATH%\extern\icu\include
 
-@echo Cleaning zlib...
-@rmdir /S /Q %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM% 2>nul
-@del %FB_ROOT_PATH%\extern\zlib\zconf.h 2>nul
-@del %FB_ROOT_PATH%\extern\zlib\zlib.h 2>nul
+  echo Cleaning zlib...
+  rmdir /S /Q %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM% 2>nul
+  del %FB_ROOT_PATH%\extern\zlib\zconf.h 2>nul
+  del %FB_ROOT_PATH%\extern\zlib\zlib.h 2>nul
 
-@echo Cleaning shared gen and dsql files...
-@del %FB_ROOT_PATH%\src\include\gen\parse.h
-@del %FB_ROOT_PATH%\src\dsql\dsql.tab.h
-@del %FB_ROOT_PATH%\src\dsql\parse.cpp
+  echo Cleaning shared gen and dsql files...
+  del %FB_ROOT_PATH%\src\include\gen\parse.h
+  del %FB_ROOT_PATH%\src\dsql\dsql.tab.h
+  del %FB_ROOT_PATH%\src\dsql\parse.cpp
 
 )
 

builds/win32/make_examples.bat

@@ -50,7 +50,7 @@ if "%VS_VER%"=="msvc6" (
 
 @echo.
 :: Here we must use cd because isql does not have an option to set a base directory
-@cd %FB_GEN_DIR%\examples
+@pushd  %FB_GEN_DIR%\examples
 @echo   Creating empbuild.fdb...
 @echo.
 @del empbuild.fdb 2> nul
@@ -78,6 +78,7 @@ if defined FB2_INTLEMP (
 @%FB_BIN_DIR%\gpre.exe -r -m -n -z %FB_ROOT_PATH%\examples\empbuild\intlbld.e %FB_GEN_DIR%\examples\intlbld.c -b %FB_GEN_DB_DIR%/examples/
 )
 
+@popd
 @goto :EOF
 
 
@@ -142,10 +143,10 @@ if defined FB2_INTLEMP (
 :: the employee database.
 @set FIREBIRD=%FB_BIN_DIR%
 
-@cd %FB_GEN_DIR%\examples
+@pushd %FB_GEN_DIR%\examples
 @del %FB_GEN_DIR%\examples\employee.fdb 2>nul
 @%FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\empbuild\empbuild.exe %FB_GEN_DB_DIR%/examples/employee.fdb
-if errorlevel 44 (call :ERROR empbuild.exe failed - see %~n0.log for details & goto :EOF)
+if errorlevel 44 (call :ERROR empbuild.exe failed - see %~n0.log for details & popd & goto :EOF)
 
 @if defined FB2_INTLEMP (
   @echo Building intlemp.fdb
@@ -156,7 +157,7 @@ if errorlevel 44 (call :ERROR empbuild.exe failed - see %~n0.log for details & g
 )
 @set FIREBIRD=
 @set PATH=%FB_SAVE_PATH%
-@cd %FB_ROOT_PATH%\builds\win32
+@popd
 
 @goto :EOF
 

builds/win32/run_all.bat

@@ -8,6 +8,8 @@ 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=
 
 ::Check if on-line help is required
 for %%v in ( %1 %2 %3 %4 %5 %6 %7 %8 %9 )  do (
@@ -24,9 +26,13 @@ for %%v in ( %* )  do (
 ( if /I "%%v"=="PDB" (set FBBUILD_INCLUDE_PDB=1) )
 ( if /I "%%v"=="REPACK" (set FBBUILD_MAKE_KITS_ONLY=1) )
 ( if /I "%%v"=="JUSTBUILD" (set FBBUILD_BUILD_ONLY=1) )
+( if /I "%%v"=="TESTENV" (set FBBUILD_TEST_ONLY=1) )
 ( if /I "%%v"=="NO_RN" set FB_EXTERNAL_DOCS=)
+( if /I "%%v"=="NO_RN" set FBBUILD_PACKAGE_NUMBER=)
 )
 
+if defined FBBUILD_TEST_ONLY ( goto TEST_ENV & goto :EOF )
+
 if defined FBBUILD_MAKE_KITS_ONLY (goto :MAKE_KITS & goto :EOF)
 
 :: Go to work
@@ -46,13 +52,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
 
@@ -74,11 +80,27 @@ goto :END
 @echo.
 @echo    JUSTBUILD - Just build - don't create packages.
 @echo.
+@echo    TESTENV   - Sanity check - is Visual Studio available?.
+@echo                             - print the build variables that will be used
+@echo.
 @echo    NO_RN     - Do not fail the packaging if release notes unavailable.
 @echo                Default is to fail if FB_EXTERNAL_DOCS is set and release notes not found.
 @echo.
 @goto :EOF
 
+
+:TEST_ENV
+::===============================
+:: Show variables
+@call setenvvar.bat %*
+if "%ERRLEV%"=="1" goto :END
+for /F "tokens=2*" %%a in ( %FB_ROOT_PATH%\gen\jrd\build_no.h ) do ( SET %%a=%%~b )
+set > %FB_ROOT_PATH%\builds\install\arch-specific\win32\test_installer\fb_build_vars_%PROCESSOR_ARCHITECTURE%.txt
+type  %FB_ROOT_PATH%\builds\install\arch-specific\win32\test_installer\fb_build_vars_%PROCESSOR_ARCHITECTURE%.txt
+goto :END
+::---------
+
+
 :END
 
 if "%ERRLEV%"=="1" exit /b 1