8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:40:38 +01:00

Use environment variables to encapsulate directory layout differences between VS2005 and earlier.

Use FB_GEN_DIR env var. to determin location of generated output.
Tidy up usage of FB_GEN_DB_DIR - only use with unix style paths.
Generate platform specific log files during build process.
This commit is contained in:
paul_reeves 2007-09-06 13:25:04 +00:00
parent 9f27bec84f
commit 674bfdb354
10 changed files with 147 additions and 122 deletions

View File

@ -1,6 +1,6 @@
@echo off
@cl -Ob2iytp -Gs -DWIN95 -W3 -G4 -Gd -MD -I..\..\src\include -I..\..\src\include\gen -DSUPERSERVER -DNOMSG -D_X86_=1 -DWIN32 -DI386 ..\..\src\misc\blrtable.cpp > blrtable.log 2>&1
@cl -Ob2iytp -Gs -DWIN95 -W3 -G4 -Gd -MD -I..\..\src\include -I..\..\src\include\gen -DSUPERSERVER -DNOMSG -D_X86_=1 -DWIN32 -DI386 ..\..\src\misc\blrtable.cpp > blrtable_%FB_TARGET_PLATFORM%.log 2>&1
@if errorlevel 1 goto :ERROR
@blrtable.exe > blrtable.h
@copy blrtable.h ..\..\src\include\gen\blrtable.h > nul

View File

@ -2,39 +2,62 @@
@call setenvvar.bat
@if errorlevel 1 (goto :END)
@echo Cleaning temporary directories
@echo Cleaning temporary directories...
@rmdir /S /Q %FB_OUTPUT_DIR% 2>nul
@rmdir /S /Q %FB_ROOT_PATH%\gen 2>nul
@rmdir /S /Q %FB_TEMP_DIR% 2>nul
@echo Cleaning INTL
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\bin 2>nul
@echo Cleaning gen...
@rmdir /S /Q %FB_GEN_DIR% 2>nul
@echo Cleaning INTL...
if defined FB_OBJ_DIR (
@echo Cleaning INTL %FB_OBJ_DIR% dirs...
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\%FB_OBJ_DIR%\bin 2>nul
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\%FB_OBJ_DIR%\lib 2>nul
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\%FB_OBJ_DIR% 2>nul
)
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\%FB_TARGET_PLATFORM% 2>nul
:: Removing this might screw up parallel builds.
:: So let's be sure we mean it.
if defined FB_CLEAN_SHARED (
@echo Cleaning INTL Shared dirs...
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\include 2>nul
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\lib 2>nul
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\source\data\out 2>nul
@del /Q %FB_ROOT_PATH%\extern\icu\source\extra\uconv\resources\*.res 2>nul
@del %FB_ROOT_PATH%\extern\icu\source\extra\uconv\pkgdatain.txt 2>nul
@del %FB_ROOT_PATH%\extern\icu\source\stubdata\stubdatabuilt.txt 2>nul
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\source\test\testdata\out 2>nul
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\source\tools\gencmn\decmn_Win32_Release 2>nul
@rmdir /S /Q %FB_ROOT_PATH%\extern\icu\source\tools\genrb\derb_Win32_Release 2>nul
)
::This really does clean the icu stuff - but is it too much? Not cleaning speeds
::up the build process if a previous build has been made for the same target.
::for /R %FB_ROOT_PATH%\extern\icu\source\ %%a in (release) do (rmdir /q /s "%%a" 2>nul)
::for /R %FB_ROOT_PATH%\extern\icu\source\ %%a in (debug) do (rmdir /q /s "%%a" 2>nul)
:: This really does clean the icu stuff - but is it too much? Cleaning less
:: thoroughly than this speeds up the build process if a previous build has been
:: made for the same target.
if defined FB_INTLREALCLEAN (
if defined FB_OBJ_DIR (
@echo Thoroughly scrubbing all remnants of INTL %FB_OBJ_DIR% dirs...
for /R %FB_ROOT_PATH%\extern\icu\source\ %%a in (%FB_OBJ_DIR%) do (rmdir /q /s "%%a" 2>nul)
)
set FB_INTLREALCLEAN=
)
@echo Cleaning install and build files
@echo Cleaning install and build files...
@del *%FB_TARGET_PLATFORM%.log 2>nul
@del *.manifest 2>nul
if defined FB_CLEAN_SHARED (
@echo Cleaning shared gen and dsql files...
@del %FB_ROOT_PATH%\src\include\gen\autoconfig.h 2>nul
@del %FB_ROOT_PATH%\src\include\gen\blrtable.h 2>nul
@del %FB_ROOT_PATH%\src\dsql\dsql.tab.h 2>nul
@del %FB_ROOT_PATH%\src\dsql\parse.cpp 2>nul
)
@del %FB_ROOT_PATH%\builds\win32\msvc6\*.plg 2>nul
@rmdir /s /q %FB_ROOT_PATH%\builds\win32\install_image 2>nul
@del %FB_ROOT_PATH%\src\dsql\dsql.tab.h 2>nul
@del %FB_ROOT_PATH%\src\dsql\parse.cpp 2>nul
@echo Completed executing %0
@echo.

