make_examples.bat (Firebird-3.0.2.32703-0.tar.bz2) | : | make_examples.bat (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 25 | skipping to change at line 25 | |||
::set FB2_INTLEMP=1 | ::set FB2_INTLEMP=1 | |||
::=========== | ::=========== | |||
:MAIN | :MAIN | |||
@echo BUILD_EMPBUILD | @echo BUILD_EMPBUILD | |||
@call :BUILD_EMPBUILD | @call :BUILD_EMPBUILD | |||
@echo. | @echo. | |||
@echo Building %FB_OBJ_DIR% | @echo Building %FB_OBJ_DIR% | |||
if "%VS_VER%"=="msvc6" ( | if "%VS_VER%"=="msvc6" ( | |||
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2 examples_%F B_TARGET_PLATFORM%.log empbuild intlbld | @call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2 examples_%FB_ TARGET_PLATFORM%.log empbuild intlbld | |||
) else ( | ) else ( | |||
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird3_Examples em | @call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird3_Examples empb | |||
pbuild_%FB_TARGET_PLATFORM%.log empbuild | uild_%FB_TARGET_PLATFORM%.log empbuild | |||
@if defined FB2_INTLEMP ( | @if defined FB2_INTLEMP ( | |||
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird3_Examples | @call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird3_Examples in | |||
intlbuild_%FB_TARGET_PLATFORM%.log intlbuild | tlbuild_%FB_TARGET_PLATFORM%.log intlbuild | |||
) | ) | |||
if defined BUILD_UDRCPP_EXAMPLE ( | ||||
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird3_Examples ud rcpp_example_%FB_TARGET_PLATFORM%.log udrcpp_example | @call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird3_Examples ud rcpp_example_%FB_TARGET_PLATFORM%.log udrcpp_example | |||
if errorlevel 1 ( | ||||
@call :ERROR building udrcpp example failed - see make_examples_%FB_TARGET | ||||
_PLATFORM%.log for details | ||||
@goto :EOF | ||||
) | ||||
) | ||||
) | ) | |||
@echo. | @echo. | |||
@call :MOVE | @call :MOVE | |||
@call :BUILD_EMPLOYEE | @call :BUILD_EMPLOYEE | |||
@call :MOVE2 | @call :MOVE2 | |||
@goto :EOF | @goto :EOF | |||
::=========== | ::=========== | |||
:BUILD_EMPBUILD | :BUILD_EMPBUILD | |||
@echo. | @echo. | |||
skipping to change at line 144 | skipping to change at line 150 | |||
:: This allows us to use the new engine in embedded mode to build | :: This allows us to use the new engine in embedded mode to build | |||
:: the employee database. | :: the employee database. | |||
@set FIREBIRD=%FB_BIN_DIR% | @set FIREBIRD=%FB_BIN_DIR% | |||
@cd %FB_GEN_DIR%\examples | @cd %FB_GEN_DIR%\examples | |||
@del %FB_GEN_DIR%\examples\employee.fdb 2>nul | @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 | @%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 & g oto :EOF) | if errorlevel 44 (call :ERROR empbuild.exe failed - see %~n0.log for details & g oto :EOF) | |||
@if defined FB2_INTLEMP ( | @if defined FB2_INTLEMP ( | |||
@echo Building intlemp.fdb | @echo Building intlemp.fdb | |||
@del %FB_GEN_DIR%\examples\intlemp.fdb 2>nul | @del %FB_GEN_DIR%\examples\intlemp.fdb 2>nul | |||
@del isql.tmp 2>nul | @del isql.tmp 2>nul | |||
@echo s;intlemp.fdb;%SERVER_NAME%:%FB_GEN_DIR%\examples\intlemp.fdb;g > isql.t mp | @echo s;intlemp.fdb;%SERVER_NAME%:%FB_GEN_DIR%\examples\intlemp.fdb;g > isql.t mp | |||
@%FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\intlbuild\intlbuild.exe %FB_GEN_DB_DIR%/exam ples/intlemp.fdb | @%FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\intlbuild\intlbuild.exe %FB_GEN_DB_DIR%/exam ples/intlemp.fdb | |||
) | ) | |||
@set FIREBIRD= | @set FIREBIRD= | |||
@set PATH=%FB_SAVE_PATH% | @set PATH=%FB_SAVE_PATH% | |||
@cd %FB_ROOT_PATH%\builds\win32 | @cd %FB_ROOT_PATH%\builds\win32 | |||
@goto :EOF | @goto :EOF | |||
::============== | ::============== | |||
:MOVE2 | :MOVE2 | |||
@copy %FB_GEN_DIR%\examples\employee.fdb %FB_OUTPUT_DIR%\examples\empbuild\ > nu l | @copy %FB_GEN_DIR%\examples\employee.fdb %FB_OUTPUT_DIR%\examples\empbuild\ > nu l | |||
if defined FB2_INTLEMP ( | if defined FB2_INTLEMP ( | |||
if exist %FB_GEN_DIR%\examples\intlemp.fdb ( | if exist %FB_GEN_DIR%\examples\intlemp.fdb ( | |||
@copy %FB_GEN_DIR%\examples\intlemp.fdb %FB_OUTPUT_DIR%\examples\empbuild\ > n ul | @copy %FB_GEN_DIR%\examples\intlemp.fdb %FB_OUTPUT_DIR%\examples\empbuild\ > nul | |||
) | ) | |||
) | ) | |||
@goto :EOF | @goto :EOF | |||
::============== | ::============== | |||
:HELP_BOOT | :HELP_BOOT | |||
@echo. | @echo. | |||
@echo You must run make_boot.bat before running this script | @echo You must run make_boot.bat before running this script | |||
@echo. | @echo. | |||
End of changes. 5 change blocks. | ||||
9 lines changed or deleted | 16 lines changed or added |