Menu
▾
▴
[Firebird-checkins] CVS: firebird2/builds/win32 preprocess.bat,1.12,1.13 prepare.bat,1.14,1.15 make6_debug_examples.bat,1.2,1.3 gpre.mak,1.7,1.8 fbclient_boot.mak,1.8,1.9 codes.mak,1.1,1.2 build_msg.mak,1.1,1.2 build_msg.bat,1.2,1.3 build_all.bat,1.7,1.8 build6_all.bat,1.6,1.7
|
From: Blas R. S. <br...@us...> - 2003-07-03 12:36:58
|
Build Version : T1.5.0.3620 Firebird 1.5 Release Candidate 4 (writeBuildNum.sh,v 1.3617 2003/07/03 12:36:55 brodsom Exp ) Update of /cvsroot/firebird/firebird2/builds/win32 In directory sc8-pr-cvs1:/tmp/cvs-serv30615/builds/win32 Modified Files: preprocess.bat prepare.bat make6_debug_examples.bat gpre.mak fbclient_boot.mak codes.mak build_msg.mak build_msg.bat build_all.bat build6_all.bat Log Message: Move generated source from 'generated' to 'gen'. So we don't use a CVS and obsolete directory for build output and it will be easier to do a clean build. Index: preprocess.bat =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/preprocess.bat,v retrieving revision 1.12 retrieving revision 1.13 diff -b -U3 -r1.12 -r1.13 --- preprocess.bat 3 Jul 2003 11:04:21 -0000 1.12 +++ preprocess.bat 3 Jul 2003 12:36:54 -0000 1.13 @@ -25,7 +25,7 @@ ::=========== :PREPROCESS @echo Processing %1/%2.epp -@del ..\..\generated\%1\%2.cpp 2>nul +@del ..\..\gen\%1\%2.cpp 2>nul @echo Calling GPRE for %1/%2.epp @if "%3"=="" (call :GPRE_M %1 %2) else (call :GPRE_GDS %1 %2) @echo. @@ -33,12 +33,12 @@ ::=========== :GPRE_M -@%GPRE% -n -m -raw ..\..\src\%1\%2.epp ..\..\generated\%1\%2.cpp -b localhost:%DB_PATH%/generated/ +@%GPRE% -n -m -raw ..\..\src\%1\%2.epp ..\..\gen\%1\%2.cpp -b localhost:%DB_PATH%/gen/ @goto :EOF ::=========== :GPRE_GDS -@%GPRE% -n -gds -raw -ids ..\..\src\%1\%2.epp ..\..\generated\%1\%2.cpp -b localhost:%DB_PATH%/generated/ +@%GPRE% -n -gds -raw -ids ..\..\src\%1\%2.epp ..\..\gen\%1\%2.cpp -b localhost:%DB_PATH%/gen/ goto :EOF ::=========== Index: prepare.bat =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/prepare.bat,v retrieving revision 1.14 retrieving revision 1.15 diff -b -U3 -r1.14 -r1.15 --- prepare.bat 3 Jul 2003 11:04:21 -0000 1.14 +++ prepare.bat 3 Jul 2003 12:36:54 -0000 1.15 @@ -51,12 +51,6 @@ @%FIREBIRD%\bin\gbak -r %ROOT_PATH%\src\misc\help.gbak localhost:%DB_PATH%\builds\win32\dbs\qli\help.fdb @cd .. -::provisional, copy all fdbs to the same directory to be used from preprocess -copy dbs\metadata.fdb %ROOT_PATH%\generated\yachts.lnk > nul -copy dbs\jrd\security.fdb %ROOT_PATH%\generated\security.fdb > nul -copy dbs\msgs\msg.fdb %ROOT_PATH%\generated\msg.fdb > nul -copy dbs\qli\help.fdb %ROOT_PATH%\generated\help.fdb > nul - @echo. @echo Completed Preparations for build @echo You many now continue by running BUILD_ALL.BAT Index: make6_debug_examples.bat =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/make6_debug_examples.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- make6_debug_examples.bat 27 Jun 2003 16:16:32 -0000 1.2 +++ make6_debug_examples.bat 3 Jul 2003 12:36:54 -0000 1.3 @@ -8,15 +8,15 @@ ::=========== :SED del expand_ex.sed -@echo s?\"empbuild.fdb\"?\"localhost:%DB_PATH%/generated/v5_examples/empbuild.fdb\"?g >> expand_ex.sed +@echo s?\"empbuild.fdb\"?\"localhost:%DB_PATH%/gen/v5_examples/empbuild.fdb\"?g >> expand_ex.sed @sed -f expand_ex.sed ..\..\src\v5_examples\empbuild.e > sed.tmp -@copy sed.tmp ..\..\generated\v5_examples\empbuild.e +@copy sed.tmp ..\..\gen\v5_examples\empbuild.e @del sed.tmp -@copy ..\..\src\v5_examples\*.sql ..\..\generated\v5_examples\ -@copy ..\..\src\v5_examples\*.inp ..\..\generated\v5_examples\ +@copy ..\..\src\v5_examples\*.sql ..\..\gen\v5_examples\ +@copy ..\..\src\v5_examples\*.inp ..\..\gen\v5_examples\ -cd ..\..\generated\v5_examples +cd ..\..\gen\v5_examples isql -i empbld.sql gpre -r -m -n -z empbuild.e empbuild.c del empbuild.fdb @@ -29,7 +29,7 @@ mkdir output\v5_examples @copy ..\..\src\v5_examples\* output\v5_examples -@copy ..\..\generated\v5_examples\* output\v5_examples +@copy ..\..\gen\v5_examples\* output\v5_examples @copy msvc6\debug\v5_examples\v5_examples.exe output\v5_examples\empbuild.exe ::=========== Index: gpre.mak =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/gpre.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -b -U3 -r1.7 -r1.8 --- gpre.mak 1 Jul 2003 22:25:05 -0000 1.7 +++ gpre.mak 3 Jul 2003 12:36:54 -0000 1.8 @@ -175,7 +175,7 @@ RSC_PROJ=/l 0x41d /fo"$(INTDIR)\version.res" -SOURCE=..\..\generated\gpre\gpre_meta.cpp +SOURCE=..\..\gen\gpre\gpre_meta.cpp "$(INTDIR)\gpre_meta.obj" "$(INTDIR)\gpre_meta.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) Index: fbclient_boot.mak =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/fbclient_boot.mak,v retrieving revision 1.8 retrieving revision 1.9 diff -b -U3 -r1.8 -r1.9 --- fbclient_boot.mak 7 May 2003 10:30:49 -0000 1.8 +++ fbclient_boot.mak 3 Jul 2003 12:36:54 -0000 1.9 @@ -341,13 +341,13 @@ $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\generated\dsql\array.cpp +SOURCE=..\..\gen\dsql\array.cpp "$(INTDIR)\array.obj" "$(INTDIR)\array.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\generated\dsql\blob.cpp +SOURCE=..\..\gen\dsql\blob.cpp "$(INTDIR)\blob.obj" "$(INTDIR)\blob.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) Index: codes.mak =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/codes.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -b -U3 -r1.1 -r1.2 --- codes.mak 13 Apr 2003 12:14:47 -0000 1.1 +++ codes.mak 3 Jul 2003 12:36:54 -0000 1.2 @@ -69,7 +69,7 @@ RSC_PROJ=/l 0x41d /fo"$(INTDIR)\version.res" /d "NDEBUG" -SOURCE=..\..\generated\jrd\codes.cpp +SOURCE=..\..\gen\jrd\codes.cpp "$(INTDIR)\codes.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) Index: build_msg.mak =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/build_msg.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -b -U3 -r1.1 -r1.2 --- build_msg.mak 13 Apr 2003 12:14:47 -0000 1.1 +++ build_msg.mak 3 Jul 2003 12:36:54 -0000 1.2 @@ -69,7 +69,7 @@ RSC_PROJ=/l 0x41d /fo"$(INTDIR)\version.res" /d "NDEBUG" -SOURCE=..\..\generated\msgs\build_file.cpp +SOURCE=..\..\gen\msgs\build_file.cpp "$(INTDIR)\build_file.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) Index: build_msg.bat =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/build_msg.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- build_msg.bat 2 Jul 2003 14:40:30 -0000 1.2 +++ build_msg.bat 3 Jul 2003 12:36:54 -0000 1.3 @@ -1,4 +1,4 @@ @nmake /f build_msg.mak -@build_msg -D %DB_PATH%/generated/msg.fdb +@build_msg -D %DB_PATH%/gen/msg.fdb @nmake /f codes.mak @codes ..\..\src\include\gen Index: build_all.bat =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/build_all.bat,v retrieving revision 1.7 retrieving revision 1.8 diff -b -U3 -r1.7 -r1.8 --- build_all.bat 4 Jun 2003 08:22:12 -0000 1.7 +++ build_all.bat 3 Jul 2003 12:36:54 -0000 1.8 @@ -8,6 +8,28 @@ ::=========== :MAIN @echo. +@echo Creating directories +@cd ..\.. +@rmdir gen 2>nul +@mkdir gen\alice +@mkdir gen\burp +@mkdir gen\dsql +@mkdir gen\dudley +@mkdir gen\gpre +@mkdir gen\isql +@mkdir gen\jrd +@mkdir gen\msgs +@mkdir gen\qli +@mkdir gen\utilities +@mkdir gen\v5_examples +@cd builds\win32 + +::provisional, copy all fdbs to the same directory to be used from preprocess +copy dbs\metadata.fdb %ROOT_PATH%\gen\yachts.lnk > nul +copy dbs\jrd\security.fdb %ROOT_PATH%\gen\security.fdb > nul +copy dbs\msgs\msg.fdb %ROOT_PATH%\gen\msg.fdb > nul +copy dbs\qli\help.fdb %ROOT_PATH%\gen\help.fdb > nul + @del ..\..\src\include\gen\autoconfig.h @copy ..\..\src\include\gen\autoconfig_msvc.h ..\..\src\include\gen\autoconfig.h @echo Preprocessing files required to do a boot-build... Index: build6_all.bat =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/build6_all.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -b -U3 -r1.6 -r1.7 --- build6_all.bat 3 Jul 2003 11:04:21 -0000 1.6 +++ build6_all.bat 3 Jul 2003 12:36:54 -0000 1.7 @@ -10,6 +10,28 @@ @echo. @del ..\..\src\include\gen\autoconfig.h 2> nul @copy ..\..\src\include\gen\autoconfig_msvc.h ..\..\src\include\gen\autoconfig.h > nul +@echo Creating directories +@cd ..\.. +@rmdir gen 2>nul +@mkdir gen\alice +@mkdir gen\burp +@mkdir gen\dsql +@mkdir gen\dudley +@mkdir gen\gpre +@mkdir gen\isql +@mkdir gen\jrd +@mkdir gen\msgs +@mkdir gen\qli +@mkdir gen\utilities +@mkdir gen\v5_examples +@cd builds\win32 + +::provisional, copy all fdbs to the same directory to be used from preprocess +copy dbs\metadata.fdb %ROOT_PATH%\gen\yachts.lnk > nul +copy dbs\jrd\security.fdb %ROOT_PATH%\gen\security.fdb > nul +copy dbs\msgs\msg.fdb %ROOT_PATH%\gen\msg.fdb > nul +copy dbs\qli\help.fdb %ROOT_PATH%\gen\help.fdb > nul + @echo Preprocessing files required to do a boot-build... @cd msvc6 @msdev Firebird2Boot.dsw /MAKE "common_static - Win32 Release" "gpre_boot - Win32 Release" /REBUILD /OUT boot1.log @@ -36,7 +58,7 @@ @move msvc6\release\build_msg\build_msg.exe . @del codes.exe 2> nul @move msvc6\release\codes\codes.exe . -@build_msg -D %DB_PATH%/generated/msg.fdb +@build_msg -D %DB_PATH%/gen/msg.fdb @codes %ROOT_PATH%\src\include\gen @echo Building BLR Table @call blrtable.bat |