View File

@ -5,10 +5,10 @@
@if "%1"=="msg" goto MSG
@if exist "%FB_DB_PATH%\gen\dbs\msg.fdb" del "%FB_DB_PATH%\gen\dbs\msg.fdb"
@if exist "%FB_GEN_DIR%\dbs\msg.fdb" del "%FB_GEN_DIR%\dbs\msg.fdb"
@echo create database '%FB_DB_PATH%\gen\dbs\msg.fdb'; | "%FB_ROOT_PATH%\gen\isql_embed" -q
@set FB_MSG_ISQL=@"%FB_ROOT_PATH%\gen\isql_embed" -q %FB_DB_PATH%\gen\dbs\msg.fdb -i %FB_ROOT_PATH%\src\msgs\
@echo create database '%FB_GEN_DB_DIR%/dbs/msg.fdb'; | "%FB_GEN_DIR%\isql_embed" -q
@set FB_MSG_ISQL=@"%FB_GEN_DIR%\isql_embed" -q %FB_GEN_DB_DIR%/dbs/msg.fdb -i %FB_ROOT_PATH%\src\msgs\
@%FB_MSG_ISQL%msg.sql
@%FB_MSG_ISQL%facilities2.sql
@echo.
@ -30,8 +30,9 @@
@if "%1"=="db" goto END
:MSG
@echo Building message file and codes header...
@%FB_ROOT_PATH%\gen\build_msg -f %FB_DB_PATH%/gen/firebird.msg -D %FB_DB_PATH%/gen/dbs/msg.fdb
@%FB_ROOT_PATH%\gen\codes %FB_ROOT_PATH%\src\include\gen %FB_ROOT_PATH%\lang_helpers
@echo Building message file...
@%FB_GEN_DIR%\build_msg -f %FB_GEN_DB_DIR%/firebird.msg -D %FB_GEN_DB_DIR%\dbs\msg.fdb
@echo Building codes header...
@%FB_GEN_DIR%\codes %FB_ROOT_PATH%\src\include\gen %FB_ROOT_PATH%\lang_helpers
:END

View File

@ -7,7 +7,9 @@ set ERRLEV=0
@if errorlevel 1 (call :ERROR Executing setenvvar.bat failed & goto :EOF)
:: verify that boot was run before
@if not exist %FB_ROOT_PATH%\gen\gpre_boot.exe (goto :HELP_BOOT & goto :EOF)
@if not exist %FB_GEN_DIR%\gpre_boot.exe (goto :HELP_BOOT & goto :EOF)
@call set_build_target.bat %*
@ -44,22 +46,23 @@ if errorlevel 1 call :ERROR build failed - see make_all_%FB_TARGET_PLATFORM%.log
@mkdir %FB_OUTPUT_DIR%\lib 2>nul
@mkdir %FB_OUTPUT_DIR%\system32 2>nul
@copy %FB_ROOT_PATH%\extern\icu\bin\icuuc30.dll %FB_OUTPUT_DIR%\bin >nul
@copy %FB_ROOT_PATH%\extern\icu\bin\icudt30.dll %FB_OUTPUT_DIR%\bin >nul
@copy %FB_ROOT_PATH%\extern\icu\bin\icuin30.dll %FB_OUTPUT_DIR%\bin >nul
for %%v in ( icuuc30 icudt30 icuin30 ) do (
@copy %FB_ICU_SOURCE_BIN%\%%v.dll %FB_OUTPUT_DIR%\bin >nul
)
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\* %FB_OUTPUT_DIR%\bin >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\intl\* %FB_OUTPUT_DIR%\intl >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\udf\* %FB_OUTPUT_DIR%\udf >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\system32\* %FB_OUTPUT_DIR%\system32 >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\fbclient\fbclient.lib %FB_OUTPUT_DIR%\lib\fbclient_ms.lib >nul
:: Firebird.conf, etc
@copy %FB_ROOT_PATH%\gen\firebird.msg %FB_OUTPUT_DIR% > nul
@copy %FB_GEN_DIR%\firebird.msg %FB_OUTPUT_DIR% > nul
@copy %FB_ROOT_PATH%\builds\install\misc\firebird.conf %FB_OUTPUT_DIR% >nul
@copy %FB_ROOT_PATH%\builds\install\misc\fbintl.conf %FB_OUTPUT_DIR%\intl >nul
:: DATABASES
@copy %FB_ROOT_PATH%\gen\dbs\SECURITY2.FDB %FB_OUTPUT_DIR%\security2.fdb >nul
@copy %FB_ROOT_PATH%\gen\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul
::@copy %FB_ROOT_PATH%\gen\firebird.msg %FB_OUTPUT_DIR%\firebird.msg >nul
@copy %FB_GEN_DIR%\dbs\SECURITY2.FDB %FB_OUTPUT_DIR%\security2.fdb >nul
@copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul
::@copy %FB_GEN_DIR%\firebird.msg %FB_OUTPUT_DIR%\firebird.msg >nul
@copy %FB_ROOT_PATH%\builds\misc\security.gbak %FB_OUTPUT_DIR%\security2.fbk > nul
:: DOCS
::@copy %FB_ROOT_PATH%\ChangeLog %FB_OUTPUT_DIR%\doc\ChangeLog.txt >nul

