This commit was manufactured by cvs2svn to create branch 'B1_5_Release'.

ChangeLog

@@ -1,892 +1,3 @@
-2003-07-14 18:53  brodsom
-
-	* firebird2/src/: gpre/gpre.cpp, jrd/dfw.epp, misc/codes.epp,
-	misc/relations.epp, dudley/lex.cpp, qli/meta.epp:
-	
-	Patch for MinGW 3.0
-
-2003-07-14 15:21  alexpeshkoff
-
-	* firebird2/src/jrd/exe.cpp:
-	
-	fixed bug with tdbb_transaction, overwritten in EXE_unwind
-
-2003-07-14 13:23  brodsom
-
-	* firebird2/builds/posix/: prefix.darwin, prefix.example,
-	prefix.freebsd, prefix.linux, prefix.mingw, prefix.sinixz,
-	prefix.solaris, prefix.solx86, prefix.solx86gcc:
-	
-	Move physical io to os specific
-
-2003-07-14 12:33  brodsom
-
-	* firebird2/: src/jrd/ail.cpp, src/jrd/cch.cpp, src/jrd/cch.h,
-	src/jrd/dfw.epp, src/jrd/err.cpp, src/jrd/everything.h,
-	src/jrd/inf.cpp, src/jrd/jrd.cpp, src/jrd/met.epp, src/jrd/old.cpp,
-	src/jrd/pag.cpp, src/jrd/qatest.cpp, src/jrd/sdw.cpp,
-	src/jrd/vio.cpp, src/jrd/pio.h, src/jrd/pio_proto.h,
-	src/jrd/unix.cpp, src/jrd/winnt.cpp, src/jrd/os/pio.h,
-	src/jrd/os/pio_proto.h, src/jrd/os/posix/unix.cpp,
-	src/jrd/os/win32/winnt.cpp, builds/win32/msvc7/engine.vcproj,
-	builds/win32/msvc7/engine_classic.vcproj,
-	builds/win32/msvc7/engine_embed.vcproj,
-	builds/win32/msvc6/engine.dsp,
-	builds/win32/msvc6/engine_classic.dsp,
-	builds/win32/msvc6/engine_embed.dsp:
-	
-	Move physical io to os specific
-
-2003-07-14 11:43  brodsom
-
-	* firebird2/: builds/win32/blrtable.bat,
-	builds/win32/make_boot.bat, builds/win32/preprocess.bat,
-	builds/win32/msvc6/codes.dsp, builds/win32/msvc6/fbclient.dsp,
-	builds/win32/msvc6/fbclient_static.dsp,
-	builds/win32/msvc6/fbembed.dsp, builds/win32/msvc6/gds32.dsp,
-	builds/win32/msvc6/relations.dsp,
-	builds/win32/msvc7/fbclient.vcproj,
-	builds/win32/msvc7/fbclient_static.vcproj,
-	builds/win32/msvc7/fbembed.vcproj, builds/win32/msvc7/gds32.vcproj,
-	builds/posix/Makefile.in.codes, builds/posix/Makefile.in.extlib,
-	builds/posix/make.shared.variables, clean.sh, configure.in:
-	
-	Update
-
-2003-07-14 11:39  brodsom
-
-	* firebird2/src/jrd/os/vms/: dfloat_stub.cpp, extvms.cpp, jio.cpp,
-	lnmdef.h, map.cpp, map_proto.h, mblr.cpp, mblr.h, mblr_proto.h,
-	prv_m_bypass.h, rdb.cpp, rdb.h, rdbcodes.h, rdbgpas.cpp,
-	rdbint.cpp, syidef.h, vms.cpp, vms.h, vms_command.cpp,
-	vmsevent.cpp, vmslo_proto.h, vmslock.cpp, vmsthread.cpp:
-	
-	Move vms related stuff to os/vms
-
-2003-07-14 11:30  brodsom
-
-	* firebird2/src/jrd/: dfloat_stub.cpp, extvms.cpp, jio.cpp,
-	lnmdef.h, map.cpp, map_proto.h, mblr.cpp, mblr.h, mblr_proto.h,
-	prv_m_bypass.h, rdb.cpp, rdb.h, rdbcodes.h, rdbgpas.cpp,
-	rdbint.cpp, syidef.h, vms.cpp, vms.h, vms_command.cpp,
-	vmsevent.cpp, vmslo_proto.h, vmslock.cpp, vmsthread.cpp:
-	
-	Move vms related stuff to os/vms
-
-2003-07-14 11:28  brodsom
-
-	* firebird2/src/: jrd/align.cpp, jrd/blrtable.cpp, jrd/codes.epp,
-	jrd/envelope.epp, jrd/memtest.cpp, jrd/print.cpp,
-	jrd/relations.epp, misc/align.cpp, misc/blrtable.cpp,
-	misc/codes.epp, misc/envelope.epp, misc/memtest.cpp,
-	misc/print.cpp, misc/relations.epp:
-	
-	Move utils to misc.
-
-2003-07-14 11:23  brodsom
-
-	* firebird2/src/jrd/: ibinitdll.cpp, os/win32/ibinitdll.cpp:
-	
-	Move ibinitdll to os/win32
-
-2003-07-14 11:21  brodsom
-
-	* firebird2/examples/build_win32/: clean_all.bat, clean_api.bat,
-	clean_dyn.bat, clean_empbuild.bat, clean_stat.bat, clean_udf.bat,
-	make_all.bat, make_api.bat, make_dyn.bat, make_empbuild.bat,
-	make_stat.bat, make_udf.bat:
-	
-	Corrections
-
-2003-07-13 12:30  brodsom
-
-	* firebird2/src/: dbs/dflt.gdl, dbs/grant.gdl, dbs/isc.gdl,
-	dbs/metadata.sql, dbs/ods10.gdl, dbs/ods101.gdl, dbs/ods72.gdl,
-	dbs/ods80.gdl, dbs/ods80dif.gdl, dbs/ods81.gdl, dbs/ods91.gdl,
-	dbs/procs2.gdl, dbs/scrty_unix.gdl, dbs/scrty_vms.gdl,
-	dbs/security.gdl, dbs/security.sql, dbs/stored_proc.gdl,
-	dbs/v2_triggers.gdl, jrd/dflt.gdl, jrd/grant.gdl, jrd/ods10.gdl,
-	jrd/ods101.gdl, jrd/ods72.gdl, jrd/ods80.gdl, jrd/ods80dif.gdl,
-	jrd/ods81.gdl, jrd/ods91.gdl, jrd/procs2.gdl, jrd/stored_proc.gdl,
-	jrd/v2_triggers.gdl, misc/isc.gdl, misc/metadata.sql,
-	misc/scrty_unix.gdl, misc/scrty_vms.gdl, misc/security.gdl,
-	misc/security.sql:
-	
-	Move db definitions to dbs
-
-2003-07-13 11:53  brodsom
-
-	* firebird2/src/jrd/relations.epp:
-	
-	Correction
-
-2003-07-13 10:28  dimitr
-
-	* firebird2/src/jrd/dyn.epp:
-	
-	Fixed porting bug. Thanks to Oleg LOA.
-
-2003-07-13 01:16  brodsom
-
-	* firebird2/src/include/gen/ids.h:
-	
-	Correction
-
-2003-07-12 22:41  brodsom
-
-	* firebird2/src/jrd/iscmsgs.msg:
-	
-	Remove unused file
-
-2003-07-12 22:37  brodsom
-
-	* firebird2/: builds/posix/Makefile.in.codes, src/jrd/ids.m:
-	
-	Adding generator for fields.h, relations.h, ids.h and names.h
-
-2003-07-12 22:10  brodsom
-
-	* firebird2/: builds/win32/make_boot.bat,
-	builds/win32/preprocess.bat, builds/win32/msvc6/Firebird2Boot.dsw,
-	builds/win32/msvc6/relations.dsp, src/jrd/idx.h, src/jrd/ini.epp,
-	src/jrd/ini.h, src/jrd/relations.epp, src/jrd/types.h,
-	src/jrd/vio.cpp, src/include/gen/relations.h,
-	src/include/gen/fields.h, src/include/gen/ids.h,
-	src/include/gen/names.h:
-	
-	Adding generator for fields.h, relations.h, ids.h and names.h
-
-2003-07-12 22:02  brodsom
-
-	* firebird2/builds/posix/Makefile.in.codes:
-	
-	Correction
-
-2003-07-12 15:24  brodsom
-
-	* firebird2/src/jrd/: cmp.cpp, dfw.epp, ids.m, ini.h, met.epp,
-	vio.cpp:
-	
-	Move fields.h, relations.h and names.h to include/gen, generator
-	will follow
-
-2003-07-12 15:00  brodsom
-
-	* firebird2/src/: jrd/fields.h, jrd/names.h, jrd/relations.h,
-	include/gen/fields.h, include/gen/names.h, include/gen/relations.h:
-	
-	Move fields.h, relations.h and names.h to include/gen, generator
-	will follow
-
-2003-07-12 12:22  brodsom
-
-	* firebird2/src/: jrd/codes.epp, jrd/gds.cpp, jrd/map.cpp,
-	jrd/par.cpp, jrd/blp.h, include/gen/codetext.h, include/gen/msgs.h,
-	include/gen/rdb_codes.h:
-	
-	-Include var definitions in rdb_codes, codetext, msgs and blh.p 
-	headers.  -Uncommited change to codes.epp to allow to used two
-	directories (moving ftn and pas)
-
-2003-07-12 11:55  brodsom
-
-	* firebird2/configure.in:
-	
-	Clean
-
-2003-07-12 11:54  brodsom
-
-	* firebird2/builds/posix/Makefile.in.gpre:
-	
-	Remove, replaced with boot.gpre, client.gpre and embed.gpre
-
-2003-07-12 11:42  brodsom
-
-	* firebird2/builds/win32/msvc6/: engine_classic.dsp,
-	engine_embed.dsp, engine.dsp:
-	
-	Remove not used rdb*.h
-
-2003-07-12 00:39  skidder
-
-	* firebird2/src/jrd/: rse.cpp, vio.cpp, vio_proto.h:
-	
-	Fix problem in explicit locking logic implicitly noted by Ann
-	Harrison
-
-2003-07-12 00:36  skidder
-
-	* firebird2/src/dsql/: node.h, parse.y, pass1.cpp:
-	
-	Separate DSQL cursors management and explicit locks as suggested by
-	Ivan Prenosil
-
-2003-07-11 18:49  brodsom
-
-	* firebird2/builds/win32/make_all.bat:
-	
-	-Build fbudf -Copy ib_udf and fb_udf sql to output/udf -Copy
-	ib_udf/* and fb_udf/* to examples/udf
-
-2003-07-11 18:47  brodsom
-
-	* firebird2/builds/win32/msvc6/: Firebird2.dsw, v5_examples.dsp:
-	
-	Remove v5_examples dsp
-
-2003-07-11 18:47  brodsom
-
-	* firebird2/builds/win32/make_boot.bat:
-	
-	Remove gen/v5_examples directory
-
-2003-07-11 15:34  brodsom
-
-	* firebird2/examples/build_win32/make_stat.bat:
-	
-	Correction
-
-2003-07-11 15:31  brodsom
-
-	* firebird2/builds/posix/: Makefile.in.example5,
-	Makefile.in.v5_examples:
-	
-	Move examples builds to examples directory
-
-2003-07-11 15:28  brodsom
-
-	* firebird2/: configure.in, builds/posix/Makefile.in.firebird,
-	examples/build_unix/Makefile.in.example5,
-	examples/build_unix/Makefile.in.v5_examples:
-	
-	Move examples builds to examples directory
-
-2003-07-11 12:59  brodsom
-
-	* firebird2/doc/README.build.msvc.html:
-	
-	Update examples info
-
-2003-07-11 12:53  brodsom
-
-	* firebird2/: examples/api/winevent.c, examples/api/winevent.def,
-	examples/api/winevent.rc, examples/winevent/winevent.c,
-	examples/winevent/winevent.def, examples/winevent/winevent.rc,
-	examples/build_win32/clean_all.bat,
-	examples/build_win32/clean_winevent.bat,
-	examples/build_win32/make_all.bat,
-	examples/build_win32/make_api.bat,
-	examples/build_win32/make_winevent.bat, builds/win32/make_all.bat:
-	
-	Let winevent with api examples
-
-2003-07-11 12:07  brodsom
-
-	* firebird2/examples/build_win32/: clean_all.bat, clean_udf.bat,
-	clean_winevent.bat, make_all.bat, make_dyn.bat, make_udf.bat,
-	make_winevent.bat:
-	
-	Update.
-
-2003-07-11 12:01  brodsom
-
-	* firebird2/doc/README.build.msvc.html:
-	
-	Update
-
-2003-07-11 05:22  brodsom
-
-	* firebird2/: builds/win32/make_all.bat,
-	examples/build_win32/clean_empbuild.bat, clean.sh:
-	
-	Correction
-
-2003-07-11 05:10  brodsom
-
-	* firebird2/examples/empbuild/empbuild.c:
-	
-	Remove generated source
-
-2003-07-11 05:09  brodsom
-
-	* firebird2/examples/empbuild/intlddl.sql:
-	
-	Change DATE to TIMESTAMP
-
-2003-07-11 05:08  brodsom
-
-	* firebird2/examples/: api/apifull.c, dyn/dynfull.e:
-	
-	Win32 code patches
-
-2003-07-11 05:05  brodsom
-
-	* firebird2/examples/build_win32/: clean_api.bat, clean_dyn.bat,
-	clean_empbuild.bat, clean_stat.bat, make_api.bat, make_dyn.bat,
-	make_empbuild.bat, make_stat.bat, setenvvar.bat:
-	
-	Win32 examples build scripts
-
-2003-07-11 04:28  brodsom
-
-	* firebird2/configure.in:
-	
-	Updates
-
-2003-07-11 04:23  brodsom
-
-	* firebird2/builds/posix/: Makefile.in.codes, Makefile.in.firebird,
-	Makefile.in.refDatabases, make.defaults, make.shared.targets:
-	
-	Updates
-
-2003-07-11 02:03  brodsom
-
-	* firebird2/builds/: win32/make_all.bat, win32/make_boot.bat,
-	win32/make_examples.bat, win32/prepare.bat,
-	install/arch-specific/win32/FirebirdInstall_15.iss:
-	
-	Updated scripts
-
-2003-07-11 01:29  brodsom
-
-	* firebird2/: src/jrd/gds.pas, src/jrd/gds.pli, src/jrd/gds.vpas,
-	src/jrd/perf.pas, src/jrd/gds.bas, src/jrd/gds_aix.f,
-	src/jrd/gds_hp.f, src/jrd/gds_sun.f, src/jrd/gds_vms.f,
-	src/include/gen/gds_codes.ftn, src/include/gen/gds_codes.pas,
-	src/extlib/ib_util.pas, lang_helpers/README.txt,
-	lang_helpers/gds.bas, lang_helpers/gds.pas, lang_helpers/gds.pli,
-	lang_helpers/gds.vpas, lang_helpers/gds_aix.f,
-	lang_helpers/gds_codes.ftn, lang_helpers/gds_codes.pas,
-	lang_helpers/gds_hp.f, lang_helpers/gds_sun.f,
-	lang_helpers/gds_vms.f, lang_helpers/ib_util.pas,
-	lang_helpers/perf.pas:
-	
-	Moving fortran, pascal etc helpers to lang_helpers
-
-2003-07-11 01:07  brodsom
-
-	* firebird2/: src/misc/help.gbak, src/misc/metadata.gbak,
-	src/misc/security.gbak, src/msgs/msg.gbak, builds/misc/help.gbak,
-	builds/misc/metadata.gbak, builds/misc/msg.gbak,
-	builds/misc/security.gbak:
-	
-	Moving .gbak to firebird2/builds/misc
-
-2003-07-11 01:02  brodsom
-
-	* firebird2/examples/: winevent/winevent.c, winevent/winevent.def,
-	winevent/winevent.rc, udf/udf.sql, udf/udflib.c, udf/udflib.def,
-	stat/stat1.e, stat/stat10.e, stat/stat11.e, stat/stat12.e,
-	stat/stat12t.e, stat/stat2.e, stat/stat3.e, stat/stat4.e,
-	stat/stat5.e, stat/stat6.e, stat/stat7.e, stat/stat8.e,
-	stat/stat9.e, include/align.h, include/example.h:
-	
-	Moving firebird/src/v5_examples to firebird/examples
-
-2003-07-11 00:59  brodsom
-
-	* firebird2/examples/: api/api1.c, api/api10.c, api/api11.c,
-	api/api12.c, api/api13.c, api/api14.e, api/api15.c, api/api16.c,
-	api/api16t.c, api/api2.c, api/api3.c, api/api4.c, api/api5.c,
-	api/api6.c, api/api7.c, api/api8.c, api/api9.c, api/api9f.c,
-	api/api9f.def, api/api9f.sql, api/apifull.c, api/example.def,
-	build_win32/old/example.mak, build_win32/old/prefix.win32_bc,
-	build_win32/old/prefix.win32_msc,
-	build_win32/old/sfx.win32_makefile,
-	build_unix/old/sfx.unix_makefile, build_unix/old/makefile.old,
-	build_unix/old/prefix.hp10, build_unix/old/prefix.linux,
-	build_unix/old/prefix.sco_ev, build_unix/old/prefix.solaris,
-	empbuild/empbld.sql, empbuild/empbuild.c, empbuild/empbuild.e,
-	empbuild/empddl.sql, empbuild/empdml.sql, empbuild/employe2.sql,
-	empbuild/indexoff.sql, empbuild/indexon.sql, empbuild/intlbld.e,
-	empbuild/intlbld.sql, empbuild/intlddl.sql, empbuild/intldml.sql,
-	empbuild/job.inp, empbuild/lang.inp, empbuild/proj.inp,
-	empbuild/qtr.inp, dyn/dyn1.e, dyn/dyn2.e, dyn/dyn3.e, dyn/dyn4.e,
-	dyn/dyn5.e, dyn/dynfull.e:
-	
-	Moving firebird/src/v5_examples to firebird/examples
-
-2003-07-11 00:55  brodsom
-
-	* firebird2/: src/v5_examples/udflib.c, src/v5_examples/udflib.def,
-	src/v5_examples/winevent.c, src/v5_examples/winevent.def,
-	src/v5_examples/winevent.rc, src/v5_examples/api9f.sql,
-	src/v5_examples/apifull.c, src/v5_examples/dyn1.e,
-	src/v5_examples/dyn2.e, src/v5_examples/dyn3.e,
-	src/v5_examples/dyn4.e, src/v5_examples/dyn5.e,
-	src/v5_examples/dynfull.e, src/v5_examples/empbld.sql,
-	src/v5_examples/empbuild.c, src/v5_examples/empbuild.e,
-	src/v5_examples/empddl.sql, src/v5_examples/empdml.sql,
-	src/v5_examples/employe2.sql, src/v5_examples/example.def,
-	src/v5_examples/example.h, src/v5_examples/example.mak,
-	src/v5_examples/functions.c, src/v5_examples/indexoff.sql,
-	src/v5_examples/indexon.sql, src/v5_examples/intlbld.e,
-	src/v5_examples/intlbld.sql, src/v5_examples/intlddl.sql,
-	src/v5_examples/intldml.sql, src/v5_examples/job.inp,
-	src/v5_examples/lang.inp, src/v5_examples/makefile.old,
-	src/v5_examples/prefix.hp10, src/v5_examples/prefix.linux,
-	src/v5_examples/prefix.sco_ev, src/v5_examples/prefix.solaris,
-	src/v5_examples/prefix.win32_bc, src/v5_examples/prefix.win32_msc,
-	src/v5_examples/proj.inp, src/v5_examples/qtr.inp,
-	src/v5_examples/readme, src/v5_examples/sfx.unix_makefile,
-	src/v5_examples/sfx.win32_makefile, src/v5_examples/stat1.e,
-	src/v5_examples/stat10.e, src/v5_examples/stat11.e,
-	src/v5_examples/stat12.e, src/v5_examples/stat12t.e,
-	src/v5_examples/stat2.e, src/v5_examples/stat3.e,
-	src/v5_examples/stat4.e, src/v5_examples/stat5.e,
-	src/v5_examples/stat6.e, src/v5_examples/stat7.e,
-	src/v5_examples/stat8.e, src/v5_examples/stat9.e,
-	src/v5_examples/udf.sql, src/v5_examples/align.h,
-	src/v5_examples/api1.c, src/v5_examples/api10.c,
-	src/v5_examples/api11.c, src/v5_examples/api12.c,
-	src/v5_examples/api13.c, src/v5_examples/api14.e,
-	src/v5_examples/api15.c, src/v5_examples/api16.c,
-	src/v5_examples/api16t.c, src/v5_examples/api2.c,
-	src/v5_examples/api3.c, src/v5_examples/api4.c,
-	src/v5_examples/api5.c, src/v5_examples/api6.c,
-	src/v5_examples/api7.c, src/v5_examples/api8.c,
-	src/v5_examples/api9.c, src/v5_examples/api9f.c,
-	src/v5_examples/api9f.def, examples/readme, examples/functions.c:
-	
-	Moving firebird/src/v5_examples to firebird/examples
-
-2003-07-10 17:36  brodsom
-
-	* firebird2/doc/README.build.msvc.html:
-	
-	Update
-
-2003-07-10 17:29  brodsom
-
-	* firebird2/builds/: win32/make_all.bat,
-	install/arch-specific/win32/BuildExecutableInstall.bat:
-	
-	Remove from BuildExecutableInstall work done in make_all.bat
-
-2003-07-10 17:19  brodsom
-
-	* firebird2/builds/win32/make_all.bat:
-	
-	Adding automatic public headers build (gds.h and ibase.h)
-
-2003-07-10 17:02  brodsom
-
-	* firebird2/src/misc/: headers.sed, ibase_header.txt:
-	
-	Adding automatic public headers build (gds.h and ibase.h)
-
-2003-07-10 15:36  fsg
-
-	* firebird2/src/jrd/ids.m:
-	
-	Fix to get it built under linux again
-	
-	fsg
-
-2003-07-09 15:07  alexpeshkoff
-
-	* firebird2/src/jrd/cmp.cpp:
-	
-	Fixed server AV for any combination of sub-select & between.  Not
-	ideal, but such diagnostic is better than server crash.
-
-2003-07-09 11:21  fsg
-
-	* firebird2/:
-	builds/install/arch-specific/linux/classic/makeInstallImage.sh.in,
-	builds/install/arch-specific/linux/super/makeInstallImage.sh.in,
-	builds/install/arch-specific/sinixz/prototype.in,
-	builds/posix/Makefile.in.extlib, doc/README.build.mingw.html:
-	
-	renamed fb_udf to fbudf for posix-builds to stay compatible with
-	the windows world
-	
-	fsg
-
-2003-07-09 03:24  brodsom
-
-	* firebird2/builds/install/arch-specific/linux/super/:
-	tarInstall.sh.in, tarinstall.sh.in:
-	
-	-Rename to use the name in configure.in and classic
-	install.(previously configure fails for superserver)
-
-2003-07-09 03:20  brodsom
-
-	* firebird2/configure.in:
-	
-	-Correction due to 'install' move
-
-2003-07-09 02:46  brodsom
-
-	* firebird2/builds/posix/: Makefile.in.firebird, make.defaults:
-	
-	Corrections
-
-2003-07-09 01:38  brodsom
-
-	* firebird2/src/: qli/depends.mak, remote/depends.mak:
-	
-	Remove depends (unused and unmaintained)
-
-2003-07-09 01:32  brodsom
-
-	* firebird2/src/: burp/depends.mak, dsql/depends.mak,
-	dudley/depends.mak, intl/depends.mak, intlcpp/depends.mak,
-	isql/depends.mak, journal/depends.mak, lock/depends.mak,
-	msgs/depends.mak:
-	
-	Remove depends (unused and unmaintained)
-
-2003-07-09 01:10  brodsom
-
-	* firebird2/src/install/arch-specific/: darwin/FrameworkInfo.plist,
-	darwin/Makefile.in, freebsd/Makefile.in, solx86/Makefile.in,
-	solaris/Makefile.in, sinixz/Makefile.in, sinixz/pkginfo.in,
-	sinixz/postinstall.in, sinixz/postremove.in, sinixz/preinstall.in,
-	sinixz/prototype.in, mingw/Makefile.in,
-	linux/super/makeInstallImage.sh.in, linux/super/postinstall.sh.in,
-	linux/super/postuninstall.sh.in, linux/super/preinstall.sh.in,
-	linux/super/preuninstall.sh.in, linux/super/rpmfiles.txt.in,
-	linux/super/rpmheader.txt.in, linux/super/tarInstall.sh.in,
-	linux/super/tarMainInstall.sh.in,
-	linux/super/tarMainUninstall.sh.in, linux/super/taruninstall.sh.in,
-	linux/misc/changeDBAPassword.sh.in, linux/misc/firebird.xinetd.in,
-	linux/classic/README, linux/classic/makeInstallImage.sh.in,
-	linux/classic/postinstall.sh.in, linux/classic/postuninstall.sh.in,
-	linux/classic/preinstall.sh.in, linux/classic/preuninstall.sh.in,
-	linux/classic/rpmfiles.txt.in, linux/classic/rpmheader.txt.in,
-	linux/classic/tarMainInstall.sh.in,
-	linux/classic/tarMainUninstall.sh.in,
-	linux/classic/tarinstall.sh.in, linux/classic/taruninstall.sh.in,
-	linux/Makefile.in:
-	
-	Moving install from 'src' to 'builds'
-
-2003-07-09 01:05  brodsom
-
-	* firebird2/builds/win32/clean_all.bat:
-	
-	Moving install from 'src' to 'builds'
-
-2003-07-09 00:59  brodsom
-
-	* firebird2/builds/install/arch-specific/linux/classic/: README,
-	makeInstallImage.sh.in, postinstall.sh.in, postuninstall.sh.in,
-	preinstall.sh.in, preuninstall.sh.in, rpmfiles.txt.in,
-	rpmheader.txt.in, tarMainInstall.sh.in, tarMainUninstall.sh.in,
-	tarinstall.sh.in, taruninstall.sh.in:
-	
-	Moving install from 'src' to 'builds'
-
-2003-07-09 00:56  brodsom
-
-	* firebird2/builds/install/:
-	arch-specific/darwin/FrameworkInfo.plist,
-	arch-specific/darwin/Makefile.in,
-	arch-specific/freebsd/Makefile.in, arch-specific/linux/Makefile.in,
-	misc/CSchangeRunUser.sh, misc/CSrestoreRootRunUser.sh,
-	misc/IDPLicense.txt, misc/IPLicense.txt, misc/SSchangeRunUser.sh,
-	misc/SSrestoreRootRunUser.sh, misc/changeDBAPassword.sh,
-	misc/firebird.conf, misc/firebird.init.d.generic,
-	misc/firebird.init.d.mandrake,
-	arch-specific/win32/BuildExecutableInstall.bat,
-	arch-specific/win32/FirebirdInstall_15.iss,
-	arch-specific/win32/Readme.txt,
-	arch-specific/win32/firebird_install_logo1.bmp,
-	arch-specific/win32/installation_readme.txt,
-	arch-specific/win32/setenvvar.bat,
-	arch-specific/solx86/Makefile.in,
-	arch-specific/solaris/Makefile.in,
-	arch-specific/sinixz/Makefile.in, arch-specific/sinixz/pkginfo.in,
-	arch-specific/sinixz/postinstall.in,
-	arch-specific/sinixz/postremove.in,
-	arch-specific/sinixz/preinstall.in,
-	arch-specific/sinixz/prototype.in, arch-specific/mingw/Makefile.in,
-	arch-specific/linux/super/SSchangePasswd.sh,
-	arch-specific/linux/super/install.sh.in,
-	arch-specific/linux/super/makeInstallImage.sh.in,
-	arch-specific/linux/super/postinstall.sh.in,
-	arch-specific/linux/super/postuninstall.sh.in,
-	arch-specific/linux/super/preinstall.sh.in,
-	arch-specific/linux/super/preuninstall.sh.in,
-	arch-specific/linux/super/rpmfiles.txt.in,
-	arch-specific/linux/super/rpmheader.txt.in,
-	arch-specific/linux/super/tarInstall.sh.in,
-	arch-specific/linux/super/tarMainInstall.sh.in,
-	arch-specific/linux/super/tarMainUninstall.sh.in,
-	arch-specific/linux/super/taruninstall.sh.in,
-	arch-specific/linux/misc/changeDBAPassword.sh.in,
-	arch-specific/linux/misc/firebird.xinetd.in:
-	
-	Moving install from 'src' to 'builds'
-
-2003-07-09 00:53  brodsom
-
-	* firebird2/src/install/: misc/CSchangeRunUser.sh,
-	misc/CSrestoreRootRunUser.sh, misc/IDPLicense.txt,
-	misc/IPLicense.txt, misc/SSchangeRunUser.sh,
-	misc/SSrestoreRootRunUser.sh, misc/changeDBAPassword.sh,
-	misc/firebird.conf, misc/firebird.init.d.generic,
-	misc/firebird.init.d.mandrake,
-	arch-specific/win32/BuildExecutableInstall.bat,
-	arch-specific/win32/FirebirdInstall_15.iss,
-	arch-specific/win32/Readme.txt,
-	arch-specific/win32/firebird_install_logo1.bmp,
-	arch-specific/win32/installation_readme.txt,
-	arch-specific/linux/super/SSchangePasswd.sh,
-	arch-specific/linux/super/install.sh.in,
-	arch-specific/win32/setenvvar.bat:
-	
-	Moving install from 'src' to 'builds'
-
-2003-07-09 00:29  brodsom
-
-	* firebird2/doc/: cross_ref.html, emacros-cross_ref.html:
-	
-	Change document name
-
-2003-07-08 21:16  brodsom
-
-	* firebird2/doc/: cleaning-todo.txt, cleaning-todo.txt:
-	
-	Update
-
-2003-07-08 20:12  brodsom
-
-	* firebird2/doc/: cleaning-todo.txt, cross_ref.html:
-	
-	-Add external macros cross-reference -Add cleaning-todo
-
-2003-07-08 17:07  brodsom
-
-	* firebird2/src/: misc/isc.gdl, misc/scrty_unix.gdl,
-	misc/scrty_vms.gdl, misc/security.gdl, misc/security.sql,
-	utilities/isc.gdl, utilities/scrty_unix.gdl,
-	utilities/scrty_vms.gdl, utilities/security.gdl,
-	utilities/security.sql:
-	
-	Move security.fdb related scripts to misc
-
-2003-07-08 14:26  alexpeshkoff
-
-	* firebird2/src/jrd/opt.cpp:
-	
-	added static function declaration
-
-2003-07-08 14:23  brodsom
-
-	* firebird2/: Makefile.in, clean.sh, configure.in,
-	builds/posix/Makefile.in.codes, builds/posix/Makefile.in.embed.qli,
-	builds/posix/Makefile.in.firebird, builds/posix/Makefile.in.msgs,
-	builds/posix/Makefile.in.refDatabases:
-	
-	Posix build move build process and temporary databases to 'gen'
-
-2003-07-08 14:12  alexpeshkoff
-
-	* firebird2/src/jrd/opt.cpp:
-	
-	fixed AV on some combinations of CAST, BETWEEN and sub-select
-
-2003-07-08 13:49  dimitr
-
-	* firebird2/src/common/config/config_file.cpp:
-	
-	Removed warning for fbembed
-
-2003-07-08 13:32  skidder
-
-	* firebird2/doc/install_win32.txt:
-	
-	Correct docs a little
-
-2003-07-08 13:19  skidder
-
-	* firebird2/doc/WhatsNew:
-	
-	[no log message]
-
-2003-07-08 13:17  dimitr
-
-	* firebird2/src/dsql/parse.cpp:
-	
-	Fixed parse.cpp
-
-2003-07-08 12:56  alexpeshkoff
-
-	* firebird2/builds/win32/preprocess.bat:
-	
-	enable standalone use of preprocess.bat
-
-2003-07-08 12:45  brodsom
-
-	* firebird2/builds/posix/: Makefile.in.msgs, make.defaults:
-	
-	no message
-
-2003-07-08 12:20  brodsom
-
-	* firebird2/src/jrd/: winnt_dll.cpp, stubs.cpp:
-	
-	Remove unused sources
-
-2003-07-08 03:08  brodsom
-
-	* firebird2/clean.sh:
-	
-	Correction
-
-2003-07-08 03:04  brodsom
-
-	* firebird2/: clean.sh, configure.in,
-	builds/posix/Makefile.in.codes, builds/posix/Makefile.in.example5,
-	builds/posix/Makefile.in.firebird, builds/posix/Makefile.in.gpre,
-	builds/posix/Makefile.in.v5_examples, builds/posix/make.defaults,
-	builds/posix/make.rules, builds/posix/make.shared.targets,
-	builds/posix/make.shared.variables, builds/posix/prefix.solaris:
-	
-	-Split posix build output between 'gen' and 'temp'(compiler .o .d)
-	- Remove some redundant variables
-
-2003-07-08 01:49  skidder
-
-	* firebird2/src/dsql/parse.y:
-	
-	Fix problem in non-reserved Inserting/Updating/Deleting
-	implementation found by Dmitry Emanov
-
-2003-07-07 22:06  skidder
-
-	* firebird2/src/jrd/gds.cpp:
-	
-	Little fix to make Linux version compile
-
-2003-07-07 13:42  brodsom
-
-	* firebird2/doc/README.build.msvc.html:
-	
-	Correction
-
-2003-07-07 13:34  brodsom
-
-	* firebird2/builds/win32/clean_all.bat:
-	
-	Installer update
-
-2003-07-07 13:29  brodsom
-
-	* firebird2/doc/README.build.msvc.html:
-	
-	Installer update
-
-2003-07-07 02:56  brodsom
-
-	* firebird2/src/install/arch-specific/win32/FirebirdInstall_15.iss:
-	
-	Correction
-
-2003-07-06 17:13  dimitr
-
-	* firebird2/doc/WhatsNew:
-	
-	Added RC4 changed.
-
-2003-07-06 15:56  dimitr
-
-	* firebird2/src/jrd/tra.cpp:
-	
-	Fixed thread priority to avoid the sweeper to be locked outside the
-	scheduler under a heavy load.
-
-2003-07-06 15:35  dimitr
-
-	* firebird2/src/remote/srvr_w32.cpp:
-	
-	no message
-
-2003-07-06 13:38  dimitr
-
-	* firebird2/src/remote/srvr_w32.cpp:
-	
-	Preload the client library to fix the win98 UDF issues.
-
-2003-07-06 10:38  dimitr
-
-	* firebird2/builds/win32/defs/: fbclient.def, fbclient_debug.def:
-	
-	Minor addition to the private API
-
-2003-07-06 10:14  dimitr
-
-	* firebird2/src/isql/isql.epp:
-	
-	Fixed ISQL temp file bug.
-
-2003-07-06 09:05  dimitr
-
-	* firebird2/src/isql/isql.epp:
-	
-	no message
-
-2003-07-06 09:03  dimitr
-
-	* firebird2/src/: dudley/lex.cpp, gpre/gpre.cpp, isql/isql.h,
-	jrd/rse.cpp, jrd/sort.cpp, qli/lex.cpp:
-	
-	Uniform tempfile naming.
-
-2003-07-06 05:11  brodsom
-
-	* firebird2/src/ipserver/alli.cpp:
-	
-	Bracketing fix
-
-2003-07-06 04:15  brodsom
-
-	* firebird2/src/misc/: codes.h, codetext.h, gds_codes.ftn,
-	gds_codes.pas, msg_facs.h, msgs.h, rdb_codes.h, sql_code.h:
-	
-	Remove duplicated, unused and unmaintaned (dangerous) sources. The
-	maintained ones are in include/gen
-
-2003-07-06 04:04  brodsom
-
-	* firebird2/src/jrd/boot_codes/: codes.h, codetext.h, files.txt,
-	iberror.h, msg_facs.h, msgs.h, rdb_codes.h, sql_code.h:
-	
-	Remove duplicated, unused and unmaintaned (dangerous) sources. The
-	maintained ones are in include/gen
-
-2003-07-06 03:51  brodsom
-
-	* firebird2/builds/posix/Makefile.in.codes:
-	
-	Comment correction
-
-2003-07-06 03:18  hippoman
-
-	* firebird2/builds/win32/msvc7/: Firebird2Boot.sln,
-	build_msg.vcproj, codes.vcproj, common_static.vcproj,
-	fbclient_static.vcproj, gpre_static.vcproj, v5_examples.vcproj:
-	
-	Syncing MSVC7 build files
-
-2003-07-06 03:16  hippoman
-
-	* firebird2/builds/win32/: make_all.bat, make_boot.bat:
-	
-	Fixing MSVC7 build
-
-2003-07-06 03:07  brodsom
-
-	* firebird2/: src/make.new/config/config.h.in,
-	src/make.new/config/install-sh, builds/make.new/config/config.h.in,
-	builds/make.new/config/install-sh, clean.sh, configure.in:
-	
-	Move make.new to builds
-
 2003-07-05 17:44  brodsom
 
 	* firebird2/generated/pyxis/placeholder.txt:

Makefile.in

@@ -3,4 +3,4 @@
 all: firebird
 
 firebird install package packages dist clean clobber:
-	$(MAKE) -C gen $@
+	$(MAKE) -C src $@

builds/install/arch-specific/linux/super/tarinstall.sh.in

@@ -1,47 +0,0 @@
-#! /bin/sh
-#
-#  This library is part of the FirebirdSQL project
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
-#  You may obtain a copy of the Licence at
-#  http://www.gnu.org/licences/lgpl.html
-#  
-#  As a special exception this file can also be included in modules
-#  with other source code as long as that source code has been 
-#  released under an Open Source Initiative certificed licence.  
-#  More information about OSI certification can be found at: 
-#  http://www.opensource.org 
-#  
-#  This module is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU Lesser General Public Licence for more details.
-#  
-#  This module was created by members of the firebird development 
-#  team.  All individual contributions remain the Copyright (C) of 
-#  those individuals and all rights are reserved.  Contributors to 
-#  this file are either listed below or can be obtained from a CVS 
-#  history command.
-# 
-#   Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
-# 
-#   Contributor(s):
-#  
-# 
-#   $Id: tarinstall.sh.in,v 1.1 2003-07-09 01:24:36 brodsom Exp $
-# 
-
-# THe way this works is that the buildroot file is stored relative to the root
-# directory and a tar -xzf at root directory will restore all the files in 
-# the position that we want them to be
-
-OrigDir=`pwd`
-
-cd /
-
-tar -xzf $OrigDir/buildroot.tar.gz 
-
-cd $OrigDir

builds/posix/Makefile.in.client.util

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.client.util,v 1.11 2003-07-15 02:35:53 brodsom Exp $
+#  $Id: Makefile.in.client.util,v 1.9 2003-03-31 10:29:14 aafemt Exp $
 #
 ROOT=..
 ObjModuleName=client.util
@@ -51,39 +51,39 @@ DROP_Sources = $(addprefix utilities/, $(DROP_Files))
 DROP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DROP_Sources))))
 
 GSEC_Files =  gsec.cpp
-GSEC_Sources = $(addprefix utilities/gsec/, $(GSEC_Files))
+GSEC_Sources = $(addprefix utilities/, $(GSEC_Files))
 GSEC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSEC_Sources))))
 
 GSTAT_Files =  dba.epp ppg.cpp
-GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files))
+GSTAT_Sources = $(addprefix utilities/, $(GSTAT_Files))
 GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources))))
 
 
 FBGUARD_Files =  guard.cpp util.cpp
-FBGUARD_Sources = $(addprefix utilities/guard/, $(FBGUARD_Files))
+FBGUARD_Sources = $(addprefix utilities/, $(FBGUARD_Files))
 FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBGUARD_Sources))))
 
 IBGUARD_A_Files =  cntl_guard.cpp iscguard.cpp
 IBGUARD_A_Sources = $(addprefix iscguard/, $(IBGUARD_A_Files))
 IBGUARD_A_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_A_Sources))))
-IBGUARD_B_Files =  os/win32/chop.cpp
+IBGUARD_B_Files =  chop.cpp
 IBGUARD_B_Sources = $(addprefix remote/, $(IBGUARD_B_Files))
 IBGUARD_B_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_B_Sources))))
 
 FBMGR_Files =  	ibmgr.cpp srvrmgr.cpp
-FBMGR_Sources = $(addprefix utilities/ibmgr/, $(FBMGR_Files))
+FBMGR_Sources = $(addprefix utilities/, $(FBMGR_Files))
 FBMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBMGR_Sources))))
 
 INSTREG_Files =  	install_reg.cpp registry.cpp
-INSTREG_Sources = $(addprefix utilities/install/, $(INSTREG_Files))
+INSTREG_Sources = $(addprefix utilities/, $(INSTREG_Files))
 INSTREG_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(INSTREG_Sources))))
 
 INSTSVC_Files =  	install_svc.cpp services.cpp
-INSTSVC_Sources = $(addprefix utilities/install/, $(INSTSVC_Files))
+INSTSVC_Sources = $(addprefix utilities/, $(INSTSVC_Files))
 INSTSVC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(INSTSVC_Sources))))
 
 REBUILD_Files =  rebuild.cpp rstore.epp rmet.epp 
-REBUILD_Sources = $(addprefix utilities/rebuild/, $(REBUILD_Files))
+REBUILD_Sources = $(addprefix utilities/, $(REBUILD_Files))
 REBUILD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(REBUILD_Sources))))
 
 

builds/posix/Makefile.in.codes

@@ -29,7 +29,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.codes,v 1.12 2003-07-14 09:44:59 brodsom Exp $
+#  $Id: Makefile.in.codes,v 1.7 2003-07-08 01:05:22 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=codes
@@ -55,33 +55,29 @@ include     $(ROOT)/gen/make.shared.variables
 #CODES_OutFiles= gds_codes.pas gds_codes.ftn codes.h iberror.h codetext.h \
 #                msgs.h rdb_codes.h sql_code.h msg_facs.h
 #CODES_Results=$(addprefix include/gen/, $(CODES_OutFiles))
-CODES_Sources = misc/codes.epp
+CODES_Sources = jrd/codes.epp
 CODES_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CODES_Sources))))
-RELATIONS_Sources = misc/relations.epp
-RELATIONS_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELATIONS_Sources))))
 
 AllObjects = $(CODES_Objects)
 Dependencies = $(AllObjects:.o=.d)
 
-generated_headers: build_codes $(SRC_ROOT)/include/gen/ids.h
+generated_headers: build_codes include/gen/ids.h
 
-# Rebuild error codes and relations
+# Rebuild error codes
 
-build_codes: $(BIN)/codes msg.fdb $(BIN)/relations
+build_codes: $(BIN)/codes msg.fdb
-	$(BIN)/codes $(SRC_ROOT)/include/gen $(LNG_ROOT)
+	$(BIN)/codes include/gen
-	$(BIN)/relations $(SRC_ROOT)/include/gen
 
-$(SRC_ROOT)/misc/codes.cpp: $(SRC_ROOT)/misc/codes.epp
+$(SRC_ROOT)/jrd/codes.cpp: $(SRC_ROOT)/jrd/codes.epp
-	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
-
-$(SRC_ROOT)/misc/relations.cpp: $(SRC_ROOT)/misc/relations.epp
 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
 
 $(BIN)/codes: $(CODES_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
 	$(CXX) $(LINK_OPTS) $(CODES_Objects) -o $@ -L $(LIB) -lfbstatic -lfbcommon $(LINK_LIBS)
 
-$(BIN)/relations: $(RELATIONS_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
+
-	$(CXX) $(LINK_OPTS) $(RELATIONS_Objects) -o $@ -L $(LIB) -lfbstatic -lfbcommon $(LINK_LIBS)
+# Rebuild ids.h
+./include/gen/ids.h:	jrd/ids.m jrd/relations.h
+	m4 $< > include/gen/ids.h
 
 include $(ROOT)/gen/make.shared.targets
 

builds/posix/Makefile.in.embed.qli

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.embed.qli,v 1.11 2003-07-08 12:24:12 brodsom Exp $
+#  $Id: Makefile.in.embed.qli,v 1.10 2003-04-10 07:50:01 eku Exp $
 #
 ROOT=..
 ObjModuleName=embed.qli
@@ -67,7 +67,7 @@ $(QLI): $(QLI_Objects)
 #      with it. metadata.fdb is what is needed here.
 create_yachts:
 	-$(RM) yachts.lnk
-	-$(LN) -f metadata.fdb yachts.lnk
+	-$(LN) -f $(SRC_ROOT)/metadata.fdb yachts.lnk
 
 
 # qli_help

builds/posix/Makefile.in.embed.util

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.embed.util,v 1.9 2003-07-15 02:35:53 brodsom Exp $
+#  $Id: Makefile.in.embed.util,v 1.8 2003-03-28 11:29:18 aafemt Exp $
 #
 ROOT=..
 ObjModuleName=embed.util
@@ -51,26 +51,26 @@ DROP_Sources = $(addprefix utilities/, $(DROP_Files))
 DROP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DROP_Sources))))
 
 GSEC_Files =  gsec.cpp
-GSEC_Sources = $(addprefix utilities/gsec/, $(GSEC_Files))
+GSEC_Sources = $(addprefix utilities/, $(GSEC_Files))
 GSEC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSEC_Sources))))
 
 GSTAT_Files =  dba.epp ppg.cpp
-GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files))
+GSTAT_Sources = $(addprefix utilities/, $(GSTAT_Files))
 GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources))))
 
 
 IBGUARD_Files =  guard.cpp util.cpp
-IBGUARD_Sources = $(addprefix utilities/guard/, $(IBGUARD_Files))
+IBGUARD_Sources = $(addprefix utilities/, $(IBGUARD_Files))
 IBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_Sources))))
 
 
 IBMGR_Files =  	ibmgr.cpp srvrmgr.cpp
-IBMGR_Sources = $(addprefix utilities/ibmgr/, $(IBMGR_Files))
+IBMGR_Sources = $(addprefix utilities/, $(IBMGR_Files))
 IBMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBMGR_Sources))))
 
 
 REBUILD_Files =  rebuild.cpp rstore.epp rmet.epp 
-REBUILD_Sources = $(addprefix utilities/rebuild/, $(REBUILD_Files))
+REBUILD_Sources = $(addprefix utilities/, $(REBUILD_Files))
 REBUILD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(REBUILD_Sources))))
 
 

builds/posix/Makefile.in.example5

@@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: Makefile.in.example5,v 1.1 2003-07-11 13:30:32 brodsom Exp $
+#   $Id: Makefile.in.example5,v 1.7 2003-07-08 01:05:22 brodsom Exp $
 # 
 
 ROOT=../..

builds/posix/Makefile.in.extlib

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.extlib,v 1.12 2003-07-14 09:44:59 brodsom Exp $
+#  $Id: Makefile.in.extlib,v 1.10 2003-05-25 00:04:15 skidder Exp $
 #
 ROOT=..
 ObjModuleName=extlib
@@ -59,9 +59,9 @@ AllObjects = $(UDF_Objects) $(UTIL_Objects) $(FBUDF_Objects)
 Dependencies = $(AllObjects:.o=.d)
 
 
-.PHONY: all lib_ib_udf lib_ib_util
+.PHONY: all lib_ib_udf lib_ib_util lib_fb_udf
 
-all: lib_ib_udf lib_ib_util 
+all: lib_ib_udf lib_fb_udf lib_ib_util 
 
 
 # The libraires in this directory could do with a bit more work, since they
@@ -92,10 +92,10 @@ $(UDF)/ib_udf.$(SHRLIB_EXT):	$(UDF_Objects) $(UTIL_Objects)
 
 
 
-lib_fbudf: $(UDF)/fbudf.$(SHRLIB_EXT)
+lib_fb_udf: $(UDF)/fb_udf.$(SHRLIB_EXT)
 
-$(UDF)/fbudf.$(SHRLIB_EXT):	$(FBUDF_Objects) $(UTIL_Objects)
+$(UDF)/fb_udf.$(SHRLIB_EXT):	$(FBUDF_Objects) $(UTIL_Objects)
-	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^
+	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fb_udf.$(SHRLIB_EXT) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^
 #	-$(LN) $(@F) $(LIBFBINTL_SOBASENAME) 
 #	-$(LN) $(notdir $(LIBFBINTL_SOBASENAME)) $(LIBFBINTL_SONAME)
 

builds/posix/Makefile.in.firebird

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.firebird,v 1.41 2003-07-11 13:29:06 brodsom Exp $
+#  $Id: Makefile.in.firebird,v 1.37 2003-07-08 01:05:22 brodsom Exp $
 #
 
 ROOT=..
@@ -171,11 +171,11 @@ firebird_boot: updateBuildNum boot_phase1 boot_phase2
 
 updateBuildNum : jrd/build_no.h $(GEN_ROOT)/Make.Version
 
-jrd/build_no.h : $(SRC_ROOT)/misc/writeBuildNum.sh
+jrd/build_no.h : misc/writeBuildNum.sh
 	(cd ..; ./src/misc/writeBuildNum.sh rebuildHeader)
 
-$(GEN_ROOT)/Make.Version : $(SRC_ROOT)/misc/writeBuildNum.sh
+$(GEN_ROOT)/Make.Version : misc/writeBuildNum.sh
-	$(SRC_ROOT)/misc/writeBuildNum.sh createMakeVersion $@
+	misc/writeBuildNum.sh createMakeVersion $@
 
 
 # 
@@ -301,7 +301,7 @@ security.fdb: gdef isql 		# build the security database
 
 .PHONY: ref_databases msgs msgs_intl generated_headers intl extlib includes
 
-basic_targets: ref_databases msgs msgs_intl generated_headers intl extlib includes examples_cp \
+basic_targets: ref_databases msgs msgs_intl generated_headers intl extlib includes examples \
 		otherfiles
 
 # hack to make code regeneration work
@@ -324,17 +324,9 @@ extlib:                # external programs than can be called
 includes:	include_generic 
 
                        # examples still need a good makefile to ship with them
-examples_cp:
+examples:
-	$(CP) $(ROOT)/examples/readme $(FIREBIRD)/examples/README
+	$(MAKE) -C ../gen/v5_examples -f ../Makefile.v5_examples
-	$(CP) $(ROOT)/examples/*.* $(FIREBIRD)/examples/
+#	$(MAKE) -f $(GEN_ROOT)/Makefile.v5_examples
-	$(CP) $(ROOT)/examples/api/*.* $(FIREBIRD)/examples/api/
-	$(CP) $(ROOT)/examples/build_unix/*.* $(FIREBIRD)/examples/build_unix/
-	$(CP) $(ROOT)/examples/build_win32/*.* $(FIREBIRD)/examples/build_win32/
-	$(CP) $(ROOT)/examples/dyn/*.* $(FIREBIRD)/examples/dyn/
-	$(CP) $(ROOT)/examples/empbuild/*.* $(FIREBIRD)/examples/empbuild/
-	$(CP) $(ROOT)/examples/include/*.* $(FIREBIRD)/examples/include/
-	$(CP) $(ROOT)/examples/stat/*.* $(FIREBIRD)/examples/stat/
-	$(CP) $(ROOT)/examples/udf/*.* $(FIREBIRD)/examples/udf/
 
 otherfiles: misc_files script_files
 
@@ -503,7 +495,7 @@ endif
 misc_files : $(INSTALL_MiscFiles)
 
 
-$(FIREBIRD)/misc/% :: $(BLD_ROOT)/install/misc/%
+$(FIREBIRD)/misc/% :: $(SRC_ROOT)/install/misc/%
 	$(CP) $^ $@
 
 
@@ -525,15 +517,15 @@ endif
 script_files : $(INSTALL_ScriptFiles)
 
 
-$(BIN)/% :: $(BLD_ROOT)/install/classic/%
+$(BIN)/% :: $(SRC_ROOT)/install/classic/%
 	$(CP) $^ $@
 	$(CHMOD) ugo=rx $@
 
-$(BIN)/% :: $(BLD_ROOT)/install/super/%
+$(BIN)/% :: $(SRC_ROOT)/install/super/%
 	$(CP) $^ $@
 	$(CHMOD) ugo=rx $@
 
-$(BIN)/% :: $(BLD_ROOT)/install/misc/%
+$(BIN)/% :: $(SRC_ROOT)/install/misc/%
 	$(CP) $^ $@
 	$(CHMOD) ugo=rx $@
 

builds/posix/Makefile.in.gpre

@@ -0,0 +1,118 @@
+
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+# 
+# As a special exception this file can also be included in modules
+# with other source code as long as that source code has been 
+# released under an Open Source Initiative certificed licence.  
+# More information about OSI certification can be found at: 
+# http://www.opensource.org 
+# 
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public Licence for more details.
+# 
+# This module was created by members of the firebird development 
+# team.  All individual contributions remain the Copyright (C) of 
+# those individuals and all rights are reserved.  Contributors to 
+# this file are either listed below or can be obtained from a CVS 
+# history command.
+#
+#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
+#
+#  Contributor(s):
+# 
+#
+#  $Id: Makefile.in.gpre,v 1.8 2003-07-08 01:05:22 brodsom Exp $
+#
+ROOT=../..
+
+include     $(ROOT)/src/make.defaults
+include     $(ROOT)/src/make.platform
+include     $(ROOT)/src/make.rules
+include     $(ROOT)/src/make.shared.variables
+
+@SET_MAKE@
+
+
+
+
+GPRECommon_Sources += cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp gpre.cpp \
+		hsh.cpp int.cpp int_cxx.cpp jrdmet.cpp movg.cpp msc.cpp par.cpp \
+		pat.cpp pretty.cpp sqe.cpp sql.cpp noform.cpp \
+		@GPRE_LANGUAGE_MODULES@
+
+GPREBoot_Sources=  gpre_meta_boot.cpp ../common/fb_exception.cpp
+GPRE_Sources=	   gpre_meta.cpp
+
+GPRECommon_Objects = $(GPRECommon_Sources:%.cpp=$(OBJ)/%.o)
+GPREBoot_Objects = $(GPREBoot_Sources:%.cpp=$(OBJ)/%.o)
+GPRE_Objects = $(GPRE_Sources:%.cpp=$(OBJ)/%.o)
+
+
+AllObjects = $(GPRECommon_Objects) $(GPREBoot_Objects) $(GPRE_Objects) \
+			 $(GPRELIB_Objects)
+
+
+Dependencies = $(AllObjects:.o=.d)
+
+
+
+
+.PHONY: gpre_boot gpre_static gpre
+
+# As we build each of the gpre targets we change the link in $(GPRE_CURRENT)
+# to point to the latest one, that way the .epp.cpp rule is kept simple
+# and we always end up using the correct one at each bootstrap stage.
+
+gpre_boot : $(GPRE_BOOT)
+
+gpre_static : $(GPRE_STATIC)
+
+gpre : $(GPRE)
+
+
+$(GPRE_BOOT):	$(GPRECommon_Objects) $(GPREBoot_Objects) $(LIB)/jrd_boot.a $(LIB)/fbutil_boot.a $(LIB)/fbmem_boot.a
+	$(STATICEXE_LINK) -o $(GPRE_BOOT) $^  $(STATICLINK_LIBS)
+	-$(RM) $(GPRE_CURRENT)
+	$(LN) $(@F) $(GPRE_CURRENT)
+
+
+$(GPRE_STATIC):$(GPRECommon_Objects) $(GPRE_Objects) $(BOOT_GDSLIB_Objects)
+	$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ $(STATICLINK_LIBS)
+	$(CHMOD_7) $@
+	-$(RM) $(GPRE_CURRENT)
+	$(LN) $(@F) $(GPRE_CURRENT)
+
+
+$(GPRE):$(GPRECommon_Objects) $(GPRE_Objects) $(LIBGDS_DEP)
+	$(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS) 
+	$(CHMOD_7) $@
+	-$(RM) $(GPRE_CURRENT)
+	$(LN) $(@F) $(GPRE_CURRENT)
+
+
+
+# gpre_meta needs a special boot build since there is no database.
+$(SRC_ROOT)/gpre_meta.cpp:  $(SRC_ROOT)/gpre_meta.epp
+	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
+
+
+# In phase2 we add the same objects as before, we just rebuild them as
+# portable and load them into a shared libgds.$(SHRLIB_EXT) library.
+
+.PHONY: jrdlib_dependencies
+
+
+jrdlib_dependencies: $(GPRELIB_Objects)
+
+
+FORCE:
+
+-include $(Dependencies)

builds/posix/Makefile.in.libfbclient

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.libfbclient,v 1.15 2003-07-15 02:35:53 brodsom Exp $
+#  $Id: Makefile.in.libfbclient,v 1.14 2003-03-31 10:29:15 aafemt Exp $
 #
 ROOT=..
 ObjModuleName=libfbclient
@@ -73,8 +73,8 @@ WAL_ClientSources = $(addprefix wal/, $(WAL_ClientFiles))
 WAL_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(WAL_ClientSources))))
 
 
-SECURITY_ClientSources_gsec = $(addprefix utilities/gsec/, $(SECURITY_ClientFiles_gsec))
+SECURITY_ClientSources = $(addprefix utilities/, $(SECURITY_ClientFiles))
-SECURITY_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SECURITY_ClientSources_gsec))))
+SECURITY_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SECURITY_ClientSources))))
 
 
 FBUTIL_ClientSources = $(addprefix fbutil/, $(FBUTIL_ClientFiles))

builds/posix/Makefile.in.msgs

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.msgs,v 1.13 2003-07-08 12:24:12 brodsom Exp $
+#  $Id: Makefile.in.msgs,v 1.12 2003-07-08 10:45:47 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=msgs
@@ -147,7 +147,7 @@ indicator.loc:
 
 
 master_msg_db.lnk:
-	$(LN) -f msg.fdb master_msg_db.lnk
+	$(LN) -f $(SRC_ROOT)/msg.fdb master_msg_db.lnk
 
 
 

builds/posix/Makefile.in.refDatabases

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.refDatabases,v 1.18 2003-07-11 02:23:58 brodsom Exp $
+#  $Id: Makefile.in.refDatabases,v 1.16 2003-04-10 07:50:03 eku Exp $
 #
 ROOT=..
 ObjModuleName=refDatabases
@@ -75,7 +75,7 @@ empty.fdb : $(BIN)/create_db
 
 yachts.lnk: empty.fdb
 	$(RM) -f yachts.lnk
-	$(LN) -f empty.fdb yachts.lnk
+	$(LN) -f $(SRC_ROOT)/empty.fdb yachts.lnk
 
 
 
@@ -86,7 +86,7 @@ yachts.lnk: empty.fdb
 
 ref_databases : msg.fdb help.fdb metadata.fdb security.fdb
 
-msg.fdb:	$(BLD_ROOT)/misc/msg.gbak
+msg.fdb:	$(SRC_ROOT)/msgs/msg.gbak
 	$(BIN)/gbak_static -MODE read_only -R $< $@
 	$(TOUCH) $@
 	$(CHMOD) 444 $@
@@ -95,7 +95,7 @@ help.fdb:	$(FIREBIRD)/help/help.fdb
 	$(RM) -f $@
 	$(LN) -f $^ $@
 
-$(FIREBIRD)/help/help.fdb:	$(BLD_ROOT)/misc/help.gbak
+$(FIREBIRD)/help/help.fdb:	$(SRC_ROOT)/misc/help.gbak
 	$(BIN)/gbak_static -MODE read_only -R $< $@
 	$(TOUCH) $@
 	$(CHMOD) 444 $@
@@ -104,12 +104,12 @@ security.fdb:	$(FIREBIRD)/security.fdb
 	$(RM) -f $@
 	$(LN) -f $^ $@
 
-$(FIREBIRD)/security.fdb:	$(BLD_ROOT)/misc/security.gbak
+$(FIREBIRD)/security.fdb:	$(SRC_ROOT)/misc/security.gbak
 	$(BIN)/gbak_static  -R $< $@
 	$(TOUCH) $@
 	$(CHMOD) 666 $@
 
-metadata.fdb:	$(BLD_ROOT)/misc/metadata.gbak
+metadata.fdb:	$(SRC_ROOT)/misc/metadata.gbak
 	$(BIN)/gbak_static -MODE read_only -R $< $@
 	$(TOUCH) $@
 	$(CHMOD) 444 $@

builds/posix/Makefile.in.v5_examples

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.v5_examples,v 1.1 2003-07-11 13:30:32 brodsom Exp $
+#  $Id: Makefile.in.v5_examples,v 1.9 2003-07-08 01:05:22 brodsom Exp $
 #
 ROOT=../..
 ObjModuleName=v5_examples

builds/posix/make.defaults

@@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: make.defaults,v 1.27 2003-07-11 02:23:58 brodsom Exp $
+#   $Id: make.defaults,v 1.25 2003-07-08 10:45:47 brodsom Exp $
 # 
 
 
@@ -44,9 +44,6 @@
 TMP_ROOT=$(ROOT)/temp
 GEN_ROOT=$(ROOT)/gen
 SRC_ROOT=$(ROOT)/src
-BLD_ROOT=$(ROOT)/builds
-LNG_ROOT=$(ROOT)/lang_helpers
-EXA_ROOT=$(ROOT)/examples
 
 FIREBIRD=$(GEN_ROOT)/firebird
 INTERBASE=$(FIREBIRD)
@@ -142,7 +139,7 @@ BLRTABLE	= $(BIN)/blrtable$(EXEC_EXT)
 
 
 # The shared library name for the embedded (or classic) library
-# SD: This name is also hard-coded in builds/install/.../linux/classic scripts.
+# SD: This name is also hard-coded in src/install/.../linux/classic scripts.
 #     Scold me, but I don't want library names to be in configure.in
 # 
 

builds/posix/make.shared.targets

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: make.shared.targets,v 1.15 2003-07-14 23:21:39 brodsom Exp $
+#  $Id: make.shared.targets,v 1.13 2003-07-08 01:05:22 brodsom Exp $
 #
 
 
@@ -46,8 +46,8 @@
 
 $(SRC_ROOT)/dsql/parse.cpp: $(SRC_ROOT)/dsql/parse.y $(SRC_ROOT)/dsql/parse.sed
 	$(YACC) -l -d $<
-	$(MV) $(GEN_ROOT)/y.tab.c $(SRC_ROOT)/dsql/dsql.tab.c
+	$(MV) $(SRC_ROOT)/y.tab.c $(SRC_ROOT)/dsql/dsql.tab.c
-	$(MV) $(GEN_ROOT)/y.tab.h $(SRC_ROOT)/dsql/dsql.tab.h
+	$(MV) $(SRC_ROOT)/y.tab.h $(SRC_ROOT)/dsql/dsql.tab.h
 	sed -e 's/\\r//g' $(SRC_ROOT)/dsql/parse.sed > $(SRC_ROOT)/dsql/parse2.sed
 	sed -f $(SRC_ROOT)/dsql/parse2.sed <$(SRC_ROOT)/dsql/dsql.tab.c > $@  
 	-$(RM) $(SRC_ROOT)/dsql/parse2.sed
@@ -93,12 +93,12 @@ $(BLRTABLE): $(BLRTABLE_Objects)
 # Adding resources as prerequisite for some files
 
 $(FilesToAddVersionInfo): $(GEN_ROOT)/jrd/version.res
-$(FilesToAddDialog): $(GEN_ROOT)/remote/os/win32/window.res
+$(FilesToAddDialog): $(GEN_ROOT)/remote/window.res
 
 # Explicit dependence of resource script
-$(GEN_ROOT)/remote/os/win32/window.res: $(SRC_ROOT)/remote/os/win32/window.rc $(SRC_ROOT)/remote/os/win32/window.rh \
+$(GEN_ROOT)/remote/window.res: $(SRC_ROOT)/remote/window.rc $(SRC_ROOT)/remote/window.rh \
- $(SRC_ROOT)/jrd/version.rc $(SRC_ROOT)/jrd/build_no.h $(SRC_ROOT)/remote/os/win32/property.rc \
+ $(SRC_ROOT)/jrd/version.rc $(SRC_ROOT)/jrd/build_no.h $(SRC_ROOT)/remote/property.rc \
- $(SRC_ROOT)/remote/os/win32/property.rh $(SRC_ROOT)/remote/os/win32/ibconfig.rc
+ $(SRC_ROOT)/remote/property.rh $(SRC_ROOT)/remote/ibconfig.rc
 
 .PHONY: clean FORCE
 

builds/posix/make.shared.variables

@@ -99,7 +99,7 @@ REMOTE_ClientFiles =  allr.cpp inet.cpp interface.cpp merge.cpp \
             parser.cpp protocol.cpp remote.cpp xdr.cpp
 
 ifeq ($(PLATFORM),win32)
-REMOTE_ClientFiles += os/win32/wnet.cpp xnet.cpp
+REMOTE_ClientFiles += wnet.cpp xnet.cpp
 endif
 
 INTERFACE_Files=	$(REMOTE_ClientFiles)
@@ -170,26 +170,17 @@ BURP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(BURP_Sources)))
 #
 # utilities
 
-SECURITY_ClientFiles_gsec = security.cpp
+SECURITY_ClientFiles = security.cpp
 
-SECURITY_ServerFiles_gsec:=
+SECURITY_ServerFiles:=
-SECURITY_ServerFiles_gstat:=
-SECURITY_ServerFiles_common:=
 
 ifeq ($(ArchType),super)
-    SECURITY_ServerFiles_gsec:= $(SECURITY_ServerFiles_gsec) gsec.cpp 
+    SECURITY_ServerFiles:= $(SECURITY_ServerFiles) gsec.cpp dba.epp ppg.cpp cmd_util.cpp
-    SECURITY_ServerFiles_gstat:= $(SECURITY_ServerFiles_gstat) dba.epp ppg.cpp 
-    SECURITY_ServerFiles_common:= $(SECURITY_ServerFiles_common) cmd_util.cpp
 endif
 
-SECURITY_Files_gsec = $(SECURITY_ClientFiles_gsec) $(SECURITY_ServerFiles_gsec)
+SECURITY_Files = $(SECURITY_ClientFiles) $(SECURITY_ServerFiles)
-SECURITY_Files_gstat = $(SECURITY_ServerFiles_gstat)
-SECURITY_Files_common = $(SECURITY_ServerFiles_common)
-SECURITY_Sources_gsec = $(addprefix utilities/gsec/, $(SECURITY_Files_gsec))
-SECURITY_Sources_gstat = $(addprefix utilities/gstat/, $(SECURITY_Files_gstat))
-SECURITY_Sources_common = $(addprefix utilities/common/, $(SECURITY_Files_common))
 
-SECURITY_Sources = $(SECURITY_Sources_gsec) $(SECURITY_Sources_gstat) $(SECURITY_Sources_common)
+SECURITY_Sources = $(addprefix utilities/, $(SECURITY_Files))
 SECURITY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SECURITY_Sources))))
 
 #________________________________________________________________________
@@ -308,5 +299,5 @@ LIBFBSTATIC_Objects = $(OS_SPECIFIC_Objects) \
 #
 # blrtable builder
 
-BLRTABLE_Sources = misc/blrtable.cpp
+BLRTABLE_Sources = jrd/blrtable.cpp
 BLRTABLE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(BLRTABLE_Sources))))

builds/posix/prefix.darwin

@@ -15,7 +15,7 @@
 # All Rights Reserved.
 # Contributor(s): ______________________________________.
 # Start of file prefix.darwin:	$(VERSION)	@PLATFORM@
-#$Id: prefix.darwin,v 1.9 2003-07-14 11:23:04 brodsom Exp $
+#$Id: prefix.darwin,v 1.8 2003-03-05 15:42:28 brodsom Exp $
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
 
 OS_ServerFiles=inet_server.cpp
@@ -28,4 +28,4 @@ LIB_LINK_SONAME:=-Wl,-soname,
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec 
 CLIENT_UTIL_TARGETS=gds_drop gds_delay gstat gsec fbguard fbmgr_bin
 
-Physical_IO_Module=os/posix/unix.cpp
+Physical_IO_Module=unix.cpp

builds/posix/prefix.example

@@ -15,4 +15,4 @@ LIB_LINK_SONAME:=-Wl,-soname,
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec 
 CLIENT_UTIL_TARGETS=gds_drop gds_delay gstat gsec fbguard fbmgr_bin
 
-Physical_IO_Module=os/posix/unix.cpp
+Physical_IO_Module=unix.cpp

builds/posix/prefix.freebsd

@@ -15,7 +15,7 @@
 # All Rights Reserved.
 # Contributor(s): ______________________________________.
 # Start of file prefix.freebsd:	$(VERSION)	@PLATFORM@
-#$Id: prefix.freebsd,v 1.7 2003-07-14 11:23:04 brodsom Exp $
+#$Id: prefix.freebsd,v 1.6 2003-03-05 15:42:27 brodsom Exp $
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
 
 OS_ServerFiles=inet_server.cpp
@@ -28,4 +28,4 @@ LIB_LINK_SONAME:=-Wl,-soname,
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec 
 CLIENT_UTIL_TARGETS=gds_drop gds_delay gstat gsec fbguard fbmgr_bin
 
-Physical_IO_Module=os/posix/unix.cpp
+Physical_IO_Module=unix.cpp

builds/posix/prefix.linux

@@ -15,7 +15,7 @@
 # All Rights Reserved.
 # Contributor(s): ______________________________________.
 # Start of file prefix.linux:	$(VERSION)	$(PLATFORM)
-#$Id: prefix.linux,v 1.19 2003-07-14 11:23:04 brodsom Exp $
+#$Id: prefix.linux,v 1.18 2003-06-06 09:31:48 alexpeshkoff Exp $
 # 2 Oct 2002, Nickolay Samofatov - Major cleanup
 
 # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
@@ -31,4 +31,4 @@ LIB_LINK_SONAME:=-Wl,-soname,
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec 
 CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin
 
-Physical_IO_Module=os/posix/unix.cpp
+Physical_IO_Module=unix.cpp

builds/posix/prefix.mingw

@@ -25,7 +25,7 @@ JRDBOOT_Extra_Files=isc_sync.cpp thd.cpp
 
 OS_SPECIFIC_Files=thd_priority.cpp
 
-OS_ServerFiles= os/win32/srvr_w32 os/win32/window.cpp os/win32/chop.cpp os/win32/property.cpp os/win32/ibconfig.cpp os/win32/cntl.cpp 
+OS_ServerFiles=srvr_w32 window.cpp chop.cpp property.cpp ibconfig.cpp cntl.cpp 
 
 LIB_LINK_OPTIONS:=-shared -Wl,--add-stdcall-alias
 LIB_LINK_RPATH:=-Wl,-rpath,
@@ -35,7 +35,7 @@ EMBED_UTIL_TARGETS:=gstat gsec
 CLIENT_UTIL_TARGETS:=gstat gsec ibguard instsvc instreg 
 WIN_IPSERVER_Files:=ipserver.cpp alli.cpp
 
-Physical_IO_Module=os/win32/winnt.cpp
+Physical_IO_Module=winnt.cpp
 
 # Add resources to some files
 FilesToAddVersionInfo=$(LIBFBEMBED_SO) $(LIBFBCLIENT_SO) $(LIBFBINTL_SO) \

builds/posix/prefix.sinixz

@@ -17,7 +17,7 @@
 #
 # Erik Kunze, Philosys GmbH, <kunze@philosys.de>
 #
-# $Id: prefix.sinixz,v 1.17 2003-07-14 11:23:04 brodsom Exp $
+# $Id: prefix.sinixz,v 1.16 2003-03-05 15:42:26 brodsom Exp $
 #
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
 
@@ -42,6 +42,6 @@ LIB_LINK_SONAME:=-Wl,-soname,
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec 
 CLIENT_UTIL_TARGETS=gds_drop gds_delay gstat gsec fbguard fbmgr_bin
 
-Physical_IO_Module=os/posix/unix.cpp
+Physical_IO_Module=unix.cpp
 
 # EOF

builds/posix/prefix.solaris

@@ -60,4 +60,4 @@ LIB_LINK_SONAME:=-h
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec 
 CLIENT_UTIL_TARGETS=gds_drop gds_delay gstat gsec fbguard fbmgr_bin
 
-Physical_IO_Module=os/posix/unix.cpp
+Physical_IO_Module=unix.cpp

builds/posix/prefix.solx86

@@ -18,7 +18,7 @@
 #
 # Use SOLX86 to identify x86 version of Solaris.  Neil McCalden
 #  
-# $Id: prefix.solx86,v 1.19 2003-07-14 11:23:04 brodsom Exp $
+# $Id: prefix.solx86,v 1.18 2003-06-20 17:55:29 kkuznetsov Exp $
 #
 # Start of file prefix.solaris X 86 :	$(VERSION)	$(PLATFORM)
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
@@ -65,4 +65,4 @@ LIB_LINK_SONAME:=-h
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec 
 CLIENT_UTIL_TARGETS=gds_drop gds_delay gstat gsec fbguard fbmgr_bin
 
-Physical_IO_Module=os/posix/unix.cpp
+Physical_IO_Module=unix.cpp

builds/posix/prefix.solx86gcc

@@ -18,7 +18,7 @@
 #
 # Use SOLX86 to identify x86 version of Solaris.  Neil McCalden
 #  
-# $Id: prefix.solx86gcc,v 1.2 2003-07-14 11:23:04 brodsom Exp $
+# $Id: prefix.solx86gcc,v 1.1 2003-06-20 17:55:29 kkuznetsov Exp $
 #
 # Start of file prefix.solaris X 86 :	$(VERSION)	$(PLATFORM)
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
@@ -65,4 +65,4 @@ LIB_LINK_SONAME:=-h
 EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec 
 CLIENT_UTIL_TARGETS=gds_drop gds_delay gstat gsec fbguard fbmgr_bin
 
-Physical_IO_Module=os/posix/unix.cpp
+Physical_IO_Module=unix.cpp

builds/win32/blrtable.bat

@@ -1,4 +1,4 @@
-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\misc\blrtable.cpp
+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 > nul

builds/win32/clean_all.bat

@@ -8,11 +8,13 @@
 @rmdir /S /Q %ROOT_PATH%\gen 2>nul
 @rmdir /S /Q %ROOT_PATH%\temp 2>nul
 
-@echo Cleaning and install build files
+@echo Cleaning build files
 @del *.log 2>nul
 @del %ROOT_PATH%\src\include\gen\autoconfig.h 2>nul
 @del %ROOT_PATH%\src\include\gen\blrtable.h 2>nul
 @del %ROOT_PATH%\builds\win32\msvc6\*.plg 2>nul
 @del %ROOT_PATH%\builds\win32\msvc7\*.plg 2>nul
-@del %ROOT_PATH%\builds\install\arch-specific\win32\*.dll 2>nul
+
-@rmdir /s /q %ROOT_PATH%\builds\win32\install_image 2>nul
+@Echo Cleaning install files
+@del %ROOT_PATH%\src\install\arch-specific\win32\*.dll 2>nul
+@rmdir /s /q %ROOT_PATH%\builds\win32\install_image

builds/win32/make_all.bat

@@ -34,7 +34,7 @@
 :RELEASE
 @echo Building release
 if "%VS_VER%"=="msvc6" (
-	@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.dsw /MAKE "fbserver - Win32 Release" "fbguard - Win32 Release" "fb_lock_print - Win32 Release" "fb_inet_server - Win32 Release" "gbak - Win32 Release" "gpre - Win32 Release" "gsplit - Win32 Release" "gdef - Win32 Release" "gfix - Win32 Release" "gsec - Win32 Release" "gstat - Win32 Release" "instreg - Win32 Release" "instsvc - Win32 Release" "isql - Win32 Release" "qli - Win32 Release" "gds32 - Win32 Release" "fbclient - Win32 Release" "fbudf - Win32 Release" "ib_udf - Win32 Release" "ib_util - Win32 Release" "intl - Win32 Release" "intlcpp - Win32 Release" %CLEAN% /OUT all.log
+	@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.dsw /MAKE "fbserver - Win32 Release" "fbguard - Win32 Release" "fb_lock_print - Win32 Release" "fb_inet_server - Win32 Release" "gbak - Win32 Release" "gpre - Win32 Release" "gsplit - Win32 Release" "gdef - Win32 Release" "gfix - Win32 Release" "gsec - Win32 Release" "gstat - Win32 Release" "instreg - Win32 Release" "instsvc - Win32 Release" "isql - Win32 Release" "qli - Win32 Release" "gds32 - Win32 Release" "fbclient - Win32 Release" "ib_udf - Win32 Release" "ib_util - Win32 Release" "intl - Win32 Release" "intlcpp - Win32 Release" %CLEAN% /OUT all.log
 ) else (
 	@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.sln %CLEAN% release /OUT all.log
 )
@@ -44,7 +44,7 @@ if "%VS_VER%"=="msvc6" (
 :DEBUG
 @echo Building debug
 if "%VS_VER%"=="msvc6" (
-	@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.dsw /MAKE "fbserver - Win32 Debug" "fbguard - Win32 Debug" "fb_lock_print - Win32 Debug" "fb_inet_server - Win32 Debug" "gbak - Win32 Debug" "gpre - Win32 Debug" "gsplit - Win32 Debug" "gdef - Win32 Debug" "gfix - Win32 Debug" "gsec - Win32 Debug" "gstat - Win32 Debug" "instreg - Win32 Debug" "instsvc - Win32 Debug" "isql - Win32 Debug" "qli - Win32 Debug" "gds32 - Win32 Debug" "fbclient - Win32 Debug" "fbudf - Win32 Debug" "ib_udf - Win32 Debug" "ib_util - Win32 Debug" "intl - Win32 Debug" "intlcpp - Win32 Debug" %CLEAN% /OUT all.log
+	@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.dsw /MAKE "fbserver - Win32 Debug" "fbguard - Win32 Debug" "fb_lock_print - Win32 Debug" "fb_inet_server - Win32 Debug" "gbak - Win32 Debug" "gpre - Win32 Debug" "gsplit - Win32 Debug" "gdef - Win32 Debug" "gfix - Win32 Debug" "gsec - Win32 Debug" "gstat - Win32 Debug" "instreg - Win32 Debug" "instsvc - Win32 Debug" "isql - Win32 Debug" "qli - Win32 Debug" "gds32 - Win32 Debug" "fbclient - Win32 Debug" "ib_udf - Win32 Debug" "ib_util - Win32 Debug" "intl - Win32 Debug" "intlcpp - Win32 Debug" %CLEAN% /OUT all.log
 ) else (
 	@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.sln %CLEAN% debug /OUT all.log
 )
@@ -64,73 +64,18 @@ if "%VS_VER%"=="msvc6" (
 @mkdir %ROOT_PATH%\output\doc
 @mkdir %ROOT_PATH%\output\include
 @mkdir %ROOT_PATH%\output\lib
-@mkdir %ROOT_PATH%\output\examples
-@mkdir %ROOT_PATH%\output\examples\api
-@mkdir %ROOT_PATH%\output\examples\build_unix
-@mkdir %ROOT_PATH%\output\examples\build_win32
-@mkdir %ROOT_PATH%\output\examples\dyn
-@mkdir %ROOT_PATH%\output\examples\empbuild
-@mkdir %ROOT_PATH%\output\examples\include
-@mkdir %ROOT_PATH%\output\examples\stat
-@mkdir %ROOT_PATH%\output\examples\udf
-::
 @copy %ROOT_PATH%\temp\%DBG_DIR%\firebird\bin\* %ROOT_PATH%\output\bin >nul
 @copy %ROOT_PATH%\temp\%DBG_DIR%\firebird\intl\* %ROOT_PATH%\output\intl >nul
 @copy %ROOT_PATH%\temp\%DBG_DIR%\firebird\udf\* %ROOT_PATH%\output\udf >nul
-:: Firebird.conf, etc
+
-@copy %ROOT_PATH%\gen\firebird.msg %ROOT_PATH%\output > nul
-@copy %ROOT_PATH%\builds\install\misc\firebird.conf %ROOT_PATH%\output >nul
-:: DATABASES
 @copy %ROOT_PATH%\gen\dbs\SECURITY.FDB %ROOT_PATH%\output\security.fdb >nul
 @copy %ROOT_PATH%\gen\dbs\HELP.fdb %ROOT_PATH%\output\help\help.fdb >nul
 @copy %ROOT_PATH%\gen\firebird.msg %ROOT_PATH%\output\firebird.msg >nul
-@copy %ROOT_PATH%\builds\misc\security.gbak %ROOT_PATH%\output\security.fbk > nul
+
-:: LIB
-@copy %ROOT_PATH%\temp\%DBG_DIR%\gds32\gds32.lib %ROOT_PATH%\output\lib\gds32_ms.lib >nul
-@copy %ROOT_PATH%\temp\%DBG_DIR%\fbclient\fbclient.lib %ROOT_PATH%\output\lib\fbclient_ms.lib >nul
-:: DOCS
 @copy %ROOT_PATH%\ChangeLog %ROOT_PATH%\output\doc\ChangeLog.txt >nul
 @copy %ROOT_PATH%\doc\WhatsNew %ROOT_PATH%\output\doc\WhatsNew.txt >nul
-:: HEADERS
+@copy %ROOT_PATH%\src\jrd\ibase.h %ROOT_PATH%\output\include >nul
-:: build headers
+@copy %ROOT_PATH%\src\include\gen\iberror.h %ROOT_PATH%\output\include >nul
-copy %ROOT_PATH%\src\misc\gds_header.txt %ROOT_PATH%\output\include\gds.tmp > nul
-type %ROOT_PATH%\src\include\fb_types.h >> %ROOT_PATH%\output\include\gds.tmp
-type %ROOT_PATH%\src\jrd\ibase.h >> %ROOT_PATH%\output\include\gds.tmp
-type %ROOT_PATH%\src\jrd\blr.h >> %ROOT_PATH%\output\include\gds.tmp
-type %ROOT_PATH%\src\include\gen\iberror.h >> %ROOT_PATH%\output\include\gds.tmp
-type %ROOT_PATH%\src\jrd\gdsold.h >> %ROOT_PATH%\output\include\gds.tmp
-type %ROOT_PATH%\src\include\gen\codes.h >> %ROOT_PATH%\output\include\gds.tmp
-sed -f %ROOT_PATH%\src\misc\headers.sed < %ROOT_PATH%\output\include\gds.tmp > %ROOT_PATH%\output\include\gds.h
-del %ROOT_PATH%\output\include\gds.tmp > nul
-
-copy %ROOT_PATH%\src\misc\ibase_header.txt %ROOT_PATH%\output\include\ibase.tmp > nul
-type %ROOT_PATH%\src\include\fb_types.h >> %ROOT_PATH%\output\include\ibase.tmp
-type %ROOT_PATH%\src\jrd\ibase.h >> %ROOT_PATH%\output\include\ibase.tmp 
-type %ROOT_PATH%\src\jrd\blr.h >> %ROOT_PATH%\output\include\ibase.tmp
-type %ROOT_PATH%\src\include\gen\iberror.h >> %ROOT_PATH%\output\include\ibase.tmp
-sed -f %ROOT_PATH%\src\misc\headers.sed < %ROOT_PATH%\output\include\ibase.tmp > %ROOT_PATH%\output\include\ibase.h
-del %ROOT_PATH%\output\include\ibase.tmp > nul
-
-copy %ROOT_PATH%\src\extlib\ib_util.h %ROOT_PATH%\output\include > nul
-copy %ROOT_PATH%\src\jrd\perf.h %ROOT_PATH%\output\include >nul
-copy %ROOT_PATH%\src\jrd\blr.h %ROOT_PATH%\output\include > nul
-copy %ROOT_PATH%\src\include\gen\iberror.h %ROOT_PATH%\output\include > nul
-:: UDF
-copy %ROOT_PATH%\src\extlib\ib_udf.sql %ROOT_PATH%\output\udf > nul
-copy %ROOT_PATH%\src\extlib\fbudf\fbudf.sql %ROOT_PATH%\output\udf > nul
-:: Examples
-@copy %ROOT_PATH%\examples\* %ROOT_PATH%\output\examples > nul
-@copy %ROOT_PATH%\examples\api\* %ROOT_PATH%\output\examples\api > nul
-@copy %ROOT_PATH%\examples\build_unix\* %ROOT_PATH%\output\examples\build_unix > nul
-@copy %ROOT_PATH%\examples\build_win32\* %ROOT_PATH%\output\examples\build_win32 > nul
-@copy %ROOT_PATH%\examples\dyn\* %ROOT_PATH%\output\examples\dyn > nul
-@copy %ROOT_PATH%\examples\empbuild\* %ROOT_PATH%\output\examples\empbuild > nul
-@copy %ROOT_PATH%\examples\include\* %ROOT_PATH%\output\examples\include > nul
-@copy %ROOT_PATH%\examples\stat\* %ROOT_PATH%\output\examples\stat > nul
-@copy %ROOT_PATH%\examples\udf\* %ROOT_PATH%\output\examples\udf > nul
-@copy %ROOT_PATH%\src\extlib\ib_udf* %ROOT_PATH%\output\examples\udf > nul
-@copy %ROOT_PATH%\src\extlib\fbudf\* %ROOT_PATH%\output\examples\udf > nul
-::
 @copy install_super.bat %ROOT_PATH%\output\bin >nul
 @copy install_classic.bat %ROOT_PATH%\output\bin >nul
 @copy uninstall.bat %ROOT_PATH%\output\bin >nul

builds/win32/make_boot.bat

@@ -34,18 +34,14 @@
 @mkdir %ROOT_PATH%\gen\isql 2>nul
 @rmdir /s /q %ROOT_PATH%\gen\jrd 2>nul
 @mkdir %ROOT_PATH%\gen\jrd 2>nul
-@rmdir /s /q %ROOT_PATH%\gen\misc 2>nul
-@mkdir %ROOT_PATH%\gen\misc 2>nul
 @rmdir /s /q %ROOT_PATH%\gen\msgs 2>nul
 @mkdir %ROOT_PATH%\gen\msgs 2>nul
 @rmdir /s /q %ROOT_PATH%\gen\qli 2>nul
 @mkdir %ROOT_PATH%\gen\qli 2>nul
 @rmdir /s /q %ROOT_PATH%\gen\utilities 2>nul
 @mkdir %ROOT_PATH%\gen\utilities 2>nul
-@rmdir /s /q %ROOT_PATH%\gen\utilities\gstat 2>nul
+@rmdir /s /q %ROOT_PATH%\gen\v5_examples 2>nul
-@mkdir %ROOT_PATH%\gen\utilities\gstat 2>nul
+@mkdir %ROOT_PATH%\gen\v5_examples 2>nul
-@rmdir /s /q %ROOT_PATH%\gen\utilities\gsec 2>nul
-@mkdir %ROOT_PATH%\gen\utilities\gsec 2>nul
 
 ::=======
 @call :gpre_boot
@@ -62,8 +58,7 @@
 ::=======
 @echo Building message file and codes header...
 @%ROOT_PATH%\gen\build_msg -f %DB_PATH%/gen/firebird.msg -D localhost:%DB_PATH%/gen/dbs/msg.fdb
-@%ROOT_PATH%\gen\codes %ROOT_PATH%\src\include\gen %ROOT_PATH%\lang_helpers
+@%ROOT_PATH%\gen\codes %ROOT_PATH%\src\include\gen
-@%ROOT_PATH%\gen\relations %ROOT_PATH%\src\include\gen
 ::=======
 @echo Building BLR Table
 @call blrtable.bat
@@ -99,20 +94,18 @@ if "%VS_VER%"=="msvc6" (
 
 
 ::===================
-:: BUILD messages, codes and relations
+:: BUILD messages and codes
 :msgs
 @echo.
 @echo Building build_msg and codes...
 if "%VS_VER%"=="msvc6" (
-	@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot.dsw /MAKE "build_msg - Win32 Release" "codes - Win32 Release" "relations - Win32 Release" /REBUILD /OUT boot3.log
+	@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot.dsw /MAKE "build_msg - Win32 Release" "codes - Win32 Release"  /REBUILD /OUT boot3.log
 ) else (
 	@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot.sln /project build_msg /rebuild release /OUT boot3.log
 	@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot.sln /project codes  /rebuild release /OUT boot4.log
-	@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2Boot.sln /project relations  /rebuild release /OUT boot4.log
 )
 @copy %ROOT_PATH%\temp\release\build_msg\build_msg.exe   %ROOT_PATH%\gen\ > nul
 @copy %ROOT_PATH%\temp\release\codes\codes.exe   %ROOT_PATH%\gen\ > nul
-@copy %ROOT_PATH%\temp\release\relations\relations.exe   %ROOT_PATH%\gen\ > nul
 @goto :EOF
 
 ::==============

builds/win32/make_examples.bat

@@ -0,0 +1,114 @@
+
+@echo off
+
+:: Set env vars
+@call setenvvar.bat
+@if errorlevel 1 (goto :END)
+
+:: verify that prepare was run before
+@if not exist %ROOT_PATH%\gen\dbs\metadata.fdb (goto :HELP_PREP & goto :END)
+
+:: verify that boot was run before
+@if not exist %ROOT_PATH%\gen\gpre_boot.exe (goto :HELP_BOOT & goto :END)
+
+::===========
+:: Read input values
+@set DBG=
+@set DBG_DIR=release
+@set CLEAN=/build
+@if "%1"=="DEBUG" ((set DBG=TRUE) && (set DBG_DIR=debug))
+@if "%2"=="DEBUG" ((set DBG=TRUE) && (set DBG_DIR=debug))
+@if "%1"=="CLEAN" (set CLEAN=/REBUILD)
+@if "%2"=="CLEAN" (set CLEAN=/REBUILD)
+
+::===========
+:MAIN
+@call :BUILD_EMPBUILD
+@if "%DBG%"=="" (call :RELEASE) else (call :DEBUG)
+@call :MOVE
+@call :BUILD_EMPLOYEE
+@goto :END
+
+::===========
+:BUILD_EMPBUILD
+@echo.
+@echo Building empbuild.fdb
+@copy %ROOT_PATH%\src\v5_examples\*.sql   %ROOT_PATH%\gen\v5_examples\ > nul
+@copy %ROOT_PATH%\src\v5_examples\*.inp   %ROOT_PATH%\gen\v5_examples\ > nul
+
+@echo.
+@echo Creating empbuild.fdb
+:: Here we must use cd because isql does not have an option to set a base directory
+@cd %ROOT_PATH%\gen\v5_examples
+@del empbuild.fdb 2> nul
+@isql -i empbld.sql
+@cd %ROOT_PATH%\builds\win32
+
+@echo.
+@echo preprocessing empbuild.e
+@echo path = %DB_PATH%/gen/v5_examples
+@%ROOT_PATH%\gen\gpre_static -r -m -n -z %ROOT_PATH%\src\v5_examples\empbuild.e %ROOT_PATH%\gen\v5_examples\empbuild.c -b localhost:%DB_PATH%/gen/v5_examples/
+@goto :EOF
+
+::===========
+:RELEASE
+@echo.
+@echo Building release
+if "%VS_VER%"=="msvc6" (
+	@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.dsw /MAKE "v5_examples - Win32 Release" %CLEAN% /OUT v5_examples.log
+) else (
+	@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.sln /project v5_examples %CLEAN% /OUT v5_examples.log
+)
+@goto :EOF
+
+::===========
+:DEBUG
+@echo.
+@echo Building debug
+if "%VS_VER%"=="msvc6" (
+	@msdev %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.dsw /MAKE "v5_examples - Win32 Debug" %CLEAN% /OUT v5_examples.log
+) else (
+	@devenv %ROOT_PATH%\builds\win32\%VS_VER%\Firebird2.sln /project v5_examples debug %CLEAN% /OUT v5_examples.log
+)
+@goto :EOF
+
+
+::===========
+:MOVE
+@echo.
+@mkdir %ROOT_PATH%\output\v5_examples 2> nul
+@echo Moving files to output directory
+@copy %ROOT_PATH%\src\v5_examples\* %ROOT_PATH%\output\v5_examples > nul
+@copy %ROOT_PATH%\gen\v5_examples\* %ROOT_PATH%\output\v5_examples > nul
+@copy %ROOT_PATH%\temp\%DBG_DIR%\v5_examples\v5_examples.exe %ROOT_PATH%\gen\v5_examples\empbuild.exe > nul
+@goto :EOF
+
+::===========
+:: only to test if it works
+:BUILD_EMPLOYEE
+@echo.
+@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 %ROOT_PATH%\gen\v5_examples
+@del %ROOT_PATH%\gen\v5_examples\employee.fdb 2>nul
+@%ROOT_PATH%\gen\v5_examples\empbuild.exe %DB_PATH%/gen/v5_examples/employee.fdb
+@cd %ROOT_PATH%\builds\win32
+
+@goto :EOF
+
+::==============
+:HELP_PREP
+@echo.
+@echo    You must run prepare.bat before running this script
+@echo.
+@goto :EOF
+
+::==============
+:HELP_BOOT
+@echo.
+@echo    You must run make_boot.bat before running this script
+@echo.
+@goto :EOF
+
+:END

builds/win32/msvc6/Firebird2.dsw

@@ -636,6 +636,21 @@ Package=<4>
 
 ###############################################################################
 
+Project: "v5_examples"=.\v5_examples.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name fbclient
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "wal"=.\wal.dsp - Package Owner=<4>
 
 Package=<5>

builds/win32/msvc6/Firebird2Boot.dsw

@@ -33,21 +33,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "relations"=.\relations.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name fbclient_static
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "common_static"=.\common_static.dsp - Package Owner=<4>
 
 Package=<5>

builds/win32/msvc6/codes.dsp

@@ -85,7 +85,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\gen\misc\codes.cpp
+SOURCE=..\..\..\gen\jrd\codes.cpp
 # End Source File
 # Begin Source File
 

builds/win32/msvc6/engine.dsp

@@ -537,7 +537,7 @@ SOURCE=..\..\..\src\jrd\why.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\win32\winnt.cpp
+SOURCE=..\..\..\src\jrd\winnt.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -1133,11 +1133,11 @@ SOURCE=..\..\..\src\jrd\perf_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\pio.h
+SOURCE=..\..\..\src\jrd\pio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\pio_proto.h
+SOURCE=..\..\..\src\jrd\pio_proto.h
 # End Source File
 # Begin Source File
 
@@ -1165,6 +1165,18 @@ SOURCE=..\..\..\src\jrd\que.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\src\jrd\rdb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\jrd\rdb_codes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\jrd\rdbcodes.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\src\jrd\rec_proto.h
 # End Source File
 # Begin Source File

builds/win32/msvc6/engine_classic.dsp

@@ -510,7 +510,7 @@ SOURCE=..\..\..\src\jrd\why.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\win32\winnt.cpp
+SOURCE=..\..\..\src\jrd\winnt.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -1106,11 +1106,11 @@ SOURCE=..\..\..\src\jrd\perf_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\pio.h
+SOURCE=..\..\..\src\jrd\pio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\pio_proto.h
+SOURCE=..\..\..\src\jrd\pio_proto.h
 # End Source File
 # Begin Source File
 
@@ -1138,6 +1138,18 @@ SOURCE=..\..\..\src\jrd\que.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\src\jrd\rdb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\jrd\rdb_codes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\jrd\rdbcodes.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\src\jrd\rec_proto.h
 # End Source File
 # Begin Source File

builds/win32/msvc6/engine_embed.dsp

@@ -510,7 +510,7 @@ SOURCE=..\..\..\src\jrd\why.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\win32\winnt.cpp
+SOURCE=..\..\..\src\jrd\winnt.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -1106,11 +1106,11 @@ SOURCE=..\..\..\src\jrd\perf_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\pio.h
+SOURCE=..\..\..\src\jrd\pio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\pio_proto.h
+SOURCE=..\..\..\src\jrd\pio_proto.h
 # End Source File
 # Begin Source File
 
@@ -1138,6 +1138,18 @@ SOURCE=..\..\..\src\jrd\que.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\src\jrd\rdb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\jrd\rdb_codes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\jrd\rdbcodes.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\src\jrd\rec_proto.h
 # End Source File
 # Begin Source File

builds/win32/msvc6/fb_inet_server.dsp

@@ -97,11 +97,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\gstat\dba.cpp
+SOURCE=..\..\..\gen\utilities\dba.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
+SOURCE=..\..\..\src\utilities\ppg.cpp
 # End Source File
 # End Group
 # Begin Group "Resource files"
@@ -109,15 +109,15 @@ SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\caution.ico
+SOURCE=..\..\..\src\remote\caution.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\server.ico
+SOURCE=..\..\..\src\remote\server.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\window.rc
+SOURCE=..\..\..\src\remote\window.rc
 # End Source File
 # End Group
 # End Target

builds/win32/msvc6/fbclient.dsp

@@ -130,7 +130,7 @@ SOURCE=..\..\..\src\jrd\gds.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\win32\ibinitdll.cpp
+SOURCE=..\..\..\src\jrd\ibinitdll.cpp
 # End Source File
 # Begin Source File
 
@@ -272,7 +272,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
+SOURCE=..\..\..\src\remote\wnet.cpp
 # End Source File
 # Begin Source File
 
@@ -288,7 +288,7 @@ SOURCE=..\..\..\src\remote\xnet.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\gsec\security.cpp
+SOURCE=..\..\..\gen\utilities\security.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"

builds/win32/msvc6/fbclient_static.dsp

@@ -205,7 +205,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
+SOURCE=..\..\..\src\remote\wnet.cpp
 # End Source File
 # Begin Source File
 
@@ -289,7 +289,7 @@ SOURCE=..\..\..\src\jrd\gds.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\win32\ibinitdll.cpp
+SOURCE=..\..\..\src\jrd\ibinitdll.cpp
 # End Source File
 # Begin Source File
 

builds/win32/msvc6/fbembed.dsp

@@ -105,7 +105,7 @@ SOURCE=..\..\..\src\jrd\os\win32\config_root.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\win32\ibinitdll.cpp
+SOURCE=..\..\..\src\jrd\ibinitdll.cpp
 # End Source File
 # Begin Source File
 
@@ -229,7 +229,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
+SOURCE=..\..\..\src\remote\wnet.cpp
 
 !IF  "$(CFG)" == "fbembed - Win32 Release"
 
@@ -281,11 +281,11 @@ SOURCE=..\..\..\src\remote\xnet.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\gstat\dba.cpp
+SOURCE=..\..\..\gen\utilities\dba.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
+SOURCE=..\..\..\src\utilities\ppg.cpp
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/fbguard.dsp

@@ -109,7 +109,7 @@ SOURCE=..\..\..\src\iscguard\iscguard.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\chop.cpp
+SOURCE=..\..\..\src\remote\chop.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"

builds/win32/msvc6/fbserver.dsp

@@ -97,11 +97,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\gstat\dba.cpp
+SOURCE=..\..\..\gen\utilities\dba.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
+SOURCE=..\..\..\src\utilities\ppg.cpp
 # End Source File
 # End Group
 # Begin Group "Resource files"
@@ -109,15 +109,15 @@ SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\caution.ico
+SOURCE=..\..\..\src\remote\caution.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\server.ico
+SOURCE=..\..\..\src\remote\server.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\window.rc
+SOURCE=..\..\..\src\remote\window.rc
 # End Source File
 # End Group
 # End Target

builds/win32/msvc6/gds32.dsp

@@ -95,7 +95,7 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\os\win32\ibinitdll.cpp
+SOURCE=..\..\..\src\jrd\ibinitdll.cpp
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/gsec.dsp

@@ -93,11 +93,11 @@ SOURCE=..\..\..\src\common\fb_exception.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\gsec.cpp
+SOURCE=..\..\..\src\utilities\gsec.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\gsec\security.cpp
+SOURCE=..\..\..\gen\utilities\security.cpp
 # End Source File
 # End Group
 # Begin Group "JRD files"
@@ -117,11 +117,11 @@ SOURCE=..\..\..\src\jrd\isc.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\gsec.h
+SOURCE=..\..\..\src\utilities\gsec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\secur_proto.h
+SOURCE=..\..\..\src\utilities\secur_proto.h
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/gstat.dsp

@@ -89,7 +89,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\gstat\dba.cpp
+SOURCE=..\..\..\gen\utilities\dba.cpp
 # End Source File
 # Begin Source File
 
@@ -101,7 +101,7 @@ SOURCE=..\..\..\src\common\fb_exception.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
+SOURCE=..\..\..\src\utilities\ppg.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -113,7 +113,7 @@ SOURCE=..\..\..\src\jrd\enc_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gstat\ppg_proto.h
+SOURCE=..\..\..\src\utilities\ppg_proto.h
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/instreg.dsp

@@ -89,11 +89,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\install_reg.cpp
+SOURCE=..\..\..\src\utilities\install_reg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\registry.cpp
+SOURCE=..\..\..\src\utilities\registry.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -101,11 +101,11 @@ SOURCE=..\..\..\src\utilities\install\registry.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\regis_proto.h
+SOURCE=..\..\..\src\utilities\regis_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\registry.h
+SOURCE=..\..\..\src\utilities\registry.h
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/instsvc.dsp

@@ -89,11 +89,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\install_svc.cpp
+SOURCE=..\..\..\src\utilities\install_svc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\services.cpp
+SOURCE=..\..\..\src\utilities\services.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -101,7 +101,7 @@ SOURCE=..\..\..\src\utilities\install\services.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\servi_proto.h
+SOURCE=..\..\..\src\utilities\servi_proto.h
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/relations.dsp

@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="relations" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=relations - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "relations.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "relations.mak" CFG="relations - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "relations - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "relations - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "relations - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\..\temp\release\relations"
-# PROP BASE Intermediate_Dir "..\..\..\temp\release\relations"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\temp\release\relations"
-# PROP Intermediate_Dir "..\..\..\temp\release\relations"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /MD /nologo /W3 /GX /O2 /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "SUPERCLIENT" /YX /FD /c
-# ADD BASE RSC /l 0xc0a /d "NDEBUG"
-# ADD RSC /l 0xc0a /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "relations - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\..\temp\debug\relations"
-# PROP BASE Intermediate_Dir "..\..\..\temp\debug\relations"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\temp\debug\relations"
-# PROP Intermediate_Dir "..\..\..\temp\debug\relations"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /MDd /nologo /W3 /Gm /GX /ZI /Od /I "../../../src/include" /I "../../../src/include/gen" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "SUPERCLIENT" /YX /FD /GZ /c
-# ADD BASE RSC /l 0xc0a /d "_DEBUG"
-# ADD RSC /l 0xc0a /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib shell32.lib comctl32.lib advapi32.lib ws2_32.lib mpr.lib version.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "relations - Win32 Release"
-# Name "relations - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\gen\misc\relations.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\common\fb_exception.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\..\src\jrd\version.rc
-# End Source File
-# End Group
-# End Target
-# End Project

builds/win32/msvc6/remote.dsp

@@ -90,15 +90,15 @@ SOURCE=..\..\..\src\remote\allr.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\chop.cpp
+SOURCE=..\..\..\src\remote\chop.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\cntl.cpp
+SOURCE=..\..\..\src\remote\cntl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\ibconfig.cpp
+SOURCE=..\..\..\src\remote\ibconfig.cpp
 # End Source File
 # Begin Source File
 
@@ -118,7 +118,7 @@ SOURCE=..\..\..\src\remote\parser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\property.cpp
+SOURCE=..\..\..\src\remote\property.cpp
 # End Source File
 # Begin Source File
 
@@ -134,15 +134,15 @@ SOURCE=..\..\..\src\remote\server.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\srvr_w32.cpp
+SOURCE=..\..\..\src\remote\srvr_w32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\window.cpp
+SOURCE=..\..\..\src\remote\window.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
+SOURCE=..\..\..\src\remote\wnet.cpp
 # End Source File
 # Begin Source File
 
@@ -190,7 +190,7 @@ SOURCE=..\..\..\src\remote\spxnet32_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\wnet_proto.h
+SOURCE=..\..\..\src\remote\wnet_proto.h
 # End Source File
 # Begin Source File
 

builds/win32/msvc6/remote_classic.dsp

@@ -90,15 +90,15 @@ SOURCE=..\..\..\src\remote\allr.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\chop.cpp
+SOURCE=..\..\..\src\remote\chop.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\cntl.cpp
+SOURCE=..\..\..\src\remote\cntl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\ibconfig.cpp
+SOURCE=..\..\..\src\remote\ibconfig.cpp
 # End Source File
 # Begin Source File
 
@@ -118,7 +118,7 @@ SOURCE=..\..\..\src\remote\parser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\property.cpp
+SOURCE=..\..\..\src\remote\property.cpp
 # End Source File
 # Begin Source File
 
@@ -134,15 +134,15 @@ SOURCE=..\..\..\src\remote\server.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\srvr_w32.cpp
+SOURCE=..\..\..\src\remote\srvr_w32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\window.cpp
+SOURCE=..\..\..\src\remote\window.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
+SOURCE=..\..\..\src\remote\wnet.cpp
 # End Source File
 # Begin Source File
 
@@ -186,7 +186,7 @@ SOURCE=..\..\..\src\remote\spxnet32_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\remote\os\win32\wnet_proto.h
+SOURCE=..\..\..\src\remote\wnet_proto.h
 # End Source File
 # Begin Source File
 

builds/win32/msvc6/utilities.dsp

@@ -89,19 +89,19 @@ LIB32=link.exe -lib
 # PROP Default_Filter "epp"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gstat\dba.epp
+SOURCE=..\..\..\src\utilities\dba.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\rebuild\rmet.epp
+SOURCE=..\..\..\src\utilities\rmet.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\rebuild\rstore.epp
+SOURCE=..\..\..\src\utilities\rstore.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\security.epp
+SOURCE=..\..\..\src\utilities\security.epp
 # End Source File
 # End Group
 # Begin Group "Generated files"
@@ -109,16 +109,16 @@ SOURCE=..\..\..\src\utilities\gsec\security.epp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\gsec\security.cpp
+SOURCE=..\..\..\gen\utilities\security.cpp
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\common\cmd_util.cpp
+SOURCE=..\..\..\src\utilities\cmd_util.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\gsec.cpp
+SOURCE=..\..\..\src\utilities\gsec.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -126,15 +126,15 @@ SOURCE=..\..\..\src\utilities\gsec\gsec.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\common\cmd_util_proto.h
+SOURCE=..\..\..\src\utilities\cmd_util_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\gsec.h
+SOURCE=..\..\..\src\utilities\gsec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\registry.h
+SOURCE=..\..\..\src\utilities\registry.h
 # End Source File
 # End Group
 # End Target

builds/win32/msvc6/utilities_classic.dsp

@@ -89,19 +89,19 @@ LIB32=link.exe -lib
 # PROP Default_Filter "epp"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gstat\dba.epp
+SOURCE=..\..\..\src\utilities\dba.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\rebuild\rmet.epp
+SOURCE=..\..\..\src\utilities\rmet.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\rebuild\rstore.epp
+SOURCE=..\..\..\src\utilities\rstore.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\security.epp
+SOURCE=..\..\..\src\utilities\security.epp
 # End Source File
 # End Group
 # Begin Group "Generated files"
@@ -109,16 +109,16 @@ SOURCE=..\..\..\src\utilities\gsec\security.epp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\gsec\security.cpp
+SOURCE=..\..\..\gen\utilities\security.cpp
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\common\cmd_util.cpp
+SOURCE=..\..\..\src\utilities\cmd_util.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\gsec.cpp
+SOURCE=..\..\..\src\utilities\gsec.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -126,15 +126,15 @@ SOURCE=..\..\..\src\utilities\gsec\gsec.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\common\cmd_util_proto.h
+SOURCE=..\..\..\src\utilities\cmd_util_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec\gsec.h
+SOURCE=..\..\..\src\utilities\gsec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install\registry.h
+SOURCE=..\..\..\src\utilities\registry.h
 # End Source File
 # End Group
 # End Target

builds/win32/msvc6/v5_examples.dsp

@@ -0,0 +1,101 @@
+# Microsoft Developer Studio Project File - Name="v5_examples" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=v5_examples - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "v5_examples.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "v5_examples.mak" CFG="v5_examples - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "v5_examples - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "v5_examples - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "v5_examples - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\..\temp\release\v5_examples"
+# PROP BASE Intermediate_Dir "..\..\..\temp\release\v5_examples"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\..\temp\release\v5_examples"
+# PROP Intermediate_Dir "..\..\..\temp\release\v5_examples"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../src/include" /I "../../../src/include/gen" /I "../../../src/jrd" /D "GPRE_FORTRAN" /D "GPRE_PASCAL" /D "GPRE_COBOL" /D "GPRE_ADA" /D "_DEBUG" /D "_CONSOLE" /D "SUPERCLIENT" /D "WIN32" /D "_MBCS" /D "_X86_" /FR /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /Ot /Og /Oi /Oy /Ob1 /I "../../../src/include" /I "../../../src/include/gen" /I "../../../src/jrd" /D "GPRE_FORTRAN" /D "GPRE_PASCAL" /D "GPRE_COBOL" /D "GPRE_ADA" /D "NDEBUG" /D "_CONSOLE" /D "SUPERCLIENT" /D "WIN32" /D "_MBCS" /D "_X86_" /FR /FD /EHc- /c
+# ADD BASE RSC /l 0xc0a /d "NDEBUG"
+# ADD RSC /l 0xc0a /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "v5_examples - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\..\temp\debug\v5_examples"
+# PROP BASE Intermediate_Dir "..\..\..\temp\debug\v5_examples"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\..\temp\debug\v5_examples"
+# PROP Intermediate_Dir "..\..\..\temp\debug\v5_examples"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../src/include" /I "../../../src/include/gen" /I "../../../src/jrd" /D "GPRE_FORTRAN" /D "GPRE_PASCAL" /D "GPRE_COBOL" /D "GPRE_ADA" /D "_DEBUG" /D "_CONSOLE" /D "SUPERCLIENT" /D "WIN32" /D "_MBCS" /D "_X86_" /D "DEV_BUILD" /FR /FD /GZ /c
+# ADD BASE RSC /l 0xc0a /d "_DEBUG"
+# ADD RSC /l 0xc0a /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "v5_examples - Win32 Release"
+# Name "v5_examples - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\gen\v5_examples\empbuild.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

builds/win32/msvc7/engine.vcproj

@@ -407,7 +407,7 @@
 				RelativePath="..\..\..\src\jrd\why.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\win32\winnt.cpp">
+				RelativePath="..\..\..\src\jrd\winnt.cpp">
 			</File>
 		</Filter>
 		<Filter
@@ -855,10 +855,10 @@
 				RelativePath="..\..\..\src\jrd\perf_proto.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\pio.h">
+				RelativePath="..\..\..\src\jrd\pio.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\pio_proto.h">
+				RelativePath="..\..\..\src\jrd\pio_proto.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\pragma.h">

builds/win32/msvc7/engine_classic.vcproj

@@ -404,7 +404,7 @@
 				RelativePath="..\..\..\src\jrd\why.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\win32\winnt.cpp">
+				RelativePath="..\..\..\src\jrd\winnt.cpp">
 			</File>
 		</Filter>
 		<Filter
@@ -852,10 +852,10 @@
 				RelativePath="..\..\..\src\jrd\perf_proto.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\pio.h">
+				RelativePath="..\..\..\src\jrd\pio.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\pio_proto.h">
+				RelativePath="..\..\..\src\jrd\pio_proto.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\pragma.h">

builds/win32/msvc7/engine_embed.vcproj

@@ -404,7 +404,7 @@
 				RelativePath="..\..\..\src\jrd\why.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\win32\winnt.cpp">
+				RelativePath="..\..\..\src\jrd\winnt.cpp">
 			</File>
 		</Filter>
 		<Filter
@@ -852,10 +852,10 @@
 				RelativePath="..\..\..\src\jrd\perf_proto.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\pio.h">
+				RelativePath="..\..\..\src\jrd\pio.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\pio_proto.h">
+				RelativePath="..\..\..\src\jrd\pio_proto.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\pragma.h">

builds/win32/msvc7/fb_inet_server.vcproj

@@ -138,23 +138,23 @@
 			Name="UTILITIES files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\gen\utilities\gstat\dba.cpp">
+				RelativePath="..\..\..\gen\utilities\dba.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\utilities\gstat\ppg.cpp">
+				RelativePath="..\..\..\src\utilities\ppg.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\caution.ico">
+				RelativePath="..\..\..\src\remote\caution.ico">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\server.ico">
+				RelativePath="..\..\..\src\remote\server.ico">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\window.rc">
+				RelativePath="..\..\..\src\remote\window.rc">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool

builds/win32/msvc7/fbclient.vcproj

@@ -166,7 +166,7 @@
 				RelativePath="..\..\..\src\jrd\gds.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp">
+				RelativePath="..\..\..\src\jrd\ibinitdll.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\isc.cpp">
@@ -262,7 +262,7 @@
 				RelativePath="..\..\..\src\remote\remote.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
+				RelativePath="..\..\..\src\remote\wnet.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\xdr.cpp">

builds/win32/msvc7/fbclient_static.vcproj

@@ -210,7 +210,7 @@
 				RelativePath="..\..\..\src\remote\remote.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
+				RelativePath="..\..\..\src\remote\wnet.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\xdr.cpp">
@@ -276,7 +276,7 @@
 				RelativePath="..\..\..\src\jrd\gds.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp">
+				RelativePath="..\..\..\src\jrd\ibinitdll.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\isc.cpp">

builds/win32/msvc7/fbembed.vcproj

@@ -147,7 +147,7 @@
 			Name="JRD files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp">
+				RelativePath="..\..\..\src\jrd\ibinitdll.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\perf.cpp">
@@ -262,7 +262,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
+				RelativePath="..\..\..\src\remote\wnet.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -311,10 +311,10 @@
 			Name="UTILITIES files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\gen\utilities\gstat\dba.cpp">
+				RelativePath="..\..\..\gen\utilities\dba.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\utilities\gstat\ppg.cpp">
+				RelativePath="..\..\..\src\utilities\ppg.cpp">
 			</File>
 		</Filter>
 		<Filter

builds/win32/msvc7/fbserver.vcproj

@@ -138,23 +138,23 @@
 			Name="UTILITIES files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\gen\utilities\gstat\dba.cpp">
+				RelativePath="..\..\..\gen\utilities\dba.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\utilities\gstat\ppg.cpp">
+				RelativePath="..\..\..\src\utilities\ppg.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\caution.ico">
+				RelativePath="..\..\..\src\remote\caution.ico">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\server.ico">
+				RelativePath="..\..\..\src\remote\server.ico">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\window.rc">
+				RelativePath="..\..\..\src\remote\window.rc">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool

builds/win32/msvc7/gds32.vcproj

@@ -136,7 +136,7 @@
 			Name="JRD files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp">
+				RelativePath="..\..\..\src\jrd\ibinitdll.cpp">
 			</File>
 		</Filter>
 		<Filter

builds/win32/msvc7/gstat.vcproj

@@ -126,7 +126,7 @@
 			Name="UTILITIES files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="..\..\..\gen\utilities\gstat\dba.cpp">
+				RelativePath="..\..\..\gen\utilities\dba.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\enc.cpp">
@@ -135,7 +135,7 @@
 				RelativePath="..\..\..\src\common\fb_exception.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\utilities\gstat\ppg.cpp">
+				RelativePath="..\..\..\src\utilities\ppg.cpp">
 			</File>
 		</Filter>
 		<Filter

builds/win32/msvc7/remote.vcproj

@@ -112,13 +112,13 @@
 				RelativePath="..\..\..\src\remote\allr.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\chop.cpp">
+				RelativePath="..\..\..\src\remote\chop.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\cntl.cpp">
+				RelativePath="..\..\..\src\remote\cntl.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\ibconfig.cpp">
+				RelativePath="..\..\..\src\remote\ibconfig.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\inet.cpp">
@@ -133,7 +133,7 @@
 				RelativePath="..\..\..\src\remote\parser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\property.cpp">
+				RelativePath="..\..\..\src\remote\property.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\protocol.cpp">
@@ -145,13 +145,13 @@
 				RelativePath="..\..\..\src\remote\server.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\srvr_w32.cpp">
+				RelativePath="..\..\..\src\remote\srvr_w32.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\window.cpp">
+				RelativePath="..\..\..\src\remote\window.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
+				RelativePath="..\..\..\src\remote\wnet.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\xdr.cpp">
@@ -188,7 +188,7 @@
 				RelativePath="..\..\..\src\remote\spxnet32_proto.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\wnet_proto.h">
+				RelativePath="..\..\..\src\remote\wnet_proto.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\xdr.h">

builds/win32/msvc7/remote_classic.vcproj

@@ -112,13 +112,13 @@
 				RelativePath="..\..\..\src\remote\allr.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\chop.cpp">
+				RelativePath="..\..\..\src\remote\chop.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\cntl.cpp">
+				RelativePath="..\..\..\src\remote\cntl.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\ibconfig.cpp">
+				RelativePath="..\..\..\src\remote\ibconfig.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\inet.cpp">
@@ -133,7 +133,7 @@
 				RelativePath="..\..\..\src\remote\parser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\property.cpp">
+				RelativePath="..\..\..\src\remote\property.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\protocol.cpp">
@@ -145,13 +145,13 @@
 				RelativePath="..\..\..\src\remote\server.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\srvr_w32.cpp">
+				RelativePath="..\..\..\src\remote\srvr_w32.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\window.cpp">
+				RelativePath="..\..\..\src\remote\window.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
+				RelativePath="..\..\..\src\remote\wnet.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\xdr.cpp">
@@ -185,7 +185,7 @@
 				RelativePath="..\..\..\src\remote\spxnet32_proto.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\remote\os\win32\wnet_proto.h">
+				RelativePath="..\..\..\src\remote\wnet_proto.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\remote\xdr.h">

builds/win32/msvc7/utilities.vcproj

@@ -118,7 +118,7 @@
 				Name="epp files"
 				Filter="epp">
 				<File
-					RelativePath="..\..\..\src\utilities\gstat.epp">
+					RelativePath="..\..\..\src\utilities\dba.epp">
 				</File>
 				<File
 					RelativePath="..\..\..\src\utilities\rmet.epp">

builds/win32/msvc7/utilities_classic.vcproj

@@ -118,7 +118,7 @@
 				Name="epp files"
 				Filter="epp">
 				<File
-					RelativePath="..\..\..\src\utilities\gstat.epp">
+					RelativePath="..\..\..\src\utilities\dba.epp">
 				</File>
 				<File
 					RelativePath="..\..\..\src\utilities\rmet.epp">

builds/win32/prepare.bat

@@ -29,11 +29,11 @@ if "%FIREBIRD%"=="" (goto :HELP & goto :EOF)
 
 @rmdir /s /q %ROOT_PATH%\gen 2>nul
 @mkdir %ROOT_PATH%\gen\dbs 2>nul
-@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\builds\misc\metadata.gbak localhost:%DB_PATH%\gen\dbs\metadata.fdb
+@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\src\misc\metadata.gbak localhost:%DB_PATH%\gen\dbs\metadata.fdb
-@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\builds\misc\security.gbak localhost:%DB_PATH%\gen\dbs\security.fdb
+@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\src\misc\security.gbak localhost:%DB_PATH%\gen\dbs\security.fdb
-@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\builds\misc\msg.gbak localhost:%DB_PATH%\gen\dbs\msg.fdb
+@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\src\msgs\msg.gbak localhost:%DB_PATH%\gen\dbs\msg.fdb
-@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\builds\misc\help.gbak localhost:%DB_PATH%\gen\dbs\help.fdb
+@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\src\misc\help.gbak localhost:%DB_PATH%\gen\dbs\help.fdb
-@copy %ROOT_PATH%\gen\dbs\metadata.fdb %ROOT_PATH%\gen\dbs\yachts.lnk > nul
+@copy %ROOT_PATH%\gen\dbs\metadata.fdb %ROOT_PATH%\gen\dbs\yachts.lnk
 
 @echo.
 @echo Completed Preparations for build

builds/win32/preprocess.bat

@@ -61,12 +61,11 @@ goto :EOF
 @for %%i in (exe, extract) do @call :PREPROCESS dudley %%i
 @for %%i in (gpre_meta) do @call :PREPROCESS gpre %%i
 @for %%i in (extract, isql, show) do @call :PREPROCESS isql %%i
-@for %%i in (dfw, dpm, dyn, dyn_def, dyn_del, dyn_mod, dyn_util, fun, grant, ini, met, pcmet, scl, stats) do @call :PREPROCESS jrd %%i GDS
+@for %%i in (dfw, dpm, dyn, dyn_def, dyn_del, dyn_mod, dyn_util, envelope, fun, grant, ini, met, pcmet, scl, stats) do @call :PREPROCESS jrd %%i GDS
-@for %%i in (codes, relations, envelope) do @call :PREPROCESS misc %%i
+@for %%i in (codes) do @call :PREPROCESS jrd %%i
 @for %%i in (build_file) do @call :PREPROCESS msgs %%i
 @for %%i in (help, meta, proc, show) do @call :PREPROCESS qli %%i
-@for %%i in (dba) do @call :PREPROCESS utilities/gstat %%i
+@for %%i in (dba, security) do @call :PREPROCESS utilities %%i
-@for %%i in (security) do @call :PREPROCESS utilities/gsec %%i
 
 @goto :EOF
 

clean.sh

@@ -13,20 +13,23 @@ rm configure 2>/dev/null
 rm libtool 2>/dev/null
 rm Makefile 2>/dev/null
 
-echo Removing files in builds directory
-
-rm builds/make.new/config/config.guess 2>/dev/null
-rm builds/make.new/config/config.sub 2>/dev/null
-rm builds/make.new/config/ltmain.sh 2>/dev/null
-
 echo Removing files in src directory
 
 rm src/include/gen/autoconfig.h 2>/dev/null
 rm src/include/gen/blrtable.h 2>/dev/null
+rm src/Makefile 2>/dev/null
+rm builds/make.new/config/config.guess 2>/dev/null
+rm builds/make.new/config/config.sub 2>/dev/null
+rm builds/make.new/config/ltmain.sh 2>/dev/null
 rm src/v5_examples/Makefile 2>/dev/null
 
+# removing databases
+rm src/indicator.* 2>/dev/null
+rm -f src/*.fdb 2>/dev/null
+rm -f src/*.FDB 2>/dev/null
+rm -f src/*.lnk 2>/dev/null
+
 # Cpp from epp files
-rm src/alice/alice_meta.cpp 2>/dev/null
 rm src/burp/backup.cpp 2>/dev/null
 rm src/burp/restore.cpp 2>/dev/null
 rm src/dsql/array.cpp 2>/dev/null
@@ -37,6 +40,7 @@ rm src/gpre/gpre_meta.cpp 2>/dev/null
 rm src/isql/extract.cpp 2>/dev/null
 rm src/isql/isql.cpp 2>/dev/null
 rm src/isql/show.cpp 2>/dev/null
+rm src/jrd/codes.cpp 2>/dev/null
 rm src/jrd/dfw.cpp 2>/dev/null
 rm src/jrd/dpm.cpp 2>/dev/null
 rm src/jrd/dyn.cpp 2>/dev/null
@@ -50,8 +54,6 @@ rm src/jrd/ini.cpp 2>/dev/null
 rm src/jrd/met.cpp 2>/dev/null
 rm src/jrd/pcmet.cpp 2>/dev/null
 rm src/jrd/scl.cpp 2>/dev/null
-rm src/misc/codes.cpp 2>/dev/null
-rm src/misc/relations.cpp 2>/dev/null
 rm src/msgs/build_file.cpp 2>/dev/null
 rm src/msgs/change_msgs.cpp 2>/dev/null
 rm src/msgs/check_msgs.cpp 2>/dev/null
@@ -61,5 +63,3 @@ rm src/qli/help.cpp 2>/dev/null
 rm src/qli/meta.cpp 2>/dev/null
 rm src/qli/proc.cpp 2>/dev/null
 rm src/qli/show.cpp 2>/dev/null
-rm src/utilities/dba.cpp 2>/dev/null
-rm src/utilities/security.cpp 2>/dev/null

configure.in

@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.148 2003-07-14 23:20:24 brodsom Exp $
+dnl $Id: configure.in,v 1.141 2003-07-08 01:04:52 brodsom Exp $
 
 dnl ############################# INITIALISATION ###############################
 
@@ -541,10 +541,10 @@ mkdir -p gen/jrd
 mkdir -p gen/msgs
 mkdir -p gen/qli
 mkdir -p gen/utilities
-mkdir -p gen/examples
+mkdir -p gen/v5_examples
 
 dnl # some .o and .d in this directory (to be removed)
-mkdir -p gen/remote/os/win32
+mkdir -p gen/remote
 
 dnl # databases and output
 mkdir -p gen/refDatabases
@@ -552,14 +552,7 @@ mkdir -p gen/firebird/include
 mkdir -p gen/firebird/intl
 mkdir -p gen/firebird/UDF
 mkdir -p gen/firebird/bin
-mkdir -p gen/firebird/examples/api
+mkdir -p gen/firebird/examples/v5
-mkdir -p gen/firebird/examples/build_win32
-mkdir -p gen/firebird/examples/build_unix
-mkdir -p gen/firebird/examples/dyn
-mkdir -p gen/firebird/examples/empbuild
-mkdir -p gen/firebird/examples/include
-mkdir -p gen/firebird/examples/stat
-mkdir -p gen/firebird/examples/udf
 mkdir -p gen/firebird/lib
 mkdir -p gen/firebird/misc
 mkdir -p gen/firebird/help
@@ -570,11 +563,11 @@ mkdir -p gen/RPM/BUILD
 dnl #### TEMP ######### directories for .o and .d
 dnl # by module name
 
+mkdir -p temp/libfbserver
 mkdir -p temp/libfbserver/jrd
 mkdir -p temp/libfbserver/dsql
 mkdir -p temp/libfbserver/lock
-mkdir -p temp/libfbserver/misc
+mkdir -p temp/libfbserver/remote
-mkdir -p temp/libfbserver/remote/os/win32
 mkdir -p temp/libfbserver/pipe
 mkdir -p temp/libfbserver/gpre
 mkdir -p temp/libfbserver/alice
@@ -586,12 +579,12 @@ mkdir -p temp/libfbserver/common/classes
 mkdir -p temp/libfbserver/common/config
 mkdir -p temp/libfbserver/jrd/os/posix
 mkdir -p temp/libfbserver/jrd/os/win32
-mkdir -p temp/fbserver/remote/os/win32
+mkdir -p temp/fbserver/remote
 mkdir -p temp/fbserver/ipserver
 mkdir -p temp/libfbclient/jrd
 mkdir -p temp/libfbclient/dsql
 mkdir -p temp/libfbclient/gpre
-mkdir -p temp/libfbclient/remote/os/win32
+mkdir -p temp/libfbclient/remote
 mkdir -p temp/libfbclient/utilities
 mkdir -p temp/libfbclient/common/classes
 mkdir -p temp/libfbclient/common/config
@@ -604,7 +597,7 @@ mkdir -p temp/client.gdef/dudley
 mkdir -p temp/client.isql/isql
 mkdir -p temp/client.util/utilities
 mkdir -p temp/client.util/iscguard
-mkdir -p temp/client.util/remote/os/win32
+mkdir -p temp/client.util/remote
 mkdir -p temp/client.util/jrd/os/win32
 mkdir -p temp/intl/intl
 
@@ -618,11 +611,11 @@ mkdir -p temp/static.gpre/gpre
 mkdir -p temp/static.gbak/burp
 mkdir -p temp/static.isql/isql
 
+mkdir -p temp/libfbstatic
 mkdir -p temp/libfbstatic/jrd
 mkdir -p temp/libfbstatic/dsql
 mkdir -p temp/libfbstatic/lock
-mkdir -p temp/libfbstatic/misc
+mkdir -p temp/libfbstatic/remote
-mkdir -p temp/libfbstatic/remote/os/win32
 mkdir -p temp/libfbstatic/gpre
 mkdir -p temp/libfbstatic/jrd/os/posix
 mkdir -p temp/libfbstatic/jrd/os/darwin
@@ -638,18 +631,18 @@ mkdir -p temp/embed.isql/isql
 mkdir -p temp/embed.gdef/dudley
 mkdir -p temp/embed.qli/qli
 mkdir -p temp/embed.gpre/gpre
-mkdir -p temp/inet_server/remote/os/win32
+mkdir -p temp/inet_server/remote
 mkdir -p temp/inet_server/ipserver
 mkdir -p temp/msgs/msgs
 mkdir -p temp/extlib/extlib
 mkdir -p temp/extlib/extlib/fbudf
-mkdir -p temp/examples
+mkdir -p temp/v5_examples/v5_examples
 
+mkdir -p temp/libfbembed
 mkdir -p temp/libfbembed/jrd
 mkdir -p temp/libfbembed/dsql
 mkdir -p temp/libfbembed/lock
-mkdir -p temp/libfbembed/misc
+mkdir -p temp/libfbembed/remote
-mkdir -p temp/libfbembed/remote/os/win32
 mkdir -p temp/libfbembed/pipe
 mkdir -p temp/libfbembed/gpre
 mkdir -p temp/libfbembed/alice
@@ -661,7 +654,7 @@ mkdir -p temp/libfbembed/burp
 mkdir -p temp/libfbembed/wal
 mkdir -p temp/libfbembed/common/classes
 mkdir -p temp/libfbembed/common/config
-mkdir -p temp/codes/misc
+mkdir -p temp/codes
 mkdir -p temp/codes/jrd
 
 mkdir -p temp/editline/extern/editline
@@ -679,7 +672,7 @@ case "$PLATFORM" in
     AC_CONFIG_COMMANDS(,,[
         mkdir -p gen/install/scripts
         mkdir -p gen/install/misc])
-    INSTALL_SRC_DIR=builds/install/arch-specific/linux/${FIREBIRD_ARCH_TYPE}
+    INSTALL_SRC_DIR=src/install/arch-specific/linux/${FIREBIRD_ARCH_TYPE}
     AC_CONFIG_FILES([gen/install/makeInstallImage.sh:${INSTALL_SRC_DIR}/makeInstallImage.sh.in
                      gen/install/scripts/preinstall.sh:${INSTALL_SRC_DIR}/preinstall.sh.in
                      gen/install/scripts/tarinstall.sh:${INSTALL_SRC_DIR}/tarinstall.sh.in
@@ -691,17 +684,17 @@ case "$PLATFORM" in
                      gen/install/scripts/postuninstall.sh:${INSTALL_SRC_DIR}/postuninstall.sh.in
                      gen/install/scripts/rpmheader.txt:${INSTALL_SRC_DIR}/rpmheader.txt.in
                      gen/install/scripts/rpmfiles.txt:${INSTALL_SRC_DIR}/rpmfiles.txt.in
-                     gen/firebird/misc/firebird.xinetd:builds/install/arch-specific/linux/misc/firebird.xinetd.in
+                     gen/firebird/misc/firebird.xinetd:src/install/arch-specific/linux/misc/firebird.xinetd.in
-                     gen/firebird/bin/changeDBAPassword.sh:builds/install/arch-specific/linux/misc/changeDBAPassword.sh.in
+                     gen/firebird/bin/changeDBAPassword.sh:src/install/arch-specific/linux/misc/changeDBAPassword.sh.in
       ],[chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null])
     ;;
 
   SINIX-Z)
-    AC_CONFIG_FILES([gen/install/pkginfo:builds/install/arch-specific/sinixz/pkginfo.in
+    AC_CONFIG_FILES([gen/install/pkginfo:src/install/arch-specific/sinixz/pkginfo.in
-                     gen/install/prototype:builds/install/arch-specific/sinixz/prototype.in
+                     gen/install/prototype:src/install/arch-specific/sinixz/prototype.in
-                     gen/install/preinstall:builds/install/arch-specific/sinixz/preinstall.in
+                     gen/install/preinstall:src/install/arch-specific/sinixz/preinstall.in
-                     gen/install/postinstall:builds/install/arch-specific/sinixz/postinstall.in
+                     gen/install/postinstall:src/install/arch-specific/sinixz/postinstall.in
-                     gen/install/postremove:builds/install/arch-specific/sinixz/postremove.in
+                     gen/install/postremove:src/install/arch-specific/sinixz/postremove.in
       ],[chmod a+x gen/install/pre* gen/install/post* 2>/dev/null])
     ;;
 esac
@@ -713,7 +706,7 @@ gen/make.defaults:${MAKE_SRC_DIR}/make.defaults
 gen/make.platform:${MAKE_SRC_DIR}/prefix.${MAKEFILE_PREFIX}
 gen/make.shared.variables:${MAKE_SRC_DIR}/make.shared.variables
 gen/make.shared.targets:${MAKE_SRC_DIR}/make.shared.targets
-gen/Makefile:${MAKE_SRC_DIR}/Makefile.in.firebird
+src/Makefile:${MAKE_SRC_DIR}/Makefile.in.firebird
 gen/Makefile.libfbcommon:${MAKE_SRC_DIR}/Makefile.in.libfbcommon
 gen/Makefile.codes:${MAKE_SRC_DIR}/Makefile.in.codes
 gen/Makefile.boot.gpre:${MAKE_SRC_DIR}/Makefile.in.boot.gpre
@@ -734,6 +727,7 @@ gen/Makefile.client.util:${MAKE_SRC_DIR}/Makefile.in.client.util
 gen/Makefile.intl:${MAKE_SRC_DIR}/Makefile.in.intl
 gen/Makefile.msgs:${MAKE_SRC_DIR}/Makefile.in.msgs
 gen/Makefile.extlib:${MAKE_SRC_DIR}/Makefile.in.extlib
+gen/Makefile.v5_examples:${MAKE_SRC_DIR}/Makefile.in.v5_examples
 gen/Makefile.libfbembed:${MAKE_SRC_DIR}/Makefile.in.libfbembed
 gen/Makefile.inet_server:${MAKE_SRC_DIR}/Makefile.in.inet_server
 gen/Makefile.embed.lockmgr:${MAKE_SRC_DIR}/Makefile.in.embed.lockmgr
@@ -744,7 +738,8 @@ gen/Makefile.embed.isql:${MAKE_SRC_DIR}/Makefile.in.embed.isql
 gen/Makefile.embed.gdef:${MAKE_SRC_DIR}/Makefile.in.embed.gdef
 gen/Makefile.embed.qli:${MAKE_SRC_DIR}/Makefile.in.embed.qli
 gen/Makefile.embed.gpre:${MAKE_SRC_DIR}/Makefile.in.embed.gpre
-gen/Makefile.install:builds/install/arch-specific/${MAKEFILE_PREFIX}/Makefile.in
+src/v5_examples/Makefile:${MAKE_SRC_DIR}/Makefile.in.example5
+gen/Makefile.install:src/install/arch-specific/${MAKEFILE_PREFIX}/Makefile.in
 Makefile:Makefile.in
 gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline
 )

doc/README.build.mingw.html

@@ -59,7 +59,7 @@ Author: Blas Rodriguez Somoza <a href="">blas@puertareal.com</a><br>
 <h3>3.- PATCHES TO BUILD FILES</h3>
 
 <ul>
-<li>The lib_fbudf target in Make.in.extlib cannot be built yet, so it must be removed.<br>
+<li>The lib_fb_udf target in Make.in.extlib cannot be built yet, so it must be removed.<br>
 Edit the file Makefile.in.extlib in the builds/posix directory and change the line <br>
 all: lib_ib_udf lib_ib_util lib_fb_util<br>
 to<br>

doc/README.build.msvc.html

@@ -18,14 +18,13 @@ Author: Blas Rodriguez Somoza <a href="">blas@puertareal.com</a><br>
 <blockquote>
 
 <p>There are two VisualStudio builds, msvc6 and msvc7. The msvc6 build is the official build of FB in win32.</p>
-<p>Under the directory where you put Firebird2 sources you will see the following directories</p>
+<p>Under the directory where you put Firebird sources you will see the following directories</p>
 <ul>
 <li>builds</li>
 <ul>
 <li>mac_os_x (Mac os X build scripts)</li>
 <li>posix (Posix build scripts)</li>
 <li>win32 (Msvc build scripts)</li>
-<li>.....</li>
 </ul>
 <li>doc</li>
 <ul>
@@ -35,14 +34,6 @@ Author: Blas Rodriguez Somoza <a href="">blas@puertareal.com</a><br>
 <ul>
 <li>....</li>
 </ul>
-<li>lang_helpers</li>
-<ul>
-<li>....</li>
-</ul>
-<li>examples</li>
-<ul>
-<li>....</li>
-</ul>
 </ul>
 <p>After you build Firebird you also will see the following temporary directories</p>
 <ul>
@@ -62,11 +53,10 @@ Author: Blas Rodriguez Somoza <a href="">blas@puertareal.com</a><br>
 <ul>
 <li>Microsoft VisualStudio 6 or 7.</li>
 <li>A running Firebird server</li>
-<li>sed unix utility</li>
 </ul>
 
-<p>If you intend to modify the dsql parser file (parse.y) you will need a parser generator, bison or byacc (Berkeley yacc). At this time byacc 1.9 is the official parser generator although in the future it will be switched to bison. The tested versions of byacc are 1.9 or newer and for bison 1.28 or newer.</p>
+<p>If you intend to modify the dsql parser file (parse.y) you will need a parser generator, bison or byacc (Berkeley yacc) and the sed utility. At this time byacc 1.9 is the official parser generator although in the future it will be switched to bison. The tested versions of byacc are 1.9 or newer and for bison 1.28 or newer.</p>
-<p>If you intend to prepare an installable build, you will need innosetup.</p>
+<p>If you intend to prepare an installable build, you will need innosetup and the sed utility.</p>
 <p>To download the utilities use the following links</p>
 <ul>
 <li>My Inno setup extensions 3.0.6.2 <a href="http://www.wintax.nl/isx/">http://www.wintax.nl/isx/</a></li>
@@ -97,16 +87,17 @@ Author: Blas Rodriguez Somoza <a href="">blas@puertareal.com</a><br>
 <h4>4.1.-Standard build</h4>
 <ol>
 <li>Open a command line window.</li>
-<li>Go to the firebird2\builds\win32 directory.</li>
+<li>Go to the firebird2 builds\win32 directory.</li>
 <li>Run the following batches in order (your version of VisualStudio is detected automatically)</li>
 <ol>
 <li>prepare.bat [FIREBIRD]</li>
 <li>make_boot.bat</li>
 <li>make_all.bat [DEBUG] [CLEAN]</li>
+<li>make_examples.bat [DEBUG] [CLEAN] (this is only needed if you want to build examples)</li>
 </ol>
 </ol>
 <ul>
-<p>After the build finish, an output directory with the binaries is created below your firebird2 directory.</p> 
+<p>After the build finish, the firebird directory with the binaries is created as "output" below your firebird directory.</p> 
 <li>To make a clean build from scratch after making changes to the code use the clean_all.bat script</li>
 </ul>
 <h4>4.2.-Parser rebuild</h4>
@@ -116,24 +107,12 @@ Author: Blas Rodriguez Somoza <a href="">blas@puertareal.com</a><br>
 <p>Remember, you need sed and innosetup in the path to build the installer</p>
 <ul>
 <li>Open a command line window.</li>
-<li>Go to the firebird2\builds\install\arch-specific\win32 directory.</li>
+<li>Go to the firebird2 src\install\arch-specific\win32 directory.</li>
 <li>The batch to build the installer is<br>
 BuildExecutableInstall.bat [DEBUG] [CS]<br>
 Where DEBUG means if the build is a debug one or not and CS means classic server installer.</li>
 <li>After you start the batch, you will get a InnoSetup window. To build the install exe select the option compile, and a new exe will appear in builds/win32/install_image
 </ul>
-<h4>4.4.-Building samples</h4>
-<p>After the standard build is finished, an output directory with the same structure as the installed FB directory is created.</p>
-<p>If you want to build the examples just cd to firebird2\output\examples\build_win32 and run build_all.bat</p>
-<p>Build_all.bat calls five other bats to make the example sets. Excluding empbuild which is a prerequisite for the other example sets, any example set can be build independently with its make_XXX script.</p>
-<p>The example sets are:</p>
-<ul>
-<li>api (API Interface)</li>
-<li>dyn (embedded dynamic SQL)</li>
-<li>empbuild (databases for the other sets)</li>
-<li>stat (embedded static SQL)</li>
-<li>udf (User defined functions)</li>
-</ul>
 </blockquote>
 </BODY>
 </HTML>

doc/cleaning-todo.txt

@@ -1,29 +0,0 @@
-Cleaning todo
-
-The order is not significative.
-
-Macros
-M1.- Remove NOT_USED_OR_REPLACED Macro
-M2.- Remove PYXIS macro
-M3.- Remove NO_CHECKSUM macro (and CCH_Checksum function in cch.cpp)
-M4.- Remove GDS_VAL and GDS_REF macros.
-M5.- Remove NULL_PTR macro
-M6.- Remove TRUE and FALSE macros and replace with builtin "true" and "false"
-
-Code
-C1.- Remove warnings (excluding parentheses, unused var, non complete switches and pragmas)
-C2.- Define (type-safe?) unions for nod_arg and lls_object. 
-	Nod_arg is used in several places of the code to contain pointers to several kinds of objects or numbers, whether is defined as pointer to xxx_nod.
-	The same happends with lls_object in lls (linked list) where the lls_object can store pointers or numbers, whether is defined as pointer to xxx_nod.
-	See gpre.h nod_arg in gpre_nod struct and lls_object in lls struct.
-C3.- Modify gds__msg_format and derivated functions to use arglist instead of TEXT arguments. This change will also remove a lot of casts.
-C4.- Remove casts.
-C5.- Replace macros with code with inline? functions.
-
-Builds
-B1.- Posix take cpp generated from epp out of src directory.
-B2.- Build help.fdb from script.
-B3.- Build msg.fdb from script.
-
-
-The point C1 is prepared and will be committed when 1.5 is out.

doc/fb2-todo.txt

@@ -33,12 +33,9 @@ Targets we are going to support under Firebird 2 architecture
 - built-in INTL
 - internal UDF handler
 3. Clustered server
-Run multi-process engine on each cluster node. Direct page latches and
+Run multi-threaded engine on each cluster node. Direct page latches and
-other locks to a distributed lock manager. Processes may share the same
+other locks to a distributed lock manager. This target should be kept in mind,
-buffer and metadata cache via shared memory. This target should be kept 
+but may not be finalized in 2.0 release.
-in mind, but may not be finalized in 2.0 release. Making Firebird run
-in such configuration is quite an easy thing (at least without shared 
-cache), but it requires expensive equipment and time for testing.
 
 Another important thing. Engine AS IS already _is_ already suited for parallel 
 operation by initial design. Versioning is a great thing !
@@ -69,12 +66,9 @@ TODO:
 7. Make DSQL compilation thread-safe (via porting it to BISON correctly)
 8. Make DSQL requests use new metadata cache
 9. Implement cache of compiled requests (should be easy at this point)
-10. Thread context should be converted to a class and removed from
+10. Review all tdbb/dbb usage in TLS. In general, all functions should derive
-parameters from all functions (and SET_TDBB should be eliminated too).
+its context only from its parameters. TLS usage should be eliminated
-tdbb_default memory pool usage should be eradicated. Functions should 
+or at least minimized
-normally derive their context from parameters, not from thread context.
-Final goal is to minimize or even eliminate TLS usage at all (because
-its usage is simular to local variables usage in terms of maintainability).
 11. Warp dbb/att access with thread-safe accessor methods using dbb-level mutex.
   Review all places where it is used.
 12. Kill manual thread shcheduling (sch.cpp, THREAD_ENTER/THREAD_EXIT 

examples/build_win32/clean_all.bat

@@ -1,6 +0,0 @@
-
-call clean_empbuild.bat
-call clean_api.bat
-call clean_dyn.bat
-call clean_stat.bat
-call clean_udf.bat

examples/build_win32/clean_api.bat

@@ -1,12 +0,0 @@
-
-call setenvvar.bat
-
-@echo.
-@echo cleaning api
-:: CLEANING
-del %ROOT_PATH%\examples\api\*.obj 2>nul
-del %ROOT_PATH%\examples\api\*.exp 2>nul
-del %ROOT_PATH%\examples\api\*.lib 2>nul
-del %ROOT_PATH%\examples\api\*.exe 2>nul
-del %ROOT_PATH%\examples\api\*.pdb 2>nul
-del %ROOT_PATH%\examples\api\api14.c 2>nul

examples/build_win32/clean_dyn.bat

@@ -1,10 +0,0 @@
-
-call setenvvar.bat
-
-@echo.
-@echo cleaning dyn
-:: CLEANING
-del %ROOT_PATH%\examples\dyn\*.obj 2>nul
-del %ROOT_PATH%\examples\dyn\*.exe 2>nul
-del %ROOT_PATH%\examples\dyn\*.c 2>nul
-

examples/build_win32/clean_empbuild.bat

@@ -1,13 +0,0 @@
-
-call setenvvar.bat
-
-@echo.
-@echo cleaning empbuild
-:: CLEANING
-del %ROOT_PATH%\examples\empbuild\*.fdb 2>nul
-del %ROOT_PATH%\examples\empbuild\*.obj 2>nul
-del %ROOT_PATH%\examples\empbuild\*.c 2>nul
-del %ROOT_PATH%\examples\empbuild\*.exe 2>nul
-del %ROOT_PATH%\examples\empbuild\*.tmp 2>nul
-del %ROOT_PATH%\examples\empbuild\*.tmp2 2>nul
-del %ROOT_PATH%\examples\empbuild\*.sed 2>nul

examples/build_win32/clean_stat.bat

@@ -1,10 +0,0 @@
-
-call setenvvar.bat
-
-@echo.
-@echo cleaning stat
-:: CLEANING
-del %ROOT_PATH%\examples\stat\*.obj 2>nul
-del %ROOT_PATH%\examples\stat\*.exe 2>nul
-del %ROOT_PATH%\examples\stat\*.c 2>nul
-

examples/build_win32/clean_udf.bat

@@ -1,7 +0,0 @@
-
-call setenvvar.bat
-
-@echo.
-@echo cleaning udf
-:: TODO
-

examples/build_win32/make_all.bat

@@ -1,5 +0,0 @@
-call make_empbuild.bat
-call make_api.bat
-call make_dyn.bat
-call make_stat.bat
-call make_udf.bat

examples/build_win32/make_api.bat

@@ -1,37 +0,0 @@
-
-call setenvvar.bat
-
-:: CLEANING
-call clean_api.bat
-
-@echo.
-@echo preprocessing api14.e
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\api\api14.e %ROOT_PATH%\examples\api\api14.c -b localhost:%ROOT_PATH%\examples\empbuild\
-
-cd %ROOT_PATH%\examples\api\
-:: OLD FLAGS (to analyze)
-:: /c /AL /Ge /Zi /Mq /Od /G2 /Zp1 /W3
-set CLFLAGS=-I %ROOT_PATH%\include -I %ROOT_PATH%\examples\include 
-
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api1.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api2.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api3.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api4.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api5.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api6.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api7.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api8.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api9.c
-:: TODO : api9f
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api10.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api11.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api12.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api13.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api14.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api15.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api16.c
-:: TODO : winevent
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\api16t.c
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\api\apifull.c
-
-cd %ROOT_PATH%\examples\build_win32\

examples/build_win32/make_dyn.bat

@@ -1,24 +0,0 @@
-
-call setenvvar.bat
-
-:: CLEANING
-@call clean_dyn.bat
-
-@echo.
-@echo preprocessing dyn*.e
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\dyn\dyn1.e %ROOT_PATH%\examples\dyn\dyn1.c -b localhost:%ROOT_PATH%\examples\empbuild\
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\dyn\dyn2.e %ROOT_PATH%\examples\dyn\dyn2.c -b localhost:%ROOT_PATH%\examples\empbuild\
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\dyn\dyn3.e %ROOT_PATH%\examples\dyn\dyn3.c -b localhost:%ROOT_PATH%\examples\empbuild\
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\dyn\dyn4.e %ROOT_PATH%\examples\dyn\dyn4.c -b localhost:%ROOT_PATH%\examples\empbuild\
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\dyn\dyn5.e %ROOT_PATH%\examples\dyn\dyn5.c -b localhost:%ROOT_PATH%\examples\empbuild\
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\dyn\dynfull.e %ROOT_PATH%\examples\dyn\dynfull.c -b localhost:%ROOT_PATH%\examples\empbuild\
-
-cd %ROOT_PATH%\examples\dyn\
-set CLFLAGS=-I %ROOT_PATH%\include -I %ROOT_PATH%\examples\include 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\dyn\dyn1.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\dyn\dyn2.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\dyn\dyn3.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\dyn\dyn4.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\dyn\dyn5.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\dyn\dynfull.c 
-cd %ROOT_PATH%\examples\build_win32

examples/build_win32/make_empbuild.bat

@@ -1,68 +0,0 @@
-
-call setenvvar.bat
-
-:: CLEANING
-call clean_empbuild.bat
-
-cd %ROOT_PATH%\examples\empbuild\
-@echo.
-@echo building databases
-del isql.sed 2>nul
-:: @echo s;empbuild.fdb;localhost:%DB_PATH%/examples/empbuild/empbuild.fdb;g > isql.tmp
-:: @echo s;employe2.fdb;localhost:%DB_PATH%/examples/empbuild/employe2.fdb;g >> isql.tmp
-:: @echo s;intlbuild.fdb;localhost:%DB_PATH%/examples/empbuild/intlbuild.fdb;g >> isql.tmp
-::
-:: sed "s/\//\\//g" < isql.tmp > isql.tmp2
-:: sed "s/;/\//g" < isql.tmp2 > isql.sed
-
-@echo s;empbuild.fdb;localhost:%ROOT_PATH%\examples\empbuild\empbuild.fdb;g > isql.tmp
-@echo s;employe2.fdb;localhost:%ROOT_PATH%\examples\empbuild\employe2.fdb;g >> isql.tmp
-@echo s;intlbuild.fdb;localhost:%ROOT_PATH%\examples\empbuild\intlbuild.fdb;g >> isql.tmp
-@echo s;intlemp.fdb;localhost:%ROOT_PATH%\examples\empbuild\intlemp.fdb;g >> isql.tmp
-
-sed "s/\\/\\\\/g" < isql.tmp > isql.tmp2
-sed "s/;/\//g" < isql.tmp2 > isql.sed
-
-sed -f isql.sed < empbld.sql > empbld.tmp
-sed -f isql.sed < employe2.sql > employe2.tmp
-sed -f isql.sed < intlbld.sql > intlbld.tmp
-sed -f isql.sed < intldml.sql > intldml.tmp
-
-echo save intldml.sql
-move intldml.sql intldml.ori
-move intldml.tmp intldml.sql
-
-echo Executing sql
-isql -i empbld.tmp
-isql -i employe2.tmp
-isql -i intlbld.tmp
-cd %ROOT_PATH%\examples\build_win32
-
-@echo.
-@echo preprocessing empbuild.e and intlbuild.e
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\empbuild\empbuild.e %ROOT_PATH%\examples\empbuild\empbuild.c -b localhost:%ROOT_PATH%\examples\empbuild\
-%ROOT_PATH%\bin\gpre -r -m -n -z %ROOT_PATH%\examples\empbuild\intlbld.e %ROOT_PATH%\examples\empbuild\intlbld.c -b localhost:%ROOT_PATH%\examples\empbuild\
-
-cd %ROOT_PATH%\examples\empbuild\
-cl -I %ROOT_PATH%\include %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\empbuild\empbuild.c 
-cl -I %ROOT_PATH%\include %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\empbuild\intlbld.c 
-cd %ROOT_PATH%\examples\build_win32
-
-@echo.
-@echo Building employee.fdb
-:: and empbuild.exe uses isql
-@del %ROOT_PATH%\examples\empbuild\employee.fdb
-@del %ROOT_PATH%\examples\empbuild\intlemp.fdb
-
-:: Este programa utiliza isql y por lo tanto hay que ponerse en el lugar adecuado
-:: para que encuentre los scripts
-cd %ROOT_PATH%\examples\empbuild\
-@empbuild.exe localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-@intlbld.exe localhost:%ROOT_PATH%\examples\empbuild\intlemp.fdb
-
-echo Restore 
-move intldml.sql intldml.tmp
-move intldml.ori intldml.sql
-
-cd %ROOT_PATH%\examples\build_win32
-

examples/build_win32/make_stat.bat

@@ -1,41 +0,0 @@
-
-call setenvvar.bat
-
-:: CLEANING
-@call clean_stat.bat
-
-@echo.
-@echo preprocessing stat*.e
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat1.e %ROOT_PATH%\examples\stat\stat1.c -d localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat2.e %ROOT_PATH%\examples\stat\stat2.c -d localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat3.e %ROOT_PATH%\examples\stat\stat3.c -d localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat4.e %ROOT_PATH%\examples\stat\stat4.c -d localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat5.e %ROOT_PATH%\examples\stat\stat5.c -d localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-:: TODO
-:: %ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat6.e %ROOT_PATH%\examples\stat\stat6.c -d localhost:%ROOT_PATH%\examples\empbuild\intlemp.fdb
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat7.e %ROOT_PATH%\examples\stat\stat7.c -d localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat8.e %ROOT_PATH%\examples\stat\stat8.c -d localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat9.e %ROOT_PATH%\examples\stat\stat9.c -d localhost:%ROOT_PATH%\examples\empbuild\employee.fdb
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat10.e %ROOT_PATH%\examples\stat\stat10.c -b localhost:%DB_PATH%/examples/empbuild/
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat11.e %ROOT_PATH%\examples\stat\stat11.c -b localhost:%DB_PATH%/examples/empbuild/
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat12.e %ROOT_PATH%\examples\stat\stat12.c -b localhost:%DB_PATH%/examples/empbuild/
-%ROOT_PATH%\bin\gpre -c -m -n -z %ROOT_PATH%\examples\stat\stat12t.e %ROOT_PATH%\examples\stat\stat12t.c -b localhost:%DB_PATH%/examples/empbuild/
-
-cd %ROOT_PATH%\examples\stat\
-set CLFLAGS=-I %ROOT_PATH%\include -I %ROOT_PATH%\examples\include 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat1.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat2.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat3.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat4.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat5.c 
-:: TODO
-:: cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat6.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat7.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat8.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat9.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat10.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat11.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat12.c 
-cl %CLFLAGS% %ROOT_PATH%\lib\gds32_ms.lib %ROOT_PATH%\examples\stat\stat12t.c 
-
-cd %ROOT_PATH%\examples\build_win32

examples/build_win32/make_udf.bat

@@ -1,7 +0,0 @@
-
-call setenvvar.bat
-
-:: CLEANING
-@call clean_udf.bat
-
-:: TODO

examples/build_win32/setenvvar.bat

@@ -1,35 +0,0 @@
-:: This bat set the environment values
-:: ROOT_PATH dos format path of the main directory 
-:: DB_PATH unix format path of the main directory 
-:: VS_VER VisualStudio version (msvc6|msvc7)
-
-@echo off
-::=================
-:SET_DB_DIR
-
-@cd ..\..
-@for /f "delims=" %%a in ('@cd') do (set ROOT_PATH=%%a)
-@cd %~dp0
-for /f "tokens=*" %%a in ('@echo %ROOT_PATH:\=/%') do (set DB_PATH=%%a)
-
-@msdev /? >nul 2>nul
-@if not errorlevel 9009 ((set VS_VER=msvc6) & (goto :END))
-
-@devenv /? >nul 2>nul
-@if not errorlevel 9009 ((set VS_VER=msvc7) & (goto :END))
-
-::===========
-:HELP
-@echo.
-@echo    ERROR: There are not a visual studio valid version in your path. 
-@echo    You need visual studio 6 or 7 to build Firebird
-@echo. 
-:: set errorlevel
-@exit /B 1
-
-:END
-@echo.
-@echo    vs_ver=%VS_VER%
-@echo    db_path=%DB_PATH%
-@echo    root_path=%ROOT_PATH%
-@echo.

lang_helpers/README.txt

@@ -1,6 +0,0 @@
-
-The files gds_codes.ftn and gds_codes.pas in this directory are generated by the program codes.e
-
-They should not be edited directly rather the msg.gdb database should be 
-updated and then these files should be regenerated with the build scripts.
-

src/alice/alice.cpp

@@ -24,7 +24,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: alice.cpp,v 1.28 2003-07-15 02:40:52 brodsom Exp $
+//	$Id: alice.cpp,v 1.27 2003-04-10 06:04:41 aafemt Exp $
 //
 // 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
 //                         conditionals, as the engine now fully supports
@@ -65,7 +65,7 @@
 #endif
 
 #ifdef SUPERSERVER
-#include "../utilities/common/cmd_util_proto.h"
+#include "../utilities/cmd_util_proto.h"
 #endif
 
 #ifdef WIN_NT

src/burp/burp.cpp

@@ -70,7 +70,7 @@
 #endif
 
 #ifdef SUPERSERVER
-#include "../utilities/common/cmd_util_proto.h"
+#include "../utilities/cmd_util_proto.h"
 #endif
 
 

src/burp/depends.mak

@@ -0,0 +1,203 @@
+# The contents of this file are subject to the Interbase Public
+# License Version 1.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy
+# of the License at http://www.Inprise.com/IPL.html
+#
+# Software distributed under the License is distributed on an
+# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
+# or implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code was created by Inprise Corporation
+# and its predecessors. Portions created by Inprise Corporation are
+# Copyright (C) Inprise Corporation.
+#
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+# depends.mak - burp
+# Created by 'make depends.mak'
+# Created on 1998-11-17
+backup.c.o: backu_proto.h
+backup.c.o: backup.c.c
+backup.c.o: burp.h
+backup.c.o: burp_proto.h
+backup.c.o: canon_proto.h
+backup.c.o: misc_proto.h
+backup.c.o: mvol_proto.h
+backup.c.o: source/interbase/include/iberror.h
+backup.c.o: source/jrd/align.h
+backup.c.o: source/jrd/common.h
+backup.c.o: source/jrd/dsc.h
+backup.c.o: source/jrd/fil.h
+backup.c.o: source/jrd/gds.h
+backup.c.o: source/jrd/gds_proto.h
+backup.c.o: source/jrd/isc.h
+backup.c.o: source/jrd/isc_s_proto.h
+backup.c.o: source/jrd/pwd.h
+backup.c.o: source/jrd/svc.h
+backup.c.o: source/jrd/svc_proto.h
+backup.c.o: source/jrd/svc_undoc.h
+backup.c.o: source/jrd/thd.h
+backup.c.o: source/remote/protocol.h
+backup.o: backu_proto.h
+backup.o: backup.c
+backup.o: burp.h
+backup.o: burp_proto.h
+backup.o: canon_proto.h
+backup.o: misc_proto.h
+backup.o: mvol_proto.h
+backup.o: source/interbase/include/iberror.h
+backup.o: source/jrd/align.h
+backup.o: source/jrd/common.h
+backup.o: source/jrd/dsc.h
+backup.o: source/jrd/fil.h
+backup.o: source/jrd/gds.h
+backup.o: source/jrd/gds_proto.h
+backup.o: source/jrd/gdsassert.h
+backup.o: source/jrd/isc.h
+backup.o: source/jrd/isc_s_proto.h
+backup.o: source/jrd/ods.h
+backup.o: source/jrd/pwd.h
+backup.o: source/jrd/svc.h
+backup.o: source/jrd/svc_proto.h
+backup.o: source/jrd/svc_undoc.h
+backup.o: source/jrd/thd.h
+backup.o: source/remote/protocol.h
+burp.o: backu_proto.h
+burp.o: burp.c
+burp.o: burp.h
+burp.o: burp_proto.h
+burp.o: burpswi.h
+burp.o: misc_proto.h
+burp.o: mvol_proto.h
+burp.o: resto_proto.h
+burp.o: source/interbase/include/iberror.h
+burp.o: source/jrd/build_no.h
+burp.o: source/jrd/common.h
+burp.o: source/jrd/dsc.h
+burp.o: source/jrd/fil.h
+burp.o: source/jrd/gds.h
+burp.o: source/jrd/gds_proto.h
+burp.o: source/jrd/gdsassert.h
+burp.o: source/jrd/ibase.h
+burp.o: source/jrd/ibsetjmp.h
+burp.o: source/jrd/isc.h
+burp.o: source/jrd/isc_s_proto.h
+burp.o: source/jrd/license.h
+burp.o: source/jrd/msg_encode.h
+burp.o: source/jrd/pwd.h
+burp.o: source/jrd/svc.h
+burp.o: source/jrd/svc_proto.h
+burp.o: source/jrd/svc_undoc.h
+burp.o: source/jrd/thd.h
+burp.o: source/jrd/time.h
+burp.o: source/jrd/why_proto.h
+burpwep.o: burpwep.c
+burpwep.o: source/jrd/common.h
+canonical.o: burp.h
+canonical.o: burp_proto.h
+canonical.o: canon_proto.h
+canonical.o: canonical.c
+canonical.o: misc_proto.h
+canonical.o: source/interbase/include/iberror.h
+canonical.o: source/jrd/align.h
+canonical.o: source/jrd/common.h
+canonical.o: source/jrd/dsc.h
+canonical.o: source/jrd/fil.h
+canonical.o: source/jrd/gds.h
+canonical.o: source/jrd/gds_proto.h
+canonical.o: source/jrd/ibsetjmp.h
+canonical.o: source/jrd/isc.h
+canonical.o: source/jrd/isc_s_proto.h
+canonical.o: source/jrd/pwd.h
+canonical.o: source/jrd/sdl.h
+canonical.o: source/jrd/sdl_proto.h
+canonical.o: source/jrd/svc.h
+canonical.o: source/jrd/svc_proto.h
+canonical.o: source/jrd/svc_undoc.h
+canonical.o: source/jrd/thd.h
+canonical.o: source/remote/allr_proto.h
+canonical.o: source/remote/blk.h
+canonical.o: source/remote/protocol.h
+canonical.o: source/remote/remote.h
+canonical.o: source/remote/remote_def.h
+canonical.o: source/remote/xdr.h
+gsplit.o: gsplit.c
+gsplit.o: gsplit.h
+gsplit.o: source/jrd/common.h
+misc.o: burp.h
+misc.o: burp_proto.h
+misc.o: misc.c
+misc.o: misc_proto.h
+misc.o: source/interbase/include/iberror.h
+misc.o: source/jrd/common.h
+misc.o: source/jrd/dsc.h
+misc.o: source/jrd/fil.h
+misc.o: source/jrd/gds.h
+misc.o: source/jrd/gds_proto.h
+misc.o: source/jrd/isc.h
+misc.o: source/jrd/isc_s_proto.h
+misc.o: source/jrd/pwd.h
+misc.o: source/jrd/svc.h
+misc.o: source/jrd/svc_proto.h
+misc.o: source/jrd/svc_undoc.h
+misc.o: source/jrd/thd.h
+mvol.o: burp.h
+mvol.o: burp_proto.h
+mvol.o: misc_proto.h
+mvol.o: mvol.c
+mvol.o: mvol_proto.h
+mvol.o: source/interbase/include/iberror.h
+mvol.o: source/jrd/common.h
+mvol.o: source/jrd/dsc.h
+mvol.o: source/jrd/fil.h
+mvol.o: source/jrd/gds.h
+mvol.o: source/jrd/gds_proto.h
+mvol.o: source/jrd/gdsassert.h
+mvol.o: source/jrd/isc.h
+mvol.o: source/jrd/isc_s_proto.h
+mvol.o: source/jrd/pwd.h
+mvol.o: source/jrd/svc.h
+mvol.o: source/jrd/svc_proto.h
+mvol.o: source/jrd/svc_undoc.h
+mvol.o: source/jrd/thd.h
+restore.o: burp.h
+restore.o: burp_proto.h
+restore.o: canon_proto.h
+restore.o: misc_proto.h
+restore.o: mvol_proto.h
+restore.o: resto_proto.h
+restore.o: restore.c
+restore.o: source/interbase/include/iberror.h
+restore.o: source/intl/charsets.h
+restore.o: source/jrd/align.h
+restore.o: source/jrd/build_no.h
+restore.o: source/jrd/common.h
+restore.o: source/jrd/dsc.h
+restore.o: source/jrd/fil.h
+restore.o: source/jrd/flags.h
+restore.o: source/jrd/gds.h
+restore.o: source/jrd/gds_proto.h
+restore.o: source/jrd/gdsassert.h
+restore.o: source/jrd/isc.h
+restore.o: source/jrd/isc_s_proto.h
+restore.o: source/jrd/license.h
+restore.o: source/jrd/obj.h
+restore.o: source/jrd/pwd.h
+restore.o: source/jrd/svc.h
+restore.o: source/jrd/svc_proto.h
+restore.o: source/jrd/svc_undoc.h
+restore.o: source/jrd/thd.h
+restore.o: source/remote/protocol.h
+spit.o: burpswi.h
+spit.o: source/interbase/include/iberror.h
+spit.o: source/jrd/blk.h
+spit.o: source/jrd/common.h
+spit.o: source/jrd/dsc.h
+spit.o: source/jrd/gdsassert.h
+spit.o: source/jrd/ibase.h
+spit.o: source/jrd/isc.h
+spit.o: source/jrd/jrd.h
+spit.o: source/jrd/thd.h
+spit.o: spit.c
+spit.o: spit.h

src/dsql/depends.mak

@@ -0,0 +1,613 @@
+# The contents of this file are subject to the Interbase Public
+# License Version 1.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy
+# of the License at http://www.Inprise.com/IPL.html
+#
+# Software distributed under the License is distributed on an
+# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
+# or implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code was created by Inprise Corporation
+# and its predecessors. Portions created by Inprise Corporation are
+# Copyright (C) Inprise Corporation.
+#
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+# depends.mak - dsql
+# Created by 'make depends.mak'
+# Created on 1998-11-17
+alld.o: alld.c
+alld.o: alld_proto.h
+alld.o: blk.h
+alld.o: dsql.h
+alld.o: errd_proto.h
+alld.o: node.h
+alld.o: source/jrd/codes.h
+alld.o: source/jrd/common.h
+alld.o: source/jrd/dsc.h
+alld.o: source/jrd/fil.h
+alld.o: source/jrd/gds_proto.h
+alld.o: source/jrd/gdsassert.h
+alld.o: source/jrd/ibsetjmp.h
+alld.o: source/jrd/isc.h
+alld.o: source/jrd/thd.h
+alld.o: source/jrd/thd_proto.h
+alld.o: sym.h
+array.o: array.c
+array.o: array_proto.h
+array.o: source/interbase/include/iberror.h
+array.o: source/jrd/common.h
+array.o: source/jrd/fil.h
+array.o: source/jrd/gds.h
+array.o: source/jrd/gds_proto.h
+array.o: source/jrd/thd.h
+blob.o: blob.c
+blob.o: blob_proto.h
+blob.o: source/interbase/include/iberror.h
+blob.o: source/intl/charsets.h
+blob.o: source/jrd/common.h
+blob.o: source/jrd/constants.h
+blob.o: source/jrd/gds.h
+blob.o: source/jrd/intl.h
+ddl.o: alld_proto.h
+ddl.o: blk.h
+ddl.o: ddl.c
+ddl.o: ddl_proto.h
+ddl.o: dsql.h
+ddl.o: errd_proto.h
+ddl.o: gen_proto.h
+ddl.o: make_proto.h
+ddl.o: metd_proto.h
+ddl.o: node.h
+ddl.o: pass1_proto.h
+ddl.o: source/interbase/include/iberror.h
+ddl.o: source/intl/charsets.h
+ddl.o: source/jrd/codes.h
+ddl.o: source/jrd/common.h
+ddl.o: source/jrd/constants.h
+ddl.o: source/jrd/dsc.h
+ddl.o: source/jrd/flags.h
+ddl.o: source/jrd/gds.h
+ddl.o: source/jrd/ibsetjmp.h
+ddl.o: source/jrd/intl.h
+ddl.o: source/jrd/isc.h
+ddl.o: source/jrd/sch_proto.h
+ddl.o: source/jrd/thd.h
+ddl.o: source/jrd/thd_proto.h
+ddl.o: sym.h
+dsql.o: alld_proto.h
+dsql.o: blk.h
+dsql.o: ddl_proto.h
+dsql.o: dsql.c
+dsql.o: dsql.h
+dsql.o: dsql_proto.h
+dsql.o: errd_proto.h
+dsql.o: gen_proto.h
+dsql.o: hsh_proto.h
+dsql.o: make_proto.h
+dsql.o: movd_proto.h
+dsql.o: node.h
+dsql.o: parse_proto.h
+dsql.o: pass1_proto.h
+dsql.o: source/interbase/include/iberror.h
+dsql.o: source/intl/charsets.h
+dsql.o: source/jrd/align.h
+dsql.o: source/jrd/common.h
+dsql.o: source/jrd/dsc.h
+dsql.o: source/jrd/fil.h
+dsql.o: source/jrd/gds.h
+dsql.o: source/jrd/gds_proto.h
+dsql.o: source/jrd/ibsetjmp.h
+dsql.o: source/jrd/intl.h
+dsql.o: source/jrd/isc.h
+dsql.o: source/jrd/sch_proto.h
+dsql.o: source/jrd/thd.h
+dsql.o: source/jrd/thd_proto.h
+dsql.o: source/jrd/why_proto.h
+dsql.o: sqlda.h
+dsql.o: sym.h
+dsqlwep.o: dsqlwep.c
+dsqlwep.o: source/jrd/common.h
+errd.o: blk.h
+errd.o: dsql.h
+errd.o: errd.c
+errd.o: errd_proto.h
+errd.o: source/jrd/codes.h
+errd.o: source/jrd/common.h
+errd.o: source/jrd/dsc.h
+errd.o: source/jrd/fil.h
+errd.o: source/jrd/gds_proto.h
+errd.o: source/jrd/iberr.h
+errd.o: source/jrd/ibsetjmp.h
+errd.o: source/jrd/isc.h
+errd.o: source/jrd/thd.h
+errd.o: source/jrd/thd_proto.h
+errd.o: sqlda.h
+errd.o: utld_proto.h
+gen.o: alld_proto.h
+gen.o: blk.h
+gen.o: ddl_proto.h
+gen.o: dsql.h
+gen.o: errd_proto.h
+gen.o: gen.c
+gen.o: gen_proto.h
+gen.o: make_proto.h
+gen.o: metd_proto.h
+gen.o: node.h
+gen.o: source/interbase/include/iberror.h
+gen.o: source/intl/charsets.h
+gen.o: source/jrd/align.h
+gen.o: source/jrd/common.h
+gen.o: source/jrd/dsc.h
+gen.o: source/jrd/gds.h
+gen.o: source/jrd/ibsetjmp.h
+gen.o: source/jrd/intl.h
+gen.o: source/jrd/isc.h
+gen.o: source/jrd/thd.h
+gen.o: source/jrd/thd_proto.h
+gen.o: sym.h
+hsh.o: alld_proto.h
+hsh.o: blk.h
+hsh.o: dsql.h
+hsh.o: errd_proto.h
+hsh.o: hsh.c
+hsh.o: hsh_proto.h
+hsh.o: source/interbase/include/iberror.h
+hsh.o: source/jrd/common.h
+hsh.o: source/jrd/dsc.h
+hsh.o: source/jrd/gds.h
+hsh.o: source/jrd/ibsetjmp.h
+hsh.o: source/jrd/isc.h
+hsh.o: source/jrd/sch_proto.h
+hsh.o: source/jrd/thd.h
+hsh.o: source/jrd/thd_proto.h
+hsh.o: sym.h
+make.o: alld_proto.h
+make.o: blk.h
+make.o: dsql.h
+make.o: errd_proto.h
+make.o: hsh_proto.h
+make.o: make.c
+make.o: make_proto.h
+make.o: node.h
+make.o: source/interbase/include/iberror.h
+make.o: source/intl/charsets.h
+make.o: source/jrd/align.h
+make.o: source/jrd/common.h
+make.o: source/jrd/constants.h
+make.o: source/jrd/dsc.h
+make.o: source/jrd/dsc_proto.h
+make.o: source/jrd/gds.h
+make.o: source/jrd/ibsetjmp.h
+make.o: source/jrd/intl.h
+make.o: source/jrd/isc.h
+make.o: source/jrd/thd.h
+make.o: source/jrd/thd_proto.h
+make.o: sym.h
+metd.o: alld_proto.h
+metd.o: blk.h
+metd.o: ddl_proto.h
+metd.o: dsql.h
+metd.o: hsh_proto.h
+metd.o: make_proto.h
+metd.o: metd.c
+metd.o: metd_proto.h
+metd.o: node.h
+metd.o: source/interbase/include/iberror.h
+metd.o: source/intl/charsets.h
+metd.o: source/jrd/align.h
+metd.o: source/jrd/common.h
+metd.o: source/jrd/constants.h
+metd.o: source/jrd/dsc.h
+metd.o: source/jrd/fil.h
+metd.o: source/jrd/gds.h
+metd.o: source/jrd/gds_proto.h
+metd.o: source/jrd/ibsetjmp.h
+metd.o: source/jrd/intl.h
+metd.o: source/jrd/isc.h
+metd.o: source/jrd/sch_proto.h
+metd.o: source/jrd/thd.h
+metd.o: source/jrd/thd_proto.h
+metd.o: sym.h
+movd.o: blk.h
+movd.o: dsql.h
+movd.o: errd_proto.h
+movd.o: movd.c
+movd.o: movd_proto.h
+movd.o: source/jrd/codes.h
+movd.o: source/jrd/common.h
+movd.o: source/jrd/cvt_proto.h
+movd.o: source/jrd/dsc.h
+movd.o: source/jrd/iberr.h
+movd.o: source/jrd/ibsetjmp.h
+movd.o: source/jrd/isc.h
+movd.o: source/jrd/thd.h
+movd.o: source/jrd/thd_proto.h
+parse.o: alld_proto.h
+parse.o: blk.h
+parse.o: chars.h
+parse.o: dsql.h
+parse.o: errd_proto.h
+parse.o: hsh_proto.h
+parse.o: keywords.h
+parse.o: make_proto.h
+parse.o: node.h
+parse.o: parse.c
+parse.o: parse_proto.h
+parse.o: source/interbase/include/iberror.h
+parse.o: source/jrd/common.h
+parse.o: source/jrd/dsc.h
+parse.o: source/jrd/fil.h
+parse.o: source/jrd/flags.h
+parse.o: source/jrd/gds.h
+parse.o: source/jrd/gds_proto.h
+parse.o: source/jrd/ibsetjmp.h
+parse.o: source/jrd/isc.h
+parse.o: source/jrd/misc.h
+parse.o: source/jrd/thd.h
+parse.o: source/jrd/thd_proto.h
+parse.o: source/wal/wal.h
+parse.o: sym.h
+pass1.o: alld_proto.h
+pass1.o: blk.h
+pass1.o: ddl_proto.h
+pass1.o: dsql.h
+pass1.o: errd_proto.h
+pass1.o: hsh_proto.h
+pass1.o: make_proto.h
+pass1.o: metd_proto.h
+pass1.o: node.h
+pass1.o: pass1.c
+pass1.o: pass1_proto.h
+pass1.o: source/intl/charsets.h
+pass1.o: source/jrd/blr.h
+pass1.o: source/jrd/codes.h
+pass1.o: source/jrd/common.h
+pass1.o: source/jrd/dsc.h
+pass1.o: source/jrd/dsc_proto.h
+pass1.o: source/jrd/ibsetjmp.h
+pass1.o: source/jrd/intl.h
+pass1.o: source/jrd/isc.h
+pass1.o: source/jrd/thd.h
+pass1.o: source/jrd/thd_proto.h
+pass1.o: sym.h
+preparse.o: chars.h
+preparse.o: prepa_proto.h
+preparse.o: preparse.c
+preparse.o: source/interbase/include/iberror.h
+preparse.o: source/jrd/common.h
+preparse.o: source/jrd/fil.h
+preparse.o: source/jrd/gds.h
+preparse.o: source/jrd/gds_proto.h
+preparse.o: source/jrd/thd.h
+preparse.o: utld_proto.h
+user_dsql.o: blk.h
+user_dsql.o: chars.h
+user_dsql.o: dsql.h
+user_dsql.o: source/jrd/align.h
+user_dsql.o: source/jrd/blr.h
+user_dsql.o: source/jrd/codes.h
+user_dsql.o: source/jrd/common.h
+user_dsql.o: source/jrd/dsc.h
+user_dsql.o: source/jrd/fil.h
+user_dsql.o: source/jrd/gds_proto.h
+user_dsql.o: source/jrd/ibsetjmp.h
+user_dsql.o: source/jrd/inf.h
+user_dsql.o: source/jrd/thd.h
+user_dsql.o: source/jrd/why_proto.h
+user_dsql.o: sqlda.h
+user_dsql.o: user__proto.h
+user_dsql.o: user_dsql.c
+utld.o: blk.h
+utld.o: dsql.h
+utld.o: source/jrd/align.h
+utld.o: source/jrd/blr.h
+utld.o: source/jrd/codes.h
+utld.o: source/jrd/common.h
+utld.o: source/jrd/dsc.h
+utld.o: source/jrd/fil.h
+utld.o: source/jrd/gds_proto.h
+utld.o: source/jrd/ibsetjmp.h
+utld.o: source/jrd/inf.h
+utld.o: source/jrd/thd.h
+utld.o: sqlda.h
+utld.o: utld.c
+utld.o: utld_proto.h
+alld.bin: alld.c
+alld.bin: alld_proto.h
+alld.bin: blk.h
+alld.bin: dsql.h
+alld.bin: errd_proto.h
+alld.bin: node.h
+alld.bin: source/jrd/codes.h
+alld.bin: source/jrd/common.h
+alld.bin: source/jrd/dsc.h
+alld.bin: source/jrd/fil.h
+alld.bin: source/jrd/gds_proto.h
+alld.bin: source/jrd/gdsassert.h
+alld.bin: source/jrd/ibsetjmp.h
+alld.bin: source/jrd/isc.h
+alld.bin: source/jrd/thd.h
+alld.bin: source/jrd/thd_proto.h
+alld.bin: sym.h
+array.bin: array.c
+array.bin: array_proto.h
+array.bin: source/interbase/include/iberror.h
+array.bin: source/jrd/common.h
+array.bin: source/jrd/fil.h
+array.bin: source/jrd/gds.h
+array.bin: source/jrd/gds_proto.h
+array.bin: source/jrd/thd.h
+blob.bin: blob.c
+blob.bin: blob_proto.h
+blob.bin: source/interbase/include/iberror.h
+blob.bin: source/intl/charsets.h
+blob.bin: source/jrd/common.h
+blob.bin: source/jrd/constants.h
+blob.bin: source/jrd/gds.h
+blob.bin: source/jrd/intl.h
+ddl.bin: alld_proto.h
+ddl.bin: blk.h
+ddl.bin: ddl.c
+ddl.bin: ddl_proto.h
+ddl.bin: dsql.h
+ddl.bin: errd_proto.h
+ddl.bin: gen_proto.h
+ddl.bin: make_proto.h
+ddl.bin: metd_proto.h
+ddl.bin: node.h
+ddl.bin: pass1_proto.h
+ddl.bin: source/interbase/include/iberror.h
+ddl.bin: source/intl/charsets.h
+ddl.bin: source/jrd/codes.h
+ddl.bin: source/jrd/common.h
+ddl.bin: source/jrd/constants.h
+ddl.bin: source/jrd/dsc.h
+ddl.bin: source/jrd/flags.h
+ddl.bin: source/jrd/gds.h
+ddl.bin: source/jrd/ibsetjmp.h
+ddl.bin: source/jrd/intl.h
+ddl.bin: source/jrd/isc.h
+ddl.bin: source/jrd/sch_proto.h
+ddl.bin: source/jrd/thd.h
+ddl.bin: source/jrd/thd_proto.h
+ddl.bin: sym.h
+dsql.bin: alld_proto.h
+dsql.bin: blk.h
+dsql.bin: ddl_proto.h
+dsql.bin: dsql.c
+dsql.bin: dsql.h
+dsql.bin: dsql_proto.h
+dsql.bin: errd_proto.h
+dsql.bin: gen_proto.h
+dsql.bin: hsh_proto.h
+dsql.bin: make_proto.h
+dsql.bin: movd_proto.h
+dsql.bin: node.h
+dsql.bin: parse_proto.h
+dsql.bin: pass1_proto.h
+dsql.bin: source/interbase/include/iberror.h
+dsql.bin: source/intl/charsets.h
+dsql.bin: source/jrd/align.h
+dsql.bin: source/jrd/common.h
+dsql.bin: source/jrd/dsc.h
+dsql.bin: source/jrd/fil.h
+dsql.bin: source/jrd/gds.h
+dsql.bin: source/jrd/gds_proto.h
+dsql.bin: source/jrd/ibsetjmp.h
+dsql.bin: source/jrd/intl.h
+dsql.bin: source/jrd/isc.h
+dsql.bin: source/jrd/sch_proto.h
+dsql.bin: source/jrd/thd.h
+dsql.bin: source/jrd/thd_proto.h
+dsql.bin: source/jrd/why_proto.h
+dsql.bin: sqlda.h
+dsql.bin: sym.h
+dsqlwep.bin: dsqlwep.c
+dsqlwep.bin: source/jrd/common.h
+errd.bin: blk.h
+errd.bin: dsql.h
+errd.bin: errd.c
+errd.bin: errd_proto.h
+errd.bin: source/jrd/codes.h
+errd.bin: source/jrd/common.h
+errd.bin: source/jrd/dsc.h
+errd.bin: source/jrd/fil.h
+errd.bin: source/jrd/gds_proto.h
+errd.bin: source/jrd/iberr.h
+errd.bin: source/jrd/ibsetjmp.h
+errd.bin: source/jrd/isc.h
+errd.bin: source/jrd/thd.h
+errd.bin: source/jrd/thd_proto.h
+errd.bin: sqlda.h
+errd.bin: utld_proto.h
+gen.bin: alld_proto.h
+gen.bin: blk.h
+gen.bin: ddl_proto.h
+gen.bin: dsql.h
+gen.bin: errd_proto.h
+gen.bin: gen.c
+gen.bin: gen_proto.h
+gen.bin: make_proto.h
+gen.bin: metd_proto.h
+gen.bin: node.h
+gen.bin: source/interbase/include/iberror.h
+gen.bin: source/intl/charsets.h
+gen.bin: source/jrd/align.h
+gen.bin: source/jrd/common.h
+gen.bin: source/jrd/dsc.h
+gen.bin: source/jrd/gds.h
+gen.bin: source/jrd/ibsetjmp.h
+gen.bin: source/jrd/intl.h
+gen.bin: source/jrd/isc.h
+gen.bin: source/jrd/thd.h
+gen.bin: source/jrd/thd_proto.h
+gen.bin: sym.h
+hsh.bin: alld_proto.h
+hsh.bin: blk.h
+hsh.bin: dsql.h
+hsh.bin: errd_proto.h
+hsh.bin: hsh.c
+hsh.bin: hsh_proto.h
+hsh.bin: source/interbase/include/iberror.h
+hsh.bin: source/jrd/common.h
+hsh.bin: source/jrd/dsc.h
+hsh.bin: source/jrd/gds.h
+hsh.bin: source/jrd/ibsetjmp.h
+hsh.bin: source/jrd/isc.h
+hsh.bin: source/jrd/sch_proto.h
+hsh.bin: source/jrd/thd.h
+hsh.bin: source/jrd/thd_proto.h
+hsh.bin: sym.h
+make.bin: alld_proto.h
+make.bin: blk.h
+make.bin: dsql.h
+make.bin: errd_proto.h
+make.bin: hsh_proto.h
+make.bin: make.c
+make.bin: make_proto.h
+make.bin: node.h
+make.bin: source/interbase/include/iberror.h
+make.bin: source/intl/charsets.h
+make.bin: source/jrd/align.h
+make.bin: source/jrd/common.h
+make.bin: source/jrd/constants.h
+make.bin: source/jrd/dsc.h
+make.bin: source/jrd/dsc_proto.h
+make.bin: source/jrd/gds.h
+make.bin: source/jrd/ibsetjmp.h
+make.bin: source/jrd/intl.h
+make.bin: source/jrd/isc.h
+make.bin: source/jrd/thd.h
+make.bin: source/jrd/thd_proto.h
+make.bin: sym.h
+metd.bin: alld_proto.h
+metd.bin: blk.h
+metd.bin: ddl_proto.h
+metd.bin: dsql.h
+metd.bin: hsh_proto.h
+metd.bin: make_proto.h
+metd.bin: metd.c
+metd.bin: metd_proto.h
+metd.bin: node.h
+metd.bin: source/interbase/include/iberror.h
+metd.bin: source/intl/charsets.h
+metd.bin: source/jrd/align.h
+metd.bin: source/jrd/common.h
+metd.bin: source/jrd/constants.h
+metd.bin: source/jrd/dsc.h
+metd.bin: source/jrd/fil.h
+metd.bin: source/jrd/gds.h
+metd.bin: source/jrd/gds_proto.h
+metd.bin: source/jrd/ibsetjmp.h
+metd.bin: source/jrd/intl.h
+metd.bin: source/jrd/isc.h
+metd.bin: source/jrd/sch_proto.h
+metd.bin: source/jrd/thd.h
+metd.bin: source/jrd/thd_proto.h
+metd.bin: sym.h
+movd.bin: blk.h
+movd.bin: dsql.h
+movd.bin: errd_proto.h
+movd.bin: movd.c
+movd.bin: movd_proto.h
+movd.bin: source/jrd/codes.h
+movd.bin: source/jrd/common.h
+movd.bin: source/jrd/cvt_proto.h
+movd.bin: source/jrd/dsc.h
+movd.bin: source/jrd/iberr.h
+movd.bin: source/jrd/ibsetjmp.h
+movd.bin: source/jrd/isc.h
+movd.bin: source/jrd/thd.h
+movd.bin: source/jrd/thd_proto.h
+parse.bin: alld_proto.h
+parse.bin: blk.h
+parse.bin: chars.h
+parse.bin: dsql.h
+parse.bin: errd_proto.h
+parse.bin: hsh_proto.h
+parse.bin: keywords.h
+parse.bin: make_proto.h
+parse.bin: node.h
+parse.bin: parse.c
+parse.bin: parse_proto.h
+parse.bin: source/interbase/include/iberror.h
+parse.bin: source/jrd/common.h
+parse.bin: source/jrd/dsc.h
+parse.bin: source/jrd/fil.h
+parse.bin: source/jrd/flags.h
+parse.bin: source/jrd/gds.h
+parse.bin: source/jrd/gds_proto.h
+parse.bin: source/jrd/ibsetjmp.h
+parse.bin: source/jrd/isc.h
+parse.bin: source/jrd/misc.h
+parse.bin: source/jrd/thd.h
+parse.bin: source/jrd/thd_proto.h
+parse.bin: source/wal/wal.h
+parse.bin: sym.h
+pass1.bin: alld_proto.h
+pass1.bin: blk.h
+pass1.bin: ddl_proto.h
+pass1.bin: dsql.h
+pass1.bin: errd_proto.h
+pass1.bin: hsh_proto.h
+pass1.bin: make_proto.h
+pass1.bin: metd_proto.h
+pass1.bin: node.h
+pass1.bin: pass1.c
+pass1.bin: pass1_proto.h
+pass1.bin: source/intl/charsets.h
+pass1.bin: source/jrd/blr.h
+pass1.bin: source/jrd/codes.h
+pass1.bin: source/jrd/common.h
+pass1.bin: source/jrd/dsc.h
+pass1.bin: source/jrd/dsc_proto.h
+pass1.bin: source/jrd/ibsetjmp.h
+pass1.bin: source/jrd/intl.h
+pass1.bin: source/jrd/isc.h
+pass1.bin: source/jrd/thd.h
+pass1.bin: source/jrd/thd_proto.h
+pass1.bin: sym.h
+preparse.bin: chars.h
+preparse.bin: prepa_proto.h
+preparse.bin: preparse.c
+preparse.bin: source/interbase/include/iberror.h
+preparse.bin: source/jrd/common.h
+preparse.bin: source/jrd/fil.h
+preparse.bin: source/jrd/gds.h
+preparse.bin: source/jrd/gds_proto.h
+preparse.bin: source/jrd/thd.h
+preparse.bin: utld_proto.h
+user_dsql.bin: blk.h
+user_dsql.bin: chars.h
+user_dsql.bin: dsql.h
+user_dsql.bin: source/jrd/align.h
+user_dsql.bin: source/jrd/blr.h
+user_dsql.bin: source/jrd/codes.h
+user_dsql.bin: source/jrd/common.h
+user_dsql.bin: source/jrd/dsc.h
+user_dsql.bin: source/jrd/fil.h
+user_dsql.bin: source/jrd/gds_proto.h
+user_dsql.bin: source/jrd/ibsetjmp.h
+user_dsql.bin: source/jrd/inf.h
+user_dsql.bin: source/jrd/thd.h
+user_dsql.bin: source/jrd/why_proto.h
+user_dsql.bin: sqlda.h
+user_dsql.bin: user__proto.h
+user_dsql.bin: user_dsql.c
+utld.bin: blk.h
+utld.bin: dsql.h
+utld.bin: source/jrd/align.h
+utld.bin: source/jrd/blr.h
+utld.bin: source/jrd/codes.h
+utld.bin: source/jrd/common.h
+utld.bin: source/jrd/dsc.h
+utld.bin: source/jrd/fil.h
+utld.bin: source/jrd/gds_proto.h
+utld.bin: source/jrd/ibsetjmp.h
+utld.bin: source/jrd/inf.h
+utld.bin: source/jrd/thd.h
+utld.bin: sqlda.h
+utld.bin: utld.c
+utld.bin: utld_proto.h

src/dsql/node.h

@@ -413,11 +413,11 @@ typedef dsql_nod* DSQL_NOD;
 #define e_select_expr   0       /* nod_select */
 #define e_select_order  1
 #define e_select_update 2
