[Firebird-checkins] CVS: firebird2/builds/win32 preprocess.bat,1.11,1.12 prepare.bat,1.13,1.14 parse.bat,1.2,1.3 build6_all.bat,1.5,1.6 blrtable.bat,1.3,1.4

[Blas R. S. <br...@us...>]

Build Version :  T1.5.0.3619 Firebird 1.5 Release Candidate 4

(writeBuildNum.sh,v 1.3616 2003/07/03 11:04:22 brodsom Exp  )

Update of /cvsroot/firebird/firebird2/builds/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv16686/win32

Modified Files:
	preprocess.bat prepare.bat parse.bat build6_all.bat 
	blrtable.bat 
Log Message:
minor changes

Index: preprocess.bat
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/win32/preprocess.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -U3 -r1.11 -r1.12
--- preprocess.bat	3 Jul 2003 02:13:58 -0000	1.11
+++ preprocess.bat	3 Jul 2003 11:04:21 -0000	1.12
@@ -14,11 +14,6 @@
 
 ::===========
 :MAIN
-::provisional, copy all fdbs to the same directory
-cp dbs\metadata.fdb %ROOT_PATH%\generated\yachts.lnk
-cp dbs\jrd\security.fdb %ROOT_PATH%\generated\security.fdb
-cp dbs\msgs\msg.fdb %ROOT_PATH%\generated\msg.fdb
-cp dbs\qli\help.fdb %ROOT_PATH%\generated\help.fdb
 
 @if "%1"=="BOOT" (set BOOTBUILD=1) else (set BOOTBUILD=0)
 @echo.
@@ -30,7 +25,7 @@
 ::===========
 :PREPROCESS
 @echo Processing %1/%2.epp
-@del ..\..\generated\%1\%2.cpp
+@del ..\..\generated\%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.

Index: prepare.bat
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/win32/prepare.bat,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -U3 -r1.13 -r1.14
--- prepare.bat	2 Jul 2003 14:40:30 -0000	1.13
+++ prepare.bat	3 Jul 2003 11:04:21 -0000	1.14
@@ -51,6 +51,12 @@
 @%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: parse.bat
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/win32/parse.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -U3 -r1.2 -r1.3
--- parse.bat	3 Jul 2003 02:12:11 -0000	1.2
+++ parse.bat	3 Jul 2003 11:04:21 -0000	1.3
@@ -49,7 +49,7 @@
 @echo .
 @echo Processing with sed
 @sed -f ..\..\src\dsql\parse.sed <dsql.tab.c >..\..\src\dsql\parse.cpp
-@copy dsql.tab.h ..\..\src\dsql\dsql.tab.h
+@copy dsql.tab.h ..\..\src\dsql\dsql.tab.h > nul
 @del dsql.tab.c
 @del dsql.tab.h
 @goto :EOF

Index: build6_all.bat
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/win32/build6_all.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -U3 -r1.5 -r1.6
--- build6_all.bat	3 Jul 2003 02:12:41 -0000	1.5
+++ build6_all.bat	3 Jul 2003 11:04:21 -0000	1.6
@@ -2,23 +2,20 @@
 
 @echo off
 
-@mkdir temp
-
 :CHECK_ENV
 @if /I "%DB_PATH%"=="" (goto :HELP & goto :EOF) else (@goto :MAIN)
 
 ::===========
 :MAIN
 @echo.
-@del ..\..\src\include\gen\autoconfig.h
-@copy ..\..\src\include\gen\autoconfig_msvc.h ..\..\src\include\gen\autoconfig.h
+@del ..\..\src\include\gen\autoconfig.h 2> nul
+@copy ..\..\src\include\gen\autoconfig_msvc.h ..\..\src\include\gen\autoconfig.h > nul
 @echo Preprocessing files required to do a boot-build...
-@del gpre_boot.exe
 @cd msvc6
 @msdev Firebird2Boot.dsw /MAKE "common_static - Win32 Release" "gpre_boot - Win32 Release"  /REBUILD /OUT boot1.log
 @cd ..
+@del gpre_boot.exe 2> nul
 @move msvc6\release\firebird\bin\gpre_boot.exe .
-@move msvc6\release\common_static\common_static.lib temp\common_static.lib
 @call preprocess.bat BOOT
 
 @echo.
@@ -26,16 +23,18 @@
 @cd msvc6
 @msdev Firebird2Boot.dsw /MAKE "fbclient_static - Win32 Release" "gpre_static - Win32 Release"  /REBUILD /OUT boot2.log
 @cd ..
+@del gpre_static.exe 2> nul
 @move msvc6\release\firebird\bin\gpre_static.exe .
 
-@move msvc6\release\fbclient_static\fbclient_static.lib temp\fbclient_static.lib
 @echo Preprocessing the entire source tree...
 @call preprocess.bat
 @echo Building message file and codes header...
 @cd msvc6
 @msdev Firebird2Boot.dsw /MAKE "build_msg - Win32 Release" "codes - Win32 Release"  /REBUILD /OUT boot3.log
 @cd ..
+@del build_msg.exe 2> nul
 @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
 @codes %ROOT_PATH%\src\include\gen

Index: blrtable.bat
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/win32/blrtable.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- blrtable.bat	11 Apr 2003 10:32:23 -0000	1.3
+++ blrtable.bat	3 Jul 2003 11:04:21 -0000	1.4
@@ -1,7 +1,7 @@
 cl -Ob2iytp -Gs -DWIN95 -D__STDC__ -W3 -G4 -Gd -MD -I..\..\src\include -I..\..\src\include\gen -DSERVER_SHUTDOWN -DSUPERSERVER -DGOVERNOR -DNOMSG -D_X86_=1 -DWIN32 -DI386 -DEXACT_NUMERICS ..\..\src\jrd\blrtable.cpp
 if errorlevel 1 goto :ERROR
 blrtable.exe > blrtable.h
-copy blrtable.h ..\..\src\include\gen\blrtable.h
+copy blrtable.h ..\..\src\include\gen\blrtable.h > nul
 del blrtable.exe
 del blrtable.obj
 del blrtable.h