View File

@ -21,21 +21,21 @@ set ERRLEV=0
@del %FB_ROOT_PATH%\src\include\gen\autoconfig.h 2> nul
@copy %FB_ROOT_PATH%\src\include\gen\autoconfig_msvc.h %FB_ROOT_PATH%\src\include\gen\autoconfig.h > nul
@echo Creating directories
@rmdir /s /q %FB_ROOT_PATH%\gen 2>nul
@rmdir /s /q %FB_GEN_DIR% 2>nul
:: Remove previously generated output, and recreate the directory hierarchy. Note the exceptions to the rule!
for %%v in ( alice burp dsql dudley gpre isql journal jrd misc msgs qli examples ) do (
if NOT "%%v"=="journal" (@mkdir %FB_ROOT_PATH%\gen\%%v )
if NOT "%%v"=="journal" (@mkdir %FB_GEN_DIR%\%%v )
)
@rmdir /s /q %FB_ROOT_PATH%\gen\utilities 2>nul
@mkdir %FB_ROOT_PATH%\gen\utilities 2>nul
@mkdir %FB_ROOT_PATH%\gen\utilities\gstat 2>nul
@mkdir %FB_ROOT_PATH%\gen\utilities\gsec 2>nul
@rmdir /s /q %FB_GEN_DIR%\utilities 2>nul
@mkdir %FB_GEN_DIR%\utilities 2>nul
@mkdir %FB_GEN_DIR%\utilities\gstat 2>nul
@mkdir %FB_GEN_DIR%\utilities\gsec 2>nul
::=======
call :btyacc
if "%ERRLEV%"=="1" goto :END
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\btyacc.exe %FB_ROOT_PATH%\gen\ > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\btyacc.exe %FB_GEN_DIR%\ > nul
@echo Generating DSQL parser...
@call parse.bat
@ -49,7 +49,7 @@ if "%ERRLEV%"=="1" goto :END
::=======
call :gpre_boot
if "%ERRLEV%"=="1" goto :END
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\gpre_boot.exe %FB_ROOT_PATH%\gen\ > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\gpre_boot.exe %FB_GEN_DIR% > nul
::=======
@echo Preprocessing the source files needed to build gbak_embed, gpre_embed and isql_embed...
@ -64,13 +64,14 @@ if "%ERRLEV%"=="1" goto :END
call :isql_embed
if "%ERRLEV%"=="1" goto :END
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\gbak_embed.exe %FB_ROOT_PATH%\gen > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\gpre_embed.exe %FB_ROOT_PATH%\gen > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\isql_embed.exe %FB_ROOT_PATH%\gen > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\fbembed.dll %FB_ROOT_PATH%\gen > nul
@copy %FB_ROOT_PATH%\extern\icu\bin\icuuc30.dll %FB_ROOT_PATH%\gen >nul
@copy %FB_ROOT_PATH%\extern\icu\bin\icudt30.dll %FB_ROOT_PATH%\gen >nul
@copy %FB_ROOT_PATH%\extern\icu\bin\icuin30.dll %FB_ROOT_PATH%\gen >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\gbak_embed.exe %FB_GEN_DIR% > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\gpre_embed.exe %FB_GEN_DIR% > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\isql_embed.exe %FB_GEN_DIR% > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\bin\fbembed.dll %FB_GEN_DIR% > nul
for %%v in ( icuuc30 icudt30 icuin30 ) do (
@copy %FB_ICU_SOURCE_BIN%\%%v.dll %FB_GEN_DIR% >nul
)
::=======
@call :databases
@ -94,7 +95,7 @@ if "%ERRLEV%"=="1" goto :END
:btyacc
@echo.
@echo Building btyacc (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot btyacc.log btyacc
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot btyacc_%FB_TARGET_PLATFORM%.log btyacc
if errorlevel 1 call :boot2 btyacc
goto :EOF
@ -103,7 +104,7 @@ goto :EOF
:gpre_boot
@echo.
@echo Building gpre_boot (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot gpre_boot.log gpre_boot
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot gpre_boot_%FB_TARGET_PLATFORM%.log gpre_boot
if errorlevel 1 goto :gpre_boot2
goto :EOF
@ -111,7 +112,7 @@ goto :EOF
:: Error gpre_boot
:gpre_boot2
echo.
echo Error building gpre_boot, see gpre_boot.log
echo Error building gpre_boot, see gpre_boot_%FB_TARGET_PLATFORM%.log
echo.
set ERRLEV=1
goto :EOF
@ -122,7 +123,7 @@ goto :EOF
:gbak_embed
@echo.
@echo Building gbak_embed (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot gbak_embed.log gbak_embed
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot gbak_embed_%FB_TARGET_PLATFORM%.log gbak_embed
if errorlevel 1 call :boot2 gbak_embed
@goto :EOF
@ -131,7 +132,7 @@ if errorlevel 1 call :boot2 gbak_embed
:gpre_embed
@echo.
@echo Building gpre_embed (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot gpre_embed.log gpre_embed
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot gpre_embed_%FB_TARGET_PLATFORM%.log gpre_embed
if errorlevel 1 call :boot2 gpre_embed
@goto :EOF
@ -140,7 +141,7 @@ if errorlevel 1 call :boot2 gpre_embed
:isql_embed
@echo.
@echo Building isql_embed (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot isql_embed.log isql_embed
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot isql_embed_%FB_TARGET_PLATFORM%.log isql_embed
if errorlevel 1 call :boot2 isql_embed
@goto :EOF
@ -159,13 +160,13 @@ goto :EOF
:msgs
@echo.
@echo Building build_msg (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot build_msg.log build_msg
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot build_msg_%FB_TARGET_PLATFORM%.log build_msg
if errorlevel 1 goto :msgs2
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\build_msg\build_msg.exe %FB_ROOT_PATH%\gen\ > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\build_msg\build_msg.exe %FB_GEN_DIR%\ > nul
@goto :EOF
:msgs2
echo.
echo Error building build_msg, see build_msg.log
echo Error building build_msg, see build_msg_%FB_TARGET_PLATFORM%.log
echo.
set ERRLEV=1
goto :EOF
@ -175,31 +176,31 @@ goto :EOF
:codes
@echo.
@echo Building codes (%FB_OBJ_DIR%)...
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot codes.log codes
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot codes_%FB_TARGET_PLATFORM%.log codes
if errorlevel 1 goto :codes2
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\codes\codes.exe %FB_ROOT_PATH%\gen\ > nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\codes\codes.exe %FB_GEN_DIR%\ > nul
@goto :EOF
:codes2
echo.
echo Error building codes, see codes.log
echo Error building codes, see codes_%FB_TARGET_PLATFORM%.log
echo.
set ERRLEV=1
goto :EOF
::==============
:databases
@rmdir /s /q %FB_ROOT_PATH%\gen\dbs 2>nul
@mkdir %FB_ROOT_PATH%\gen\dbs 2>nul
@rmdir /s /q %FB_GEN_DIR%\dbs 2>nul
@mkdir %FB_GEN_DIR%\dbs 2>nul
@echo create database '%FB_DB_PATH%\gen\dbs\security2.fdb'; | "%FB_ROOT_PATH%\gen\isql_embed" -q
@"%FB_ROOT_PATH%\gen\isql_embed" -q %FB_DB_PATH%\gen\dbs\security2.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
@echo create database '%FB_GEN_DB_DIR%\dbs\security2.fdb'; | "%FB_GEN_DIR%\isql_embed" -q
@"%FB_GEN_DIR%\isql_embed" -q %FB_GEN_DB_DIR%/dbs/security2.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
@%FB_ROOT_PATH%\gen\gbak_embed -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_DB_PATH%\gen\dbs\metadata.fdb
@%FB_GEN_DIR%\gbak_embed -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_GEN_DB_DIR%/dbs/metadata.fdb
@call create_msgs.bat db
@%FB_ROOT_PATH%\gen\gbak_embed -r %FB_ROOT_PATH%\builds\misc\help.gbak %FB_DB_PATH%\gen\dbs\help.fdb
@copy %FB_ROOT_PATH%\gen\dbs\metadata.fdb %FB_ROOT_PATH%\gen\dbs\yachts.lnk > nul
@%FB_GEN_DIR%\gbak_embed -r %FB_ROOT_PATH%\builds\misc\help.gbak %FB_GEN_DB_DIR%/dbs/help.fdb
@copy %FB_GEN_DIR%\dbs\metadata.fdb %FB_GEN_DIR%\dbs\yachts.lnk > nul
@goto :EOF

View File

@ -6,7 +6,7 @@
@if errorlevel 1 (goto :EOF)
:: verify that boot was run before
@if not exist %FB_ROOT_PATH%\gen\gpre_boot.exe (goto :HELP_BOOT & goto :EOF)
@if not exist %FB_GEN_DIR%\gpre_boot.exe (goto :HELP_BOOT & goto :EOF)
@call set_build_target.bat %*
@ -21,12 +21,12 @@
@echo.
@echo Building %FB_OBJ_DIR%
if "%VS_VER%"=="msvc6" (
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2 examples.log empbuild intlbld
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2 examples_%FB_TARGET_PLATFORM%.log empbuild intlbld
) else (
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2_Examples empbuild.log empbuild
@if defined FB2_INTLEMP (
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2_Examples intlbuild.log intlbuild
)
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2_Examples empbuild_%FB_TARGET_PLATFORM%.log empbuild
@if defined FB2_INTLEMP (
@call compile.bat %FB_ROOT_PATH%\builds\win32\%VS_VER%\Firebird2_Examples intlbuild_%FB_TARGET_PLATFORM%.log intlbuild
)
)
@echo.
@call :MOVE
@ -38,38 +38,38 @@ if "%VS_VER%"=="msvc6" (
:BUILD_EMPBUILD
@echo.
@echo Building empbuild.fdb
@copy /y %FB_OUTPUT_DIR%\bin\isql.exe %FB_ROOT_PATH%\gen\examples\ > nul
@copy /y %FB_OUTPUT_DIR%\bin\fbclient.dll %FB_ROOT_PATH%\gen\examples\ > nul
@copy /y %FB_ROOT_PATH%\examples\empbuild\*.sql %FB_ROOT_PATH%\gen\examples\ > nul
@copy /y %FB_ROOT_PATH%\examples\empbuild\*.inp %FB_ROOT_PATH%\gen\examples\ > nul
@copy /y %FB_OUTPUT_DIR%\bin\isql.exe %FB_GEN_DIR%\examples\ > nul
@copy /y %FB_OUTPUT_DIR%\bin\fbclient.dll %FB_GEN_DIR%\examples\ > nul
@copy /y %FB_ROOT_PATH%\examples\empbuild\*.sql %FB_GEN_DIR%\examples\ > nul
@copy /y %FB_ROOT_PATH%\examples\empbuild\*.inp %FB_GEN_DIR%\examples\ > nul
@echo.
:: Here we must use cd because isql does not have an option to set a base directory
@cd %FB_ROOT_PATH%\gen\examples
@cd %FB_GEN_DIR%\examples
@echo Creating empbuild.fdb...
@echo.
@del empbuild.fdb 2> nul
@%FB_ROOT_PATH%\gen\examples\isql -i empbld.sql
@%FB_GEN_DIR%\examples\isql -i empbld.sql
if defined FB2_INTLEMP (
@echo Creating intlbuild.fdb...
@echo.
@del intlbuild.fdb 2> nul
@%FB_ROOT_PATH%\gen\examples\isql -i intlbld.sql
@%FB_GEN_DIR%\examples\isql -i intlbld.sql
)
@cd %FB_ROOT_PATH%\builds\win32
@echo.
@echo path = %FB_DB_PATH%/gen/examples
@echo path = %FB_GEN_DB_DIR%\examples
@echo Preprocessing empbuild.e...
@echo.
@%FB_ROOT_PATH%\gen\gpre_embed.exe -r -m -n -z %FB_ROOT_PATH%\examples\empbuild\empbuild.e %FB_ROOT_PATH%\gen\examples\empbuild.c -b %FB_DB_PATH%/gen/examples/
@%FB_GEN_DIR%\gpre_embed.exe -r -m -n -z %FB_ROOT_PATH%\examples\empbuild\empbuild.e %FB_GEN_DIR%\examples\empbuild.c -b %FB_GEN_DB_DIR%/examples/
if defined FB2_INTLEMP (
@echo Preprocessing intlbld.e...
@echo.
@%FB_ROOT_PATH%\gen\gpre_embed.exe -r -m -n -z %FB_ROOT_PATH%\examples\empbuild\intlbld.e %FB_ROOT_PATH%\gen\examples\intlbld.c -b %FB_DB_PATH%/gen/examples/
@%FB_GEN_DIR%\gpre_embed.exe -r -m -n -z %FB_ROOT_PATH%\examples\empbuild\intlbld.e %FB_GEN_DIR%\examples\intlbld.c -b %FB_GEN_DB_DIR%/examples/
)
@goto :EOF
@ -103,13 +103,13 @@ if defined FB2_INTLEMP (
@copy %FB_ROOT_PATH%\src\extlib\ib_udf* %FB_OUTPUT_DIR%\examples\udf > nul
@copy %FB_ROOT_PATH%\src\extlib\fbudf\* %FB_OUTPUT_DIR%\examples\udf > nul
::@copy %FB_ROOT_PATH%\gen\examples\empbuild.c %FB_OUTPUT_DIR%\examples\empbuild\ > nul
::@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\examples\empbuild.exe %FB_ROOT_PATH%\gen\examples\empbuild.exe > nul
::@copy %FB_GEN_DIR%\examples\empbuild.c %FB_OUTPUT_DIR%\examples\empbuild\ > nul
::@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\examples\empbuild.exe %FB_GEN_DIR%\examples\empbuild.exe > nul
::if defined FB2_INTLEMP (
::if "%VS_VER%"=="msvc6" (
::@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\examples\intlbld.exe %FB_ROOT_PATH%\gen\examples\intlbuild.exe > nul
::@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\examples\intlbld.exe %FB_GEN_DIR%\examples\intlbuild.exe > nul
::) else (
::@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\examples\intlbuild.exe %FB_ROOT_PATH%\gen\examples\intlbuild.exe > nul
::@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\examples\intlbuild.exe %FB_GEN_DIR%\examples\intlbuild.exe > nul
::)
::)
@goto :EOF
@ -121,16 +121,16 @@ if defined FB2_INTLEMP (
@echo Building employee.fdb
:: Here we must use cd because isql does not have an option to set a base directory
:: and empbuild.exe uses isql
@cd %FB_ROOT_PATH%\gen\examples
@del %FB_ROOT_PATH%\gen\examples\employee.fdb 2>nul
@%FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\empbuild\empbuild.exe %FB_DB_PATH%/gen/examples/employee.fdb
@cd %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 defined FB2_INTLEMP (
@echo Building intlemp.fdb
@del %FB_ROOT_PATH%\gen\examples\intlemp.fdb 2>nul
@del %FB_GEN_DIR%\examples\intlemp.fdb 2>nul
@del isql.tmp 2>nul
@echo s;intlemp.fdb;%SERVER_NAME%:%FB_ROOT_PATH%\gen\examples\intlemp.fdb;g > isql.tmp
@%FB_ROOT_PATH%\gen\examples\intlbuild.exe %FB_DB_PATH%/gen/examples/intlemp.fdb
@echo s;intlemp.fdb;%SERVER_NAME%:%FB_GEN_DIR%\examples\intlemp.fdb;g > isql.tmp
@%FB_GEN_DIR%\examples\intlbuild.exe %FB_GEN_DB_DIR%/examples/intlemp.fdb
)
@cd %FB_ROOT_PATH%\builds\win32
@ -139,11 +139,11 @@ if defined FB2_INTLEMP (
::==============
:MOVE2
@copy %FB_ROOT_PATH%\gen\examples\employee.fdb %FB_OUTPUT_DIR%\examples\empbuild\ > nul
@copy %FB_GEN_DIR%\examples\employee.fdb %FB_OUTPUT_DIR%\examples\empbuild\ > nul
if defined FB2_INTLEMP (
if exist %FB_ROOT_PATH%\gen\examples\intlemp.fdb (
@copy %FB_ROOT_PATH%\gen\examples\intlemp.fdb %FB_OUTPUT_DIR%\examples\empbuild\ > nul
if exist %FB_GEN_DIR%\examples\intlemp.fdb (
@copy %FB_GEN_DIR%\examples\intlemp.fdb %FB_OUTPUT_DIR%\examples\empbuild\ > nul
)
)

View File

@ -8,7 +8,7 @@
@echo Generating parse.cpp and dsql.tab.h
%FB_ROOT_PATH%\gen\btyacc -l -d -S %FB_ROOT_PATH%\src\dsql\btyacc_fb.ske %FB_ROOT_PATH%\src\dsql\parse.y
%FB_GEN_DIR%\btyacc -l -d -S %FB_ROOT_PATH%\src\dsql\btyacc_fb.ske %FB_ROOT_PATH%\src\dsql\parse.y
@if errorlevel 1 (exit /B 1)
@copy y_tab.h %FB_ROOT_PATH%\src\dsql\dsql.tab.h > nul
@copy y_tab.c %FB_ROOT_PATH%\src\dsql\parse.cpp > nul

View File

@ -30,11 +30,11 @@
@echo Calling GPRE for %1/%2.epp
@if "%3"=="" (call :GPRE_M %1 %2) else (call :GPRE_GDS %1 %2)
@if not exist %FB_ROOT_PATH%\gen\%1\%2.cpp (
@move %FB_ROOT_PATH%\gen\preprocessing.cpp %FB_ROOT_PATH%\gen\%1\%2.cpp
@if not exist %FB_GEN_DIR%\%1\%2.cpp (
@move %FB_GEN_DIR%\preprocessing.cpp %FB_GEN_DIR%\%1\%2.cpp
) else (
@fc %FB_ROOT_PATH%\gen\preprocessing.cpp %FB_ROOT_PATH%\gen\%1\%2.cpp >nul
@if errorlevel 1 @move %FB_ROOT_PATH%\gen\preprocessing.cpp %FB_ROOT_PATH%\gen\%1\%2.cpp
@fc %FB_GEN_DIR%\preprocessing.cpp %FB_GEN_DIR%\%1\%2.cpp >nul
@if errorlevel 1 @move %FB_GEN_DIR%\preprocessing.cpp %FB_GEN_DIR%\%1\%2.cpp
)
@echo.
@ -42,25 +42,25 @@
::===========
:GPRE_M
@%GPRE% -n -m -raw %FB_ROOT_PATH%\src\%1\%2.epp %FB_ROOT_PATH%\gen\preprocessing.cpp -b %FB_DB_PATH%/gen/dbs/
@%GPRE% -n -m -raw %FB_ROOT_PATH%\src\%1\%2.epp %FB_GEN_DIR%\preprocessing.cpp -b %FB_GEN_DB_DIR%/dbs/
@goto :EOF
::===========
:GPRE_GDS
@%GPRE% -n -gds -raw -ids %FB_ROOT_PATH%\src\%1\%2.epp %FB_ROOT_PATH%\gen\preprocessing.cpp -b %FB_DB_PATH%/gen/dbs/
@%GPRE% -n -gds -raw -ids %FB_ROOT_PATH%\src\%1\%2.epp %FB_GEN_DIR%\preprocessing.cpp -b %FB_GEN_DB_DIR%/dbs/
goto :EOF
::===========
:BOOT_PROCESS
@echo.
@set GPRE=%FB_ROOT_PATH%\gen\gpre_boot -lang_internal
@set GPRE=%FB_GEN_DIR%\gpre_boot -lang_internal
@for %%i in (array, blob, metd) do @call :PREPROCESS dsql %%i
@for %%i in (gpre_meta) do @call :PREPROCESS gpre %%i
@for %%i in (backup, restore) do @call :PREPROCESS burp %%i
@for %%i in (extract, isql, show) do @call :PREPROCESS isql %%i
@for %%i in (dba) do @call :PREPROCESS utilities/gstat %%i
@set GPRE=%FB_ROOT_PATH%\gen\gpre_boot
@set GPRE=%FB_GEN_DIR%\gpre_boot
@for %%i in (alice_meta) do @call :PREPROCESS alice %%i
@for %%i in (array, blob, metd) do @call :PREPROCESS dsql %%i
@for %%i in (gpre_meta) do @call :PREPROCESS gpre %%i
@ -70,7 +70,7 @@ goto :EOF
::===========
:MASTER_PROCESS
@set GPRE=%FB_ROOT_PATH%\gen\gpre_embed
@set GPRE=%FB_GEN_DIR%\gpre_embed
@for %%i in (alice_meta) do @call :PREPROCESS alice %%i
@for %%i in (backup, restore) do @call :PREPROCESS burp %%i
@for %%i in (array, blob, metd) do @call :PREPROCESS dsql %%i

View File

@ -10,22 +10,7 @@ for %%v in ( %* ) do (
( if /I "%%v"=="ICU" (set FB_ICU=1) )
)
::If we are build icu then we want to test for a platform switch.
::If found we must rebuild.
if defined FB_ICU (
if exist make_icu_win32.log (
if "%PROCESSOR_ARCHITECTURE%"=="AMD64" ((set FB_CLEAN=/rebuild) & (@echo Rebuilding icu))
)
if exist make_icu_x64.log (
if "%PROCESSOR_ARCHITECTURE%"=="x86" ((set FB_CLEAN=/rebuild) & (@echo Rebuilding icu))
)
)
::For now, icu continues to use the old object directory hierarchy
if not defined FB_ICU (
if %MSVC_VERSION% GEQ 8 (set FB_OBJ_DIR=%FB_TARGET_PLATFORM%\%FB_OBJ_DIR%)
)
@echo Executed %0
@echo.

View File

@ -1,7 +1,7 @@
:: This batch file sets the environment values
:: FB_ROOT_PATH dos format path of the main directory
:: FB_DB_PATH unix format path of the main directory
:: (We probably don't need this anymore. Anyone got time to check?)
:: (This is used by gpre and preprocess.bat)
:: VS_VER VisualStudio version (msvc6|msvc7|msvc8)
:: SERVER_NAME server needed to connect to firebird (could include port)
:: Example : localhost/3051
@ -43,7 +43,6 @@ if DEFINED VS71COMNTOOLS (
@cd %~dp0
@for /f "tokens=*" %%a in ('@echo %FB_ROOT_PATH:\=/%') do (set FB_DB_PATH=%%a)
::=================
:SET_MSVC_VER
@ -62,11 +61,11 @@ if DEFINED VS71COMNTOOLS (
@if not defined MSVC_VERSION goto :HELP
:SET_FB_TARGET_PLATFORM
@set FB_TARGET_PLATFORM=win32
@set FB_TARGET_PLATFORM=Win32
:: If MSVC >= 8 then we can test for processor architecture
:: We certainly don't want to try and set platform=x64 if MSVC7 is installed
@if %MSVC_VERSION% GEQ 8 (
@if "%PROCESSOR_ARCHITECTURE%"=="x86" (set FB_TARGET_PLATFORM=win32)
@if "%PROCESSOR_ARCHITECTURE%"=="x86" (set FB_TARGET_PLATFORM=Win32)
@if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set FB_TARGET_PLATFORM=x64)
)
@ -74,6 +73,19 @@ if DEFINED VS71COMNTOOLS (
@set FB_OUTPUT_DIR=%FB_ROOT_PATH%\output_%FB_TARGET_PLATFORM%
@set FB_TEMP_DIR=%FB_ROOT_PATH%\temp\%FB_TARGET_PLATFORM%
@set FB_INSTALL_SCRIPTS=%FB_ROOT_PATH%\builds\install\arch-specific\win32
@if %MSVC_VERSION% GEQ 8 (
@set FB_GEN_DIR=%FB_ROOT_PATH%\gen\%FB_TARGET_PLATFORM%
@set FB_GEN_DB_DIR=%FB_DB_PATH%/gen/%FB_TARGET_PLATFORM%
@set FB_ICU_SOURCE_BIN=%FB_ROOT_PATH%\extern\icu\%FB_OBJ_DIR%\bin\
) else (
@set FB_GEN_DIR=%FB_ROOT_PATH%\gen
@set FB_GEN_DB_DIR=%FB_DB_PATH%/gen
@set FB_ICU_SOURCE_BIN=%FB_ROOT_PATH%\extern\icu\bin\
)
goto :END