-#define e_select_lock   3
 #define e_select_count  4
 
 #define e_fpd_list      0       /* nod_for_update */
-#define e_fpd_count     1
+#define e_fpd_lock      1
+#define e_fpd_count     2
 
 #define e_sav_name      0       /* nod_user_savepoint, nod_undo_savepoint */
 #define e_sav_count     1

src/dsql/parse.y

@@ -2773,8 +2773,8 @@ set_statistics	: SET STATISTICS INDEX symbol_index_name
 
 /* SELECT statement */
 
-select		: union_expr order_clause for_update_clause lock_clause
+select		: union_expr order_clause for_update_clause
-			{ $$ = make_node (nod_select, 4, $1, $2, $3, $4); }
+			{ $$ = make_node (nod_select, 3, $1, $2, $3); }
 		;
 
 union_expr	: select_expr
@@ -2820,8 +2820,8 @@ nulls_clause : NULLS begin_first nulls_placement end_first
 			{ $$ = 0; }
 		;
 
-for_update_clause : FOR UPDATE for_update_list
+for_update_clause : FOR UPDATE for_update_list lock_clause
-			{ $$ = make_node (nod_for_update, 1, $3); }
+			{ $$ = make_node (nod_for_update, 2, $3, $4); }
 		|
 			{ $$ = 0; }
 		;

src/dsql/pass1.cpp

@@ -1340,9 +1340,10 @@ DSQL_NOD PASS1_statement(DSQL_REQ request, DSQL_NOD input, USHORT proc_flag)
 		return input;
 
 	case nod_select:
+		temp = input->nod_arg[e_select_update];
 		node = PASS1_rse(request, input->nod_arg[e_select_expr], input->nod_arg[e_select_order],
-			input->nod_arg[e_select_lock]);
+			temp ? temp->nod_arg[e_fpd_lock] : NULL );
-		if (input->nod_arg[e_select_update]) {
+		if (temp) {
 			request->req_type = REQ_SELECT_UPD;
 			request->req_flags |= REQ_no_batch;
 			break;