From d153ef8a7ebedc2eeecd9fec6e42b7c2fd419824 Mon Sep 17 00:00:00 2001 From: nobody Date: Tue, 15 Jul 2003 10:32:03 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create branch 'B1_5_Release'. --- ChangeLog | 889 --- Makefile.in | 2 +- .../linux/super/tarinstall.sh.in | 47 - builds/posix/Makefile.in.client.util | 18 +- builds/posix/Makefile.in.codes | 26 +- builds/posix/Makefile.in.embed.qli | 4 +- builds/posix/Makefile.in.embed.util | 12 +- .../posix}/Makefile.in.example5 | 2 +- builds/posix/Makefile.in.extlib | 12 +- builds/posix/Makefile.in.firebird | 32 +- builds/posix/Makefile.in.gpre | 118 + builds/posix/Makefile.in.libfbclient | 6 +- builds/posix/Makefile.in.msgs | 4 +- builds/posix/Makefile.in.refDatabases | 12 +- .../posix}/Makefile.in.v5_examples | 2 +- builds/posix/make.defaults | 7 +- builds/posix/make.shared.targets | 14 +- builds/posix/make.shared.variables | 23 +- builds/posix/prefix.darwin | 4 +- builds/posix/prefix.example | 2 +- builds/posix/prefix.freebsd | 4 +- builds/posix/prefix.linux | 4 +- builds/posix/prefix.mingw | 4 +- builds/posix/prefix.sinixz | 4 +- builds/posix/prefix.solaris | 2 +- builds/posix/prefix.solx86 | 4 +- builds/posix/prefix.solx86gcc | 4 +- builds/win32/blrtable.bat | 2 +- builds/win32/clean_all.bat | 8 +- builds/win32/make_all.bat | 67 +- builds/win32/make_boot.bat | 17 +- builds/win32/make_examples.bat | 114 + builds/win32/msvc6/Firebird2.dsw | 15 + builds/win32/msvc6/Firebird2Boot.dsw | 15 - builds/win32/msvc6/codes.dsp | 2 +- builds/win32/msvc6/engine.dsp | 18 +- builds/win32/msvc6/engine_classic.dsp | 18 +- builds/win32/msvc6/engine_embed.dsp | 18 +- builds/win32/msvc6/fb_inet_server.dsp | 10 +- builds/win32/msvc6/fbclient.dsp | 6 +- builds/win32/msvc6/fbclient_static.dsp | 4 +- builds/win32/msvc6/fbembed.dsp | 8 +- builds/win32/msvc6/fbguard.dsp | 2 +- builds/win32/msvc6/fbserver.dsp | 10 +- builds/win32/msvc6/gds32.dsp | 2 +- builds/win32/msvc6/gsec.dsp | 8 +- builds/win32/msvc6/gstat.dsp | 6 +- builds/win32/msvc6/instreg.dsp | 8 +- builds/win32/msvc6/instsvc.dsp | 6 +- builds/win32/msvc6/relations.dsp | 108 - builds/win32/msvc6/remote.dsp | 16 +- builds/win32/msvc6/remote_classic.dsp | 16 +- builds/win32/msvc6/utilities.dsp | 20 +- builds/win32/msvc6/utilities_classic.dsp | 20 +- builds/win32/msvc6/v5_examples.dsp | 101 + builds/win32/msvc7/engine.vcproj | 6 +- builds/win32/msvc7/engine_classic.vcproj | 6 +- builds/win32/msvc7/engine_embed.vcproj | 6 +- builds/win32/msvc7/fb_inet_server.vcproj | 10 +- builds/win32/msvc7/fbclient.vcproj | 4 +- builds/win32/msvc7/fbclient_static.vcproj | 4 +- builds/win32/msvc7/fbembed.vcproj | 8 +- builds/win32/msvc7/fbserver.vcproj | 10 +- builds/win32/msvc7/gds32.vcproj | 2 +- builds/win32/msvc7/gstat.vcproj | 4 +- builds/win32/msvc7/remote.vcproj | 16 +- builds/win32/msvc7/remote_classic.vcproj | 16 +- builds/win32/msvc7/utilities.vcproj | 2 +- builds/win32/msvc7/utilities_classic.vcproj | 2 +- builds/win32/prepare.bat | 10 +- builds/win32/preprocess.bat | 7 +- clean.sh | 22 +- configure.in | 61 +- doc/README.build.mingw.html | 2 +- doc/README.build.msvc.html | 35 +- doc/cleaning-todo.txt | 29 - doc/emacros-cross_ref.html | 5523 ----------------- doc/fb2-todo.txt | 18 +- examples/build_win32/clean_all.bat | 6 - examples/build_win32/clean_api.bat | 12 - examples/build_win32/clean_dyn.bat | 10 - examples/build_win32/clean_empbuild.bat | 13 - examples/build_win32/clean_stat.bat | 10 - examples/build_win32/clean_udf.bat | 7 - examples/build_win32/make_all.bat | 5 - examples/build_win32/make_api.bat | 37 - examples/build_win32/make_dyn.bat | 24 - examples/build_win32/make_empbuild.bat | 68 - examples/build_win32/make_stat.bat | 41 - examples/build_win32/make_udf.bat | 7 - examples/build_win32/setenvvar.bat | 35 - generated/placeholder.txt | 0 lang_helpers/README.txt | 6 - src/alice/alice.cpp | 4 +- src/burp/burp.cpp | 2 +- src/burp/depends.mak | 203 + src/dsql/depends.mak | 613 ++ src/dsql/node.h | 4 +- src/dsql/parse.y | 8 +- src/dsql/pass1.cpp | 5 +- src/dudley/depends.mak | 182 + src/dudley/lex.cpp | 5 - {lang_helpers => src/extlib}/ib_util.pas | 0 src/gpre/gpre.cpp | 17 +- src/include/gen/codetext.h | 6 - src/include/gen/fields.h | 119 - .../include/gen}/gds_codes.ftn | 0 .../include/gen}/gds_codes.pas | 0 src/include/gen/ids.h | 569 +- src/include/gen/msgs.h | 3 - src/include/gen/names.h | 202 - src/include/gen/rdb_codes.h | 3 - src/include/gen/relations.h | 319 - src/include/old_fb_blk.h | 2 + .../arch-specific/darwin/FrameworkInfo.plist | 0 .../install/arch-specific/darwin/Makefile.in | 0 .../install/arch-specific/freebsd/Makefile.in | 0 .../install/arch-specific/linux/Makefile.in | 2 +- .../arch-specific/linux/classic/README | 0 .../linux/classic/makeInstallImage.sh.in | 4 +- .../linux/classic/postinstall.sh.in | 2 +- .../linux/classic/postuninstall.sh.in | 2 +- .../linux/classic/preinstall.sh.in | 2 +- .../linux/classic/preuninstall.sh.in | 2 +- .../linux/classic/rpmfiles.txt.in | 0 .../linux/classic/rpmheader.txt.in | 0 .../linux/classic}/tarMainInstall.sh.in | 2 +- .../linux/classic}/tarMainUninstall.sh.in | 2 +- .../linux/classic/tarinstall.sh.in | 2 +- .../linux/classic/taruninstall.sh.in | 2 +- .../linux/misc/changeDBAPassword.sh.in | 0 .../linux/misc/firebird.xinetd.in | 0 .../linux/super/SSchangePasswd.sh | 0 .../arch-specific/linux/super/install.sh.in | 0 .../linux/super/makeInstallImage.sh.in | 4 +- .../linux/super/postinstall.sh.in | 0 .../linux/super/postuninstall.sh.in | 0 .../linux/super/preinstall.sh.in | 0 .../linux/super/preuninstall.sh.in | 0 .../arch-specific/linux/super/rpmfiles.txt.in | 0 .../linux/super/rpmheader.txt.in | 0 .../linux/super}/tarMainInstall.sh.in | 2 +- .../linux/super}/tarMainUninstall.sh.in | 2 +- .../linux/super/taruninstall.sh.in | 2 +- .../install/arch-specific/mingw/Makefile.in | 0 .../install/arch-specific/sinixz/Makefile.in | 2 +- .../install/arch-specific/sinixz/pkginfo.in | 0 .../arch-specific/sinixz/postinstall.in | 2 +- .../arch-specific/sinixz/postremove.in | 2 +- .../arch-specific/sinixz/preinstall.in | 2 +- .../install/arch-specific/sinixz/prototype.in | 4 +- .../install/arch-specific/solaris/Makefile.in | 0 .../install/arch-specific/solx86/Makefile.in | 0 .../win32/BuildExecutableInstall.bat | 51 + .../win32/FirebirdInstall_15.iss | 18 +- .../install/arch-specific/win32/Readme.txt | 0 .../win32/firebird_install_logo1.bmp | Bin .../win32/installation_readme.txt | 0 .../install/arch-specific/win32/setenvvar.bat | 0 .../install/misc/CSchangeRunUser.sh | 0 .../install/misc/CSrestoreRootRunUser.sh | 0 {builds => src}/install/misc/IDPLicense.txt | 0 {builds => src}/install/misc/IPLicense.txt | 0 .../install/misc/SSchangeRunUser.sh | 0 .../install/misc/SSrestoreRootRunUser.sh | 0 .../install/misc/changeDBAPassword.sh | 0 {builds => src}/install/misc/firebird.conf | 0 .../install/misc/firebird.init.d.generic | 0 .../install/misc/firebird.init.d.mandrake | 0 src/intl/depends.mak | 591 ++ src/intlcpp/depends.mak | 591 ++ src/ipserver/ipclient.cpp | 2 +- src/iscguard/cntl_guard.cpp | 2 +- src/iscguard/iscguard.cpp | 6 +- src/isql/depends.mak | 115 + src/journal/depends.mak | 137 + src/journal/rebuild.e | 2 +- src/journal/server.e | 2 +- src/jrd/ail.cpp | 4 +- src/{misc => jrd}/align.cpp | 2 +- src/jrd/alt.cpp | 4 +- src/jrd/blp.h | 8 - src/{misc => jrd}/blrtable.cpp | 5 +- src/jrd/build_no.h | 12 +- src/jrd/cch.cpp | 4 +- src/jrd/cch.h | 2 +- src/jrd/cmp.cpp | 5 +- src/{misc => jrd}/codes.epp | 69 +- src/jrd/{os/vms => }/dfloat_stub.cpp | 0 src/{dbs => jrd}/dflt.gdl | 0 src/jrd/dfw.epp | 11 +- src/jrd/divorce.cpp | 3 + src/jrd/dyn.epp | 2 +- src/{misc => jrd}/envelope.epp | 0 src/jrd/err.cpp | 2 +- src/jrd/everything.h | 2 +- src/jrd/exe.cpp | 10 +- src/jrd/{os/vms => }/extvms.cpp | 0 src/jrd/fields.h | 119 + {lang_helpers => src/jrd}/gds.bas | 0 src/jrd/gds.cpp | 17 + {lang_helpers => src/jrd}/gds.pas | 0 {lang_helpers => src/jrd}/gds.pli | 0 {lang_helpers => src/jrd}/gds.vpas | 0 {lang_helpers => src/jrd}/gds_aix.f | 0 {lang_helpers => src/jrd}/gds_hp.f | 0 {lang_helpers => src/jrd}/gds_sun.f | 0 {lang_helpers => src/jrd}/gds_vms.f | 0 src/{dbs => jrd}/grant.gdl | 0 src/jrd/ib_stdio.h | 2 + src/jrd/{os/win32 => }/ibinitdll.cpp | 0 src/jrd/ids.m | 30 + src/jrd/idx.h | 188 +- src/jrd/inf.cpp | 4 +- src/jrd/ini.epp | 74 +- src/jrd/ini.h | 16 +- src/jrd/iscmsgs.msg | 67 + src/jrd/{os/vms => }/jio.cpp | 0 src/jrd/jrd.cpp | 4 +- src/jrd/{os/vms => }/lnmdef.h | 0 src/jrd/{os/vms => }/map.cpp | 12 +- src/jrd/{os/vms => }/map_proto.h | 0 src/jrd/{os/vms => }/mblr.cpp | 0 src/jrd/{os/vms => }/mblr.h | 0 src/jrd/{os/vms => }/mblr_proto.h | 0 src/{misc => jrd}/memtest.cpp | 0 src/jrd/met.epp | 8 +- src/jrd/names.h | 204 + src/{dbs => jrd}/ods10.gdl | 0 src/{dbs => jrd}/ods101.gdl | 0 src/{dbs => jrd}/ods72.gdl | 0 src/{dbs => jrd}/ods80.gdl | 0 src/{dbs => jrd}/ods80dif.gdl | 0 src/{dbs => jrd}/ods81.gdl | 0 src/{dbs => jrd}/ods91.gdl | 0 src/jrd/old.cpp | 2 +- src/jrd/opt.cpp | 21 +- src/jrd/os/win32/config_root.cpp | 2 +- src/jrd/pag.cpp | 4 +- src/jrd/par.cpp | 9 +- {lang_helpers => src/jrd}/perf.pas | 0 src/jrd/{os => }/pio.h | 0 src/jrd/{os => }/pio_proto.h | 0 src/{misc => jrd}/print.cpp | 0 src/{dbs => jrd}/procs2.gdl | 0 src/jrd/{os/vms => }/prv_m_bypass.h | 0 src/jrd/qatest.cpp | 2 +- src/jrd/{os/vms => }/rdb.cpp | 0 src/jrd/{os/vms => }/rdb.h | 0 src/jrd/{os/vms => }/rdbcodes.h | 0 src/jrd/{os/vms => }/rdbgpas.cpp | 0 src/jrd/{os/vms => }/rdbint.cpp | 0 src/jrd/relations.h | 315 + src/jrd/rse.cpp | 6 +- src/jrd/sdw.cpp | 4 +- src/{dbs => jrd}/stored_proc.gdl | 0 src/jrd/svc.cpp | 4 +- src/jrd/{os/vms => }/syidef.h | 0 src/jrd/types.h | 122 +- src/jrd/{os/posix => }/unix.cpp | 4 +- src/{dbs => jrd}/v2_triggers.gdl | 0 src/jrd/vio.cpp | 220 +- src/jrd/vio_proto.h | 2 +- src/jrd/{os/vms => }/vms.cpp | 0 src/jrd/{os/vms => }/vms.h | 0 src/jrd/{os/vms => }/vms_command.cpp | 0 src/jrd/{os/vms => }/vmsevent.cpp | 0 src/jrd/{os/vms => }/vmslo_proto.h | 0 src/jrd/{os/vms => }/vmslock.cpp | 0 src/jrd/{os/vms => }/vmsthread.cpp | 0 src/jrd/{os/win32 => }/winnt.cpp | 4 +- src/lock/depends.mak | 99 + src/misc/headers.sed | 4 - {builds => src}/misc/help.gbak | Bin src/misc/ibase_header.txt | 11 - {builds => src}/misc/metadata.gbak | Bin src/{dbs => misc}/metadata.sql | 0 src/misc/relations.epp | 620 -- {builds => src}/misc/security.gbak | Bin src/misc/writeBuildNum.sh | 6 +- src/msgs/depends.mak | 46 + {builds/misc => src/msgs}/msg.gbak | Bin src/qli/depends.mak | 419 ++ src/qli/meta.epp | 5 - src/remote/{os/win32 => }/caution.ico | Bin src/remote/{os/win32 => }/chop.cpp | 0 src/remote/{os/win32 => }/chop_proto.h | 0 src/remote/{os/vms => }/chuser.cpp | 0 src/remote/{os/win32 => }/cntl.cpp | 4 +- src/remote/{os/win32 => }/cntl_proto.h | 0 src/remote/depends.mak | 1247 ++++ src/remote/{os/win32 => }/dllshell.cpp | 0 src/remote/{os/win32 => }/ibconfig.cpp | 40 +- src/remote/{os/win32 => }/ibconfig.h | 0 src/remote/{os/win32 => }/ibconfig.rc | 0 src/remote/{os/win32 => }/ibsvrhlp.h | 0 src/remote/inet.cpp | 4 +- src/remote/interface.cpp | 2 +- src/remote/{os/win32 => }/property.cpp | 14 +- src/remote/{os/win32 => }/property.rc | 0 src/remote/{os/win32 => }/property.rh | 0 src/remote/{os/win32 => }/propty_proto.h | 0 src/remote/server.cpp | 2 +- src/remote/{os/win32 => }/server.ico | Bin src/remote/{os/win32 => }/srvr_w32.cpp | 10 +- src/remote/{os/win32 => }/window.cpp | 10 +- src/remote/{os/win32 => }/window.h | 0 src/remote/{os/win32 => }/window.rc | 2 +- src/remote/{os/win32 => }/window.rh | 0 src/remote/{os/win32 => }/window_proto.h | 0 src/remote/{os/win32 => }/winmain.cpp | 0 src/remote/{os/win32 => }/wnet.cpp | 4 +- src/remote/{os/win32 => }/wnet_proto.h | 0 src/remote/xnet.cpp | 4 +- src/utilities/{common => }/cmd_util.cpp | 0 src/utilities/{common => }/cmd_util_proto.h | 0 src/utilities/{gstat => }/dba.epp | 12 +- src/utilities/{gstat => }/dba_full.epp | 2 +- src/utilities/{gstat => }/dbaswi.h | 0 src/utilities/{gsec => }/gsec.cpp | 8 +- src/utilities/{gsec => }/gsec.h | 0 src/utilities/{gsec => }/gsecswi.h | 0 src/utilities/{guard => }/guard.cpp | 4 +- src/utilities/{ibmgr => }/ibmgr.cpp | 8 +- src/utilities/{ibmgr => }/ibmgr.h | 2 +- src/utilities/{ibmgr => }/ibmgrswi.h | 2 +- src/utilities/{install => }/install_nt.h | 0 src/utilities/{install => }/install_reg.cpp | 4 +- src/utilities/{install => }/install_svc.cpp | 6 +- src/{dbs => utilities}/isc.gdl | 0 src/utilities/{gstat => }/ppg.cpp | 2 +- src/utilities/{gstat => }/ppg_proto.h | 0 src/utilities/{rebuild => }/rebui_proto.h | 0 src/utilities/{rebuild => }/rebuild.cpp | 8 +- src/utilities/{rebuild => }/rebuild.gdl | 0 src/utilities/{rebuild => }/rebuild.h | 0 src/utilities/{install => }/regis_proto.h | 0 src/utilities/{install => }/registry.cpp | 6 +- src/utilities/{install => }/registry.h | 0 src/utilities/{rebuild => }/rmet.epp | 6 +- src/utilities/{rebuild => }/rmet_proto.h | 0 src/utilities/{rebuild => }/rstor_proto.h | 0 src/utilities/{rebuild => }/rstore.epp | 6 +- src/utilities/sbc_print.cpp | 2 +- src/{dbs => utilities}/scrty_unix.gdl | 0 src/{dbs => utilities}/scrty_vms.gdl | 0 src/utilities/{gsec => }/secur_proto.h | 0 src/utilities/{gsec => }/security.epp | 4 +- src/{dbs => utilities}/security.gdl | 0 src/{dbs => utilities}/security.sql | 0 src/utilities/{install => }/servi_proto.h | 0 src/utilities/{install => }/services.cpp | 6 +- src/utilities/{ibmgr => }/srvrmgr.cpp | 6 +- src/utilities/{ibmgr => }/srvrmgr_proto.h | 0 src/utilities/{guard => }/util.cpp | 4 +- src/utilities/{guard => }/util_proto.h | 0 {examples/include => src/v5_examples}/align.h | 2 +- {examples/api => src/v5_examples}/api1.c | 0 {examples/api => src/v5_examples}/api10.c | 0 {examples/api => src/v5_examples}/api11.c | 0 {examples/api => src/v5_examples}/api12.c | 0 {examples/api => src/v5_examples}/api13.c | 0 {examples/api => src/v5_examples}/api14.e | 0 {examples/api => src/v5_examples}/api15.c | 0 {examples/api => src/v5_examples}/api16.c | 0 {examples/api => src/v5_examples}/api16t.c | 0 {examples/api => src/v5_examples}/api2.c | 0 {examples/api => src/v5_examples}/api3.c | 0 {examples/api => src/v5_examples}/api4.c | 0 {examples/api => src/v5_examples}/api5.c | 0 {examples/api => src/v5_examples}/api6.c | 0 {examples/api => src/v5_examples}/api7.c | 0 {examples/api => src/v5_examples}/api8.c | 0 {examples/api => src/v5_examples}/api9.c | 0 {examples/api => src/v5_examples}/api9f.c | 0 {examples/api => src/v5_examples}/api9f.def | 0 {examples/api => src/v5_examples}/api9f.sql | 0 {examples/api => src/v5_examples}/apifull.c | 16 +- {examples/dyn => src/v5_examples}/dyn1.e | 0 {examples/dyn => src/v5_examples}/dyn2.e | 0 {examples/dyn => src/v5_examples}/dyn3.e | 0 {examples/dyn => src/v5_examples}/dyn4.e | 0 {examples/dyn => src/v5_examples}/dyn5.e | 0 {examples/dyn => src/v5_examples}/dynfull.e | 18 +- .../empbuild => src/v5_examples}/empbld.sql | 0 src/v5_examples/empbuild.c | 808 +++ .../empbuild => src/v5_examples}/empbuild.e | 0 .../empbuild => src/v5_examples}/empddl.sql | 0 .../empbuild => src/v5_examples}/empdml.sql | 0 .../empbuild => src/v5_examples}/employe2.sql | 0 {examples/api => src/v5_examples}/example.def | 0 .../include => src/v5_examples}/example.h | 0 .../old => src/v5_examples}/example.mak | 0 {examples => src/v5_examples}/functions.c | 0 .../empbuild => src/v5_examples}/indexoff.sql | 0 .../empbuild => src/v5_examples}/indexon.sql | 0 .../empbuild => src/v5_examples}/intlbld.e | 0 .../empbuild => src/v5_examples}/intlbld.sql | 0 .../empbuild => src/v5_examples}/intlddl.sql | 14 +- .../empbuild => src/v5_examples}/intldml.sql | 0 .../empbuild => src/v5_examples}/job.inp | 0 .../empbuild => src/v5_examples}/lang.inp | 0 .../old => src/v5_examples}/makefile.old | 2 +- .../old => src/v5_examples}/prefix.hp10 | 0 .../old => src/v5_examples}/prefix.linux | 0 .../old => src/v5_examples}/prefix.sco_ev | 0 .../old => src/v5_examples}/prefix.solaris | 0 .../old => src/v5_examples}/prefix.win32_bc | 0 .../old => src/v5_examples}/prefix.win32_msc | 0 .../empbuild => src/v5_examples}/proj.inp | 0 .../empbuild => src/v5_examples}/qtr.inp | 0 {examples => src/v5_examples}/readme | 0 .../old => src/v5_examples}/sfx.unix_makefile | 0 .../v5_examples}/sfx.win32_makefile | 0 {examples/stat => src/v5_examples}/stat1.e | 0 {examples/stat => src/v5_examples}/stat10.e | 0 {examples/stat => src/v5_examples}/stat11.e | 0 {examples/stat => src/v5_examples}/stat12.e | 0 {examples/stat => src/v5_examples}/stat12t.e | 0 {examples/stat => src/v5_examples}/stat2.e | 0 {examples/stat => src/v5_examples}/stat3.e | 0 {examples/stat => src/v5_examples}/stat4.e | 0 {examples/stat => src/v5_examples}/stat5.e | 0 {examples/stat => src/v5_examples}/stat6.e | 0 {examples/stat => src/v5_examples}/stat7.e | 0 {examples/stat => src/v5_examples}/stat8.e | 0 {examples/stat => src/v5_examples}/stat9.e | 0 {examples/udf => src/v5_examples}/udf.sql | 0 {examples/udf => src/v5_examples}/udflib.c | 0 {examples/udf => src/v5_examples}/udflib.def | 0 {examples/api => src/v5_examples}/winevent.c | 0 .../api => src/v5_examples}/winevent.def | 0 {examples/api => src/v5_examples}/winevent.rc | 0 433 files changed, 7454 insertions(+), 9486 deletions(-) delete mode 100644 builds/install/arch-specific/linux/super/tarinstall.sh.in rename {examples/build_unix => builds/posix}/Makefile.in.example5 (99%) create mode 100644 builds/posix/Makefile.in.gpre rename {examples/build_unix => builds/posix}/Makefile.in.v5_examples (98%) create mode 100644 builds/win32/make_examples.bat delete mode 100644 builds/win32/msvc6/relations.dsp create mode 100644 builds/win32/msvc6/v5_examples.dsp delete mode 100644 doc/cleaning-todo.txt delete mode 100644 doc/emacros-cross_ref.html delete mode 100644 examples/build_win32/clean_all.bat delete mode 100644 examples/build_win32/clean_api.bat delete mode 100644 examples/build_win32/clean_dyn.bat delete mode 100644 examples/build_win32/clean_empbuild.bat delete mode 100644 examples/build_win32/clean_stat.bat delete mode 100644 examples/build_win32/clean_udf.bat delete mode 100644 examples/build_win32/make_all.bat delete mode 100644 examples/build_win32/make_api.bat delete mode 100644 examples/build_win32/make_dyn.bat delete mode 100644 examples/build_win32/make_empbuild.bat delete mode 100644 examples/build_win32/make_stat.bat delete mode 100644 examples/build_win32/make_udf.bat delete mode 100644 examples/build_win32/setenvvar.bat delete mode 100644 generated/placeholder.txt delete mode 100644 lang_helpers/README.txt create mode 100644 src/burp/depends.mak create mode 100644 src/dsql/depends.mak create mode 100644 src/dudley/depends.mak rename {lang_helpers => src/extlib}/ib_util.pas (100%) delete mode 100644 src/include/gen/fields.h rename {lang_helpers => src/include/gen}/gds_codes.ftn (100%) rename {lang_helpers => src/include/gen}/gds_codes.pas (100%) delete mode 100644 src/include/gen/names.h delete mode 100644 src/include/gen/relations.h rename {builds => src}/install/arch-specific/darwin/FrameworkInfo.plist (100%) rename {builds => src}/install/arch-specific/darwin/Makefile.in (100%) rename {builds => src}/install/arch-specific/freebsd/Makefile.in (100%) rename {builds => src}/install/arch-specific/linux/Makefile.in (98%) rename {builds => src}/install/arch-specific/linux/classic/README (100%) rename {builds => src}/install/arch-specific/linux/classic/makeInstallImage.sh.in (98%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/classic/postinstall.sh.in (99%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/classic/postuninstall.sh.in (97%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/classic/preinstall.sh.in (99%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/classic/preuninstall.sh.in (97%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/classic/rpmfiles.txt.in (100%) rename {builds => src}/install/arch-specific/linux/classic/rpmheader.txt.in (100%) rename {builds/install/arch-specific/linux/super => src/install/arch-specific/linux/classic}/tarMainInstall.sh.in (98%) mode change 100644 => 100755 rename {builds/install/arch-specific/linux/super => src/install/arch-specific/linux/classic}/tarMainUninstall.sh.in (98%) rename {builds => src}/install/arch-specific/linux/classic/tarinstall.sh.in (95%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/classic/taruninstall.sh.in (97%) rename {builds => src}/install/arch-specific/linux/misc/changeDBAPassword.sh.in (100%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/misc/firebird.xinetd.in (100%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/super/SSchangePasswd.sh (100%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/super/install.sh.in (100%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/super/makeInstallImage.sh.in (97%) rename {builds => src}/install/arch-specific/linux/super/postinstall.sh.in (100%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/super/postuninstall.sh.in (100%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/super/preinstall.sh.in (100%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/super/preuninstall.sh.in (100%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/linux/super/rpmfiles.txt.in (100%) rename {builds => src}/install/arch-specific/linux/super/rpmheader.txt.in (100%) rename {builds/install/arch-specific/linux/classic => src/install/arch-specific/linux/super}/tarMainInstall.sh.in (97%) rename {builds/install/arch-specific/linux/classic => src/install/arch-specific/linux/super}/tarMainUninstall.sh.in (98%) rename {builds => src}/install/arch-specific/linux/super/taruninstall.sh.in (97%) rename {builds => src}/install/arch-specific/mingw/Makefile.in (100%) rename {builds => src}/install/arch-specific/sinixz/Makefile.in (97%) rename {builds => src}/install/arch-specific/sinixz/pkginfo.in (100%) rename {builds => src}/install/arch-specific/sinixz/postinstall.in (94%) rename {builds => src}/install/arch-specific/sinixz/postremove.in (89%) rename {builds => src}/install/arch-specific/sinixz/preinstall.in (90%) rename {builds => src}/install/arch-specific/sinixz/prototype.in (97%) rename {builds => src}/install/arch-specific/solaris/Makefile.in (100%) rename {builds => src}/install/arch-specific/solx86/Makefile.in (100%) rename {builds => src}/install/arch-specific/win32/BuildExecutableInstall.bat (74%) mode change 100644 => 100755 rename {builds => src}/install/arch-specific/win32/FirebirdInstall_15.iss (95%) rename {builds => src}/install/arch-specific/win32/Readme.txt (100%) rename {builds => src}/install/arch-specific/win32/firebird_install_logo1.bmp (100%) rename {builds => src}/install/arch-specific/win32/installation_readme.txt (100%) rename {builds => src}/install/arch-specific/win32/setenvvar.bat (100%) rename {builds => src}/install/misc/CSchangeRunUser.sh (100%) mode change 100644 => 100755 rename {builds => src}/install/misc/CSrestoreRootRunUser.sh (100%) mode change 100644 => 100755 rename {builds => src}/install/misc/IDPLicense.txt (100%) rename {builds => src}/install/misc/IPLicense.txt (100%) rename {builds => src}/install/misc/SSchangeRunUser.sh (100%) mode change 100644 => 100755 rename {builds => src}/install/misc/SSrestoreRootRunUser.sh (100%) mode change 100644 => 100755 rename {builds => src}/install/misc/changeDBAPassword.sh (100%) mode change 100644 => 100755 rename {builds => src}/install/misc/firebird.conf (100%) mode change 100644 => 100755 rename {builds => src}/install/misc/firebird.init.d.generic (100%) mode change 100644 => 100755 rename {builds => src}/install/misc/firebird.init.d.mandrake (100%) mode change 100644 => 100755 create mode 100644 src/intl/depends.mak create mode 100644 src/intlcpp/depends.mak create mode 100644 src/isql/depends.mak create mode 100644 src/journal/depends.mak rename src/{misc => jrd}/align.cpp (98%) rename src/{misc => jrd}/blrtable.cpp (99%) rename src/{misc => jrd}/codes.epp (92%) rename src/jrd/{os/vms => }/dfloat_stub.cpp (100%) rename src/{dbs => jrd}/dflt.gdl (100%) rename src/{misc => jrd}/envelope.epp (100%) rename src/jrd/{os/vms => }/extvms.cpp (100%) create mode 100644 src/jrd/fields.h rename {lang_helpers => src/jrd}/gds.bas (100%) rename {lang_helpers => src/jrd}/gds.pas (100%) rename {lang_helpers => src/jrd}/gds.pli (100%) rename {lang_helpers => src/jrd}/gds.vpas (100%) rename {lang_helpers => src/jrd}/gds_aix.f (100%) rename {lang_helpers => src/jrd}/gds_hp.f (100%) rename {lang_helpers => src/jrd}/gds_sun.f (100%) rename {lang_helpers => src/jrd}/gds_vms.f (100%) rename src/{dbs => jrd}/grant.gdl (100%) rename src/jrd/{os/win32 => }/ibinitdll.cpp (100%) create mode 100644 src/jrd/ids.m create mode 100644 src/jrd/iscmsgs.msg rename src/jrd/{os/vms => }/jio.cpp (100%) rename src/jrd/{os/vms => }/lnmdef.h (100%) rename src/jrd/{os/vms => }/map.cpp (99%) rename src/jrd/{os/vms => }/map_proto.h (100%) rename src/jrd/{os/vms => }/mblr.cpp (100%) rename src/jrd/{os/vms => }/mblr.h (100%) rename src/jrd/{os/vms => }/mblr_proto.h (100%) rename src/{misc => jrd}/memtest.cpp (100%) create mode 100644 src/jrd/names.h rename src/{dbs => jrd}/ods10.gdl (100%) rename src/{dbs => jrd}/ods101.gdl (100%) rename src/{dbs => jrd}/ods72.gdl (100%) rename src/{dbs => jrd}/ods80.gdl (100%) rename src/{dbs => jrd}/ods80dif.gdl (100%) rename src/{dbs => jrd}/ods81.gdl (100%) rename src/{dbs => jrd}/ods91.gdl (100%) rename {lang_helpers => src/jrd}/perf.pas (100%) rename src/jrd/{os => }/pio.h (100%) rename src/jrd/{os => }/pio_proto.h (100%) rename src/{misc => jrd}/print.cpp (100%) rename src/{dbs => jrd}/procs2.gdl (100%) rename src/jrd/{os/vms => }/prv_m_bypass.h (100%) rename src/jrd/{os/vms => }/rdb.cpp (100%) rename src/jrd/{os/vms => }/rdb.h (100%) rename src/jrd/{os/vms => }/rdbcodes.h (100%) rename src/jrd/{os/vms => }/rdbgpas.cpp (100%) rename src/jrd/{os/vms => }/rdbint.cpp (100%) create mode 100644 src/jrd/relations.h rename src/{dbs => jrd}/stored_proc.gdl (100%) rename src/jrd/{os/vms => }/syidef.h (100%) rename src/jrd/{os/posix => }/unix.cpp (99%) rename src/{dbs => jrd}/v2_triggers.gdl (100%) rename src/jrd/{os/vms => }/vms.cpp (100%) rename src/jrd/{os/vms => }/vms.h (100%) rename src/jrd/{os/vms => }/vms_command.cpp (100%) rename src/jrd/{os/vms => }/vmsevent.cpp (100%) rename src/jrd/{os/vms => }/vmslo_proto.h (100%) rename src/jrd/{os/vms => }/vmslock.cpp (100%) rename src/jrd/{os/vms => }/vmsthread.cpp (100%) rename src/jrd/{os/win32 => }/winnt.cpp (99%) create mode 100644 src/lock/depends.mak delete mode 100644 src/misc/headers.sed rename {builds => src}/misc/help.gbak (100%) delete mode 100644 src/misc/ibase_header.txt rename {builds => src}/misc/metadata.gbak (100%) rename src/{dbs => misc}/metadata.sql (100%) delete mode 100644 src/misc/relations.epp rename {builds => src}/misc/security.gbak (100%) create mode 100644 src/msgs/depends.mak rename {builds/misc => src/msgs}/msg.gbak (100%) create mode 100644 src/qli/depends.mak rename src/remote/{os/win32 => }/caution.ico (100%) rename src/remote/{os/win32 => }/chop.cpp (100%) rename src/remote/{os/win32 => }/chop_proto.h (100%) rename src/remote/{os/vms => }/chuser.cpp (100%) rename src/remote/{os/win32 => }/cntl.cpp (99%) rename src/remote/{os/win32 => }/cntl_proto.h (100%) create mode 100644 src/remote/depends.mak rename src/remote/{os/win32 => }/dllshell.cpp (100%) rename src/remote/{os/win32 => }/ibconfig.cpp (96%) rename src/remote/{os/win32 => }/ibconfig.h (100%) rename src/remote/{os/win32 => }/ibconfig.rc (100%) rename src/remote/{os/win32 => }/ibsvrhlp.h (100%) rename src/remote/{os/win32 => }/property.cpp (97%) rename src/remote/{os/win32 => }/property.rc (100%) rename src/remote/{os/win32 => }/property.rh (100%) rename src/remote/{os/win32 => }/propty_proto.h (100%) rename src/remote/{os/win32 => }/server.ico (100%) rename src/remote/{os/win32 => }/srvr_w32.cpp (98%) rename src/remote/{os/win32 => }/window.cpp (98%) rename src/remote/{os/win32 => }/window.h (100%) rename src/remote/{os/win32 => }/window.rc (98%) rename src/remote/{os/win32 => }/window.rh (100%) rename src/remote/{os/win32 => }/window_proto.h (100%) rename src/remote/{os/win32 => }/winmain.cpp (100%) rename src/remote/{os/win32 => }/wnet.cpp (99%) rename src/remote/{os/win32 => }/wnet_proto.h (100%) rename src/utilities/{common => }/cmd_util.cpp (100%) rename src/utilities/{common => }/cmd_util_proto.h (100%) rename src/utilities/{gstat => }/dba.epp (99%) rename src/utilities/{gstat => }/dba_full.epp (99%) rename src/utilities/{gstat => }/dbaswi.h (100%) rename src/utilities/{gsec => }/gsec.cpp (99%) rename src/utilities/{gsec => }/gsec.h (100%) rename src/utilities/{gsec => }/gsecswi.h (100%) rename src/utilities/{guard => }/guard.cpp (98%) rename src/utilities/{ibmgr => }/ibmgr.cpp (99%) rename src/utilities/{ibmgr => }/ibmgr.h (98%) rename src/utilities/{ibmgr => }/ibmgrswi.h (98%) rename src/utilities/{install => }/install_nt.h (100%) rename src/utilities/{install => }/install_reg.cpp (97%) rename src/utilities/{install => }/install_svc.cpp (98%) rename src/{dbs => utilities}/isc.gdl (100%) rename src/utilities/{gstat => }/ppg.cpp (99%) rename src/utilities/{gstat => }/ppg_proto.h (100%) rename src/utilities/{rebuild => }/rebui_proto.h (100%) rename src/utilities/{rebuild => }/rebuild.cpp (99%) rename src/utilities/{rebuild => }/rebuild.gdl (100%) rename src/utilities/{rebuild => }/rebuild.h (100%) rename src/utilities/{install => }/regis_proto.h (100%) rename src/utilities/{install => }/registry.cpp (97%) rename src/utilities/{install => }/registry.h (100%) rename src/utilities/{rebuild => }/rmet.epp (94%) rename src/utilities/{rebuild => }/rmet_proto.h (100%) rename src/utilities/{rebuild => }/rstor_proto.h (100%) rename src/utilities/{rebuild => }/rstore.epp (97%) rename src/{dbs => utilities}/scrty_unix.gdl (100%) rename src/{dbs => utilities}/scrty_vms.gdl (100%) rename src/utilities/{gsec => }/secur_proto.h (100%) rename src/utilities/{gsec => }/security.epp (99%) rename src/{dbs => utilities}/security.gdl (100%) rename src/{dbs => utilities}/security.sql (100%) rename src/utilities/{install => }/servi_proto.h (100%) rename src/utilities/{install => }/services.cpp (98%) rename src/utilities/{ibmgr => }/srvrmgr.cpp (99%) rename src/utilities/{ibmgr => }/srvrmgr_proto.h (100%) rename src/utilities/{guard => }/util.cpp (98%) rename src/utilities/{guard => }/util_proto.h (100%) rename {examples/include => src/v5_examples}/align.h (96%) rename {examples/api => src/v5_examples}/api1.c (100%) rename {examples/api => src/v5_examples}/api10.c (100%) rename {examples/api => src/v5_examples}/api11.c (100%) rename {examples/api => src/v5_examples}/api12.c (100%) rename {examples/api => src/v5_examples}/api13.c (100%) rename {examples/api => src/v5_examples}/api14.e (100%) rename {examples/api => src/v5_examples}/api15.c (100%) rename {examples/api => src/v5_examples}/api16.c (100%) rename {examples/api => src/v5_examples}/api16t.c (100%) rename {examples/api => src/v5_examples}/api2.c (100%) rename {examples/api => src/v5_examples}/api3.c (100%) rename {examples/api => src/v5_examples}/api4.c (100%) rename {examples/api => src/v5_examples}/api5.c (100%) rename {examples/api => src/v5_examples}/api6.c (100%) rename {examples/api => src/v5_examples}/api7.c (100%) rename {examples/api => src/v5_examples}/api8.c (100%) rename {examples/api => src/v5_examples}/api9.c (100%) rename {examples/api => src/v5_examples}/api9f.c (100%) rename {examples/api => src/v5_examples}/api9f.def (100%) rename {examples/api => src/v5_examples}/api9f.sql (100%) rename {examples/api => src/v5_examples}/apifull.c (97%) rename {examples/dyn => src/v5_examples}/dyn1.e (100%) rename {examples/dyn => src/v5_examples}/dyn2.e (100%) rename {examples/dyn => src/v5_examples}/dyn3.e (100%) rename {examples/dyn => src/v5_examples}/dyn4.e (100%) rename {examples/dyn => src/v5_examples}/dyn5.e (100%) rename {examples/dyn => src/v5_examples}/dynfull.e (96%) rename {examples/empbuild => src/v5_examples}/empbld.sql (100%) create mode 100644 src/v5_examples/empbuild.c rename {examples/empbuild => src/v5_examples}/empbuild.e (100%) rename {examples/empbuild => src/v5_examples}/empddl.sql (100%) rename {examples/empbuild => src/v5_examples}/empdml.sql (100%) rename {examples/empbuild => src/v5_examples}/employe2.sql (100%) rename {examples/api => src/v5_examples}/example.def (100%) rename {examples/include => src/v5_examples}/example.h (100%) rename {examples/build_win32/old => src/v5_examples}/example.mak (100%) rename {examples => src/v5_examples}/functions.c (100%) rename {examples/empbuild => src/v5_examples}/indexoff.sql (100%) rename {examples/empbuild => src/v5_examples}/indexon.sql (100%) rename {examples/empbuild => src/v5_examples}/intlbld.e (100%) rename {examples/empbuild => src/v5_examples}/intlbld.sql (100%) rename {examples/empbuild => src/v5_examples}/intlddl.sql (98%) rename {examples/empbuild => src/v5_examples}/intldml.sql (100%) rename {examples/empbuild => src/v5_examples}/job.inp (100%) rename {examples/empbuild => src/v5_examples}/lang.inp (100%) rename {examples/build_unix/old => src/v5_examples}/makefile.old (99%) rename {examples/build_unix/old => src/v5_examples}/prefix.hp10 (100%) rename {examples/build_unix/old => src/v5_examples}/prefix.linux (100%) rename {examples/build_unix/old => src/v5_examples}/prefix.sco_ev (100%) rename {examples/build_unix/old => src/v5_examples}/prefix.solaris (100%) rename {examples/build_win32/old => src/v5_examples}/prefix.win32_bc (100%) rename {examples/build_win32/old => src/v5_examples}/prefix.win32_msc (100%) rename {examples/empbuild => src/v5_examples}/proj.inp (100%) rename {examples/empbuild => src/v5_examples}/qtr.inp (100%) rename {examples => src/v5_examples}/readme (100%) rename {examples/build_unix/old => src/v5_examples}/sfx.unix_makefile (100%) rename {examples/build_win32/old => src/v5_examples}/sfx.win32_makefile (100%) rename {examples/stat => src/v5_examples}/stat1.e (100%) rename {examples/stat => src/v5_examples}/stat10.e (100%) rename {examples/stat => src/v5_examples}/stat11.e (100%) rename {examples/stat => src/v5_examples}/stat12.e (100%) rename {examples/stat => src/v5_examples}/stat12t.e (100%) rename {examples/stat => src/v5_examples}/stat2.e (100%) rename {examples/stat => src/v5_examples}/stat3.e (100%) rename {examples/stat => src/v5_examples}/stat4.e (100%) rename {examples/stat => src/v5_examples}/stat5.e (100%) rename {examples/stat => src/v5_examples}/stat6.e (100%) rename {examples/stat => src/v5_examples}/stat7.e (100%) rename {examples/stat => src/v5_examples}/stat8.e (100%) rename {examples/stat => src/v5_examples}/stat9.e (100%) rename {examples/udf => src/v5_examples}/udf.sql (100%) rename {examples/udf => src/v5_examples}/udflib.c (100%) rename {examples/udf => src/v5_examples}/udflib.def (100%) rename {examples/api => src/v5_examples}/winevent.c (100%) rename {examples/api => src/v5_examples}/winevent.def (100%) rename {examples/api => src/v5_examples}/winevent.rc (100%) diff --git a/ChangeLog b/ChangeLog index 4e0f8f6602..d16836928c 100644 --- a/ChangeLog +++ b/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: diff --git a/Makefile.in b/Makefile.in index 1a8f52a111..4f898cdbc4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,4 +3,4 @@ all: firebird firebird install package packages dist clean clobber: - $(MAKE) -C gen $@ + $(MAKE) -C src $@ diff --git a/builds/install/arch-specific/linux/super/tarinstall.sh.in b/builds/install/arch-specific/linux/super/tarinstall.sh.in deleted file mode 100644 index 4132cfbdad..0000000000 --- a/builds/install/arch-specific/linux/super/tarinstall.sh.in +++ /dev/null @@ -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 -# -# 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 diff --git a/builds/posix/Makefile.in.client.util b/builds/posix/Makefile.in.client.util index bf26cd90e0..1d04773f1a 100644 --- a/builds/posix/Makefile.in.client.util +++ b/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)))) diff --git a/builds/posix/Makefile.in.codes b/builds/posix/Makefile.in.codes index 4698f3969f..04bfbb28f7 100644 --- a/builds/posix/Makefile.in.codes +++ b/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 - $(BIN)/codes $(SRC_ROOT)/include/gen $(LNG_ROOT) - $(BIN)/relations $(SRC_ROOT)/include/gen +build_codes: $(BIN)/codes msg.fdb + $(BIN)/codes include/gen -$(SRC_ROOT)/misc/codes.cpp: $(SRC_ROOT)/misc/codes.epp - $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ - -$(SRC_ROOT)/misc/relations.cpp: $(SRC_ROOT)/misc/relations.epp +$(SRC_ROOT)/jrd/codes.cpp: $(SRC_ROOT)/jrd/codes.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 diff --git a/builds/posix/Makefile.in.embed.qli b/builds/posix/Makefile.in.embed.qli index 90de387bf4..983899022a 100644 --- a/builds/posix/Makefile.in.embed.qli +++ b/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 diff --git a/builds/posix/Makefile.in.embed.util b/builds/posix/Makefile.in.embed.util index de10d79213..3b08cafdbf 100644 --- a/builds/posix/Makefile.in.embed.util +++ b/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)))) diff --git a/examples/build_unix/Makefile.in.example5 b/builds/posix/Makefile.in.example5 similarity index 99% rename from examples/build_unix/Makefile.in.example5 rename to builds/posix/Makefile.in.example5 index 1f421677e2..023bea02fc 100644 --- a/examples/build_unix/Makefile.in.example5 +++ b/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=../.. diff --git a/builds/posix/Makefile.in.extlib b/builds/posix/Makefile.in.extlib index 60d3b7db0b..ce1fa2a8c7 100644 --- a/builds/posix/Makefile.in.extlib +++ b/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) - $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fbudf.$(SHRLIB_EXT) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ +$(UDF)/fb_udf.$(SHRLIB_EXT): $(FBUDF_Objects) $(UTIL_Objects) + $(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) diff --git a/builds/posix/Makefile.in.firebird b/builds/posix/Makefile.in.firebird index 0c6fcb135b..196e07b5a0 100644 --- a/builds/posix/Makefile.in.firebird +++ b/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 - $(SRC_ROOT)/misc/writeBuildNum.sh createMakeVersion $@ +$(GEN_ROOT)/Make.Version : misc/writeBuildNum.sh + 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: - $(CP) $(ROOT)/examples/readme $(FIREBIRD)/examples/README - $(CP) $(ROOT)/examples/*.* $(FIREBIRD)/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/ +examples: + $(MAKE) -C ../gen/v5_examples -f ../Makefile.v5_examples +# $(MAKE) -f $(GEN_ROOT)/Makefile.v5_examples 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 $@ diff --git a/builds/posix/Makefile.in.gpre b/builds/posix/Makefile.in.gpre new file mode 100644 index 0000000000..8d53162c0b --- /dev/null +++ b/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 +# +# 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) diff --git a/builds/posix/Makefile.in.libfbclient b/builds/posix/Makefile.in.libfbclient index b42d80c310..de22aefeab 100644 --- a/builds/posix/Makefile.in.libfbclient +++ b/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_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SECURITY_ClientSources_gsec)))) +SECURITY_ClientSources = $(addprefix utilities/, $(SECURITY_ClientFiles)) +SECURITY_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SECURITY_ClientSources)))) FBUTIL_ClientSources = $(addprefix fbutil/, $(FBUTIL_ClientFiles)) diff --git a/builds/posix/Makefile.in.msgs b/builds/posix/Makefile.in.msgs index eda8a0476d..93d9d89557 100644 --- a/builds/posix/Makefile.in.msgs +++ b/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 diff --git a/builds/posix/Makefile.in.refDatabases b/builds/posix/Makefile.in.refDatabases index 0e7419f434..4f8b590967 100644 --- a/builds/posix/Makefile.in.refDatabases +++ b/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 $@ diff --git a/examples/build_unix/Makefile.in.v5_examples b/builds/posix/Makefile.in.v5_examples similarity index 98% rename from examples/build_unix/Makefile.in.v5_examples rename to builds/posix/Makefile.in.v5_examples index 088e241521..a9fe368bbb 100644 --- a/examples/build_unix/Makefile.in.v5_examples +++ b/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 diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults index 2f46e01ad2..8762a0ca3e 100755 --- a/builds/posix/make.defaults +++ b/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 # diff --git a/builds/posix/make.shared.targets b/builds/posix/make.shared.targets index cfa402c325..de0784a162 100644 --- a/builds/posix/make.shared.targets +++ b/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) $(GEN_ROOT)/y.tab.h $(SRC_ROOT)/dsql/dsql.tab.h + $(MV) $(SRC_ROOT)/y.tab.c $(SRC_ROOT)/dsql/dsql.tab.c + $(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 \ - $(SRC_ROOT)/jrd/version.rc $(SRC_ROOT)/jrd/build_no.h $(SRC_ROOT)/remote/os/win32/property.rc \ - $(SRC_ROOT)/remote/os/win32/property.rh $(SRC_ROOT)/remote/os/win32/ibconfig.rc +$(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/property.rc \ + $(SRC_ROOT)/remote/property.rh $(SRC_ROOT)/remote/ibconfig.rc .PHONY: clean FORCE diff --git a/builds/posix/make.shared.variables b/builds/posix/make.shared.variables index cac0a29d2d..dc2d3547cc 100644 --- a/builds/posix/make.shared.variables +++ b/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_gstat:= -SECURITY_ServerFiles_common:= +SECURITY_ServerFiles:= ifeq ($(ArchType),super) - SECURITY_ServerFiles_gsec:= $(SECURITY_ServerFiles_gsec) gsec.cpp - SECURITY_ServerFiles_gstat:= $(SECURITY_ServerFiles_gstat) dba.epp ppg.cpp - SECURITY_ServerFiles_common:= $(SECURITY_ServerFiles_common) cmd_util.cpp + SECURITY_ServerFiles:= $(SECURITY_ServerFiles) gsec.cpp dba.epp ppg.cpp cmd_util.cpp endif -SECURITY_Files_gsec = $(SECURITY_ClientFiles_gsec) $(SECURITY_ServerFiles_gsec) -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_Files = $(SECURITY_ClientFiles) $(SECURITY_ServerFiles) -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)))) diff --git a/builds/posix/prefix.darwin b/builds/posix/prefix.darwin index d3f97aefac..91f10aeec0 100644 --- a/builds/posix/prefix.darwin +++ b/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 diff --git a/builds/posix/prefix.example b/builds/posix/prefix.example index 48f08ef257..99e13b85d3 100644 --- a/builds/posix/prefix.example +++ b/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 \ No newline at end of file +Physical_IO_Module=unix.cpp diff --git a/builds/posix/prefix.freebsd b/builds/posix/prefix.freebsd index 99b211508b..83b239b575 100644 --- a/builds/posix/prefix.freebsd +++ b/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 \ No newline at end of file +Physical_IO_Module=unix.cpp diff --git a/builds/posix/prefix.linux b/builds/posix/prefix.linux index 0230145431..1d5b5460f9 100644 --- a/builds/posix/prefix.linux +++ b/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 \ No newline at end of file +Physical_IO_Module=unix.cpp diff --git a/builds/posix/prefix.mingw b/builds/posix/prefix.mingw index a5f979eab0..caa9e01cba 100644 --- a/builds/posix/prefix.mingw +++ b/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) \ diff --git a/builds/posix/prefix.sinixz b/builds/posix/prefix.sinixz index c204b17739..2106b4ca85 100644 --- a/builds/posix/prefix.sinixz +++ b/builds/posix/prefix.sinixz @@ -17,7 +17,7 @@ # # Erik Kunze, Philosys GmbH, # -# $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 diff --git a/builds/posix/prefix.solaris b/builds/posix/prefix.solaris index 691642c328..6b4b44d1b0 100644 --- a/builds/posix/prefix.solaris +++ b/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 diff --git a/builds/posix/prefix.solx86 b/builds/posix/prefix.solx86 index e277259732..a684adc9cd 100644 --- a/builds/posix/prefix.solx86 +++ b/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 diff --git a/builds/posix/prefix.solx86gcc b/builds/posix/prefix.solx86gcc index 8d567a55d4..65630386d2 100644 --- a/builds/posix/prefix.solx86gcc +++ b/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 diff --git a/builds/win32/blrtable.bat b/builds/win32/blrtable.bat index 8b1fe5b531..6d645ae1f6 100644 --- a/builds/win32/blrtable.bat +++ b/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 diff --git a/builds/win32/clean_all.bat b/builds/win32/clean_all.bat index ae7a078d93..b9231b53fa 100644 --- a/builds/win32/clean_all.bat +++ b/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 \ No newline at end of file + +@Echo Cleaning install files +@del %ROOT_PATH%\src\install\arch-specific\win32\*.dll 2>nul +@rmdir /s /q %ROOT_PATH%\builds\win32\install_image \ No newline at end of file diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat index 1e9baf8995..368ea3178e 100644 --- a/builds/win32/make_all.bat +++ b/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 -:: build headers -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 %ROOT_PATH%\src\jrd\ibase.h %ROOT_PATH%\output\include >nul +@copy %ROOT_PATH%\src\include\gen\iberror.h %ROOT_PATH%\output\include >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 diff --git a/builds/win32/make_boot.bat b/builds/win32/make_boot.bat index 6001b43e84..91161c741c 100644 --- a/builds/win32/make_boot.bat +++ b/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 -@mkdir %ROOT_PATH%\gen\utilities\gstat 2>nul -@rmdir /s /q %ROOT_PATH%\gen\utilities\gsec 2>nul -@mkdir %ROOT_PATH%\gen\utilities\gsec 2>nul +@rmdir /s /q %ROOT_PATH%\gen\v5_examples 2>nul +@mkdir %ROOT_PATH%\gen\v5_examples 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\relations %ROOT_PATH%\src\include\gen +@%ROOT_PATH%\gen\codes %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 ::============== diff --git a/builds/win32/make_examples.bat b/builds/win32/make_examples.bat new file mode 100644 index 0000000000..edef08758f --- /dev/null +++ b/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 \ No newline at end of file diff --git a/builds/win32/msvc6/Firebird2.dsw b/builds/win32/msvc6/Firebird2.dsw index ed1694b1d5..79ff154ca4 100644 --- a/builds/win32/msvc6/Firebird2.dsw +++ b/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> diff --git a/builds/win32/msvc6/Firebird2Boot.dsw b/builds/win32/msvc6/Firebird2Boot.dsw index 008f1a02a8..76328913fb 100644 --- a/builds/win32/msvc6/Firebird2Boot.dsw +++ b/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> diff --git a/builds/win32/msvc6/codes.dsp b/builds/win32/msvc6/codes.dsp index cb3e3a52c0..7051b2518b 100644 --- a/builds/win32/msvc6/codes.dsp +++ b/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 diff --git a/builds/win32/msvc6/engine.dsp b/builds/win32/msvc6/engine.dsp index 4e3530d112..9f09f17520 100644 --- a/builds/win32/msvc6/engine.dsp +++ b/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 diff --git a/builds/win32/msvc6/engine_classic.dsp b/builds/win32/msvc6/engine_classic.dsp index ced32673bc..e6e257ebb6 100644 --- a/builds/win32/msvc6/engine_classic.dsp +++ b/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 diff --git a/builds/win32/msvc6/engine_embed.dsp b/builds/win32/msvc6/engine_embed.dsp index a5ddb44ab8..d8b807ad76 100644 --- a/builds/win32/msvc6/engine_embed.dsp +++ b/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 diff --git a/builds/win32/msvc6/fb_inet_server.dsp b/builds/win32/msvc6/fb_inet_server.dsp index 29aadae3f9..7f18c098e3 100644 --- a/builds/win32/msvc6/fb_inet_server.dsp +++ b/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 diff --git a/builds/win32/msvc6/fbclient.dsp b/builds/win32/msvc6/fbclient.dsp index f5100a0028..beaf57934a 100644 --- a/builds/win32/msvc6/fbclient.dsp +++ b/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" diff --git a/builds/win32/msvc6/fbclient_static.dsp b/builds/win32/msvc6/fbclient_static.dsp index d20a54b177..a8220a6ff7 100644 --- a/builds/win32/msvc6/fbclient_static.dsp +++ b/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 diff --git a/builds/win32/msvc6/fbembed.dsp b/builds/win32/msvc6/fbembed.dsp index f3c2f14a9f..152ba9fb6d 100644 --- a/builds/win32/msvc6/fbembed.dsp +++ b/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" diff --git a/builds/win32/msvc6/fbguard.dsp b/builds/win32/msvc6/fbguard.dsp index 9c5a775b43..b90efb34b4 100644 --- a/builds/win32/msvc6/fbguard.dsp +++ b/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" diff --git a/builds/win32/msvc6/fbserver.dsp b/builds/win32/msvc6/fbserver.dsp index 8098be6e59..da3d6bfa41 100644 --- a/builds/win32/msvc6/fbserver.dsp +++ b/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 diff --git a/builds/win32/msvc6/gds32.dsp b/builds/win32/msvc6/gds32.dsp index 831aa8c642..b7f90adc08 100644 --- a/builds/win32/msvc6/gds32.dsp +++ b/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" diff --git a/builds/win32/msvc6/gsec.dsp b/builds/win32/msvc6/gsec.dsp index 3ad94ba509..7b57b22da5 100644 --- a/builds/win32/msvc6/gsec.dsp +++ b/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" diff --git a/builds/win32/msvc6/gstat.dsp b/builds/win32/msvc6/gstat.dsp index abfd501ac9..663dc31cdb 100644 --- a/builds/win32/msvc6/gstat.dsp +++ b/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" diff --git a/builds/win32/msvc6/instreg.dsp b/builds/win32/msvc6/instreg.dsp index 7425d62416..a51414305d 100644 --- a/builds/win32/msvc6/instreg.dsp +++ b/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" diff --git a/builds/win32/msvc6/instsvc.dsp b/builds/win32/msvc6/instsvc.dsp index a81965f5eb..61722c6c80 100644 --- a/builds/win32/msvc6/instsvc.dsp +++ b/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" diff --git a/builds/win32/msvc6/relations.dsp b/builds/win32/msvc6/relations.dsp deleted file mode 100644 index 1a40f67980..0000000000 --- a/builds/win32/msvc6/relations.dsp +++ /dev/null @@ -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 diff --git a/builds/win32/msvc6/remote.dsp b/builds/win32/msvc6/remote.dsp index 89eb852bbb..9101c53001 100644 --- a/builds/win32/msvc6/remote.dsp +++ b/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 diff --git a/builds/win32/msvc6/remote_classic.dsp b/builds/win32/msvc6/remote_classic.dsp index 1e18582b55..ca75f84d32 100644 --- a/builds/win32/msvc6/remote_classic.dsp +++ b/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 diff --git a/builds/win32/msvc6/utilities.dsp b/builds/win32/msvc6/utilities.dsp index e409fe15d3..a556434c3a 100644 --- a/builds/win32/msvc6/utilities.dsp +++ b/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 diff --git a/builds/win32/msvc6/utilities_classic.dsp b/builds/win32/msvc6/utilities_classic.dsp index 28aadc5fef..7d4061b288 100644 --- a/builds/win32/msvc6/utilities_classic.dsp +++ b/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 diff --git a/builds/win32/msvc6/v5_examples.dsp b/builds/win32/msvc6/v5_examples.dsp new file mode 100644 index 0000000000..8320b54b1c --- /dev/null +++ b/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 diff --git a/builds/win32/msvc7/engine.vcproj b/builds/win32/msvc7/engine.vcproj index b8bba56acb..f6487a3e07 100644 --- a/builds/win32/msvc7/engine.vcproj +++ b/builds/win32/msvc7/engine.vcproj @@ -407,7 +407,7 @@ RelativePath="..\..\..\src\jrd\why.cpp"> + RelativePath="..\..\..\src\jrd\winnt.cpp"> + RelativePath="..\..\..\src\jrd\pio.h"> + RelativePath="..\..\..\src\jrd\pio_proto.h"> diff --git a/builds/win32/msvc7/engine_classic.vcproj b/builds/win32/msvc7/engine_classic.vcproj index 19c7fc0860..df1a9faea4 100644 --- a/builds/win32/msvc7/engine_classic.vcproj +++ b/builds/win32/msvc7/engine_classic.vcproj @@ -404,7 +404,7 @@ RelativePath="..\..\..\src\jrd\why.cpp"> + RelativePath="..\..\..\src\jrd\winnt.cpp"> + RelativePath="..\..\..\src\jrd\pio.h"> + RelativePath="..\..\..\src\jrd\pio_proto.h"> diff --git a/builds/win32/msvc7/engine_embed.vcproj b/builds/win32/msvc7/engine_embed.vcproj index 81b889b670..5d1a527d5f 100644 --- a/builds/win32/msvc7/engine_embed.vcproj +++ b/builds/win32/msvc7/engine_embed.vcproj @@ -404,7 +404,7 @@ RelativePath="..\..\..\src\jrd\why.cpp"> + RelativePath="..\..\..\src\jrd\winnt.cpp"> + RelativePath="..\..\..\src\jrd\pio.h"> + RelativePath="..\..\..\src\jrd\pio_proto.h"> diff --git a/builds/win32/msvc7/fb_inet_server.vcproj b/builds/win32/msvc7/fb_inet_server.vcproj index 416ed8040d..1652770529 100644 --- a/builds/win32/msvc7/fb_inet_server.vcproj +++ b/builds/win32/msvc7/fb_inet_server.vcproj @@ -138,23 +138,23 @@ Name="UTILITIES files" Filter=""> + RelativePath="..\..\..\gen\utilities\dba.cpp"> + RelativePath="..\..\..\src\utilities\ppg.cpp"> + RelativePath="..\..\..\src\remote\caution.ico"> + RelativePath="..\..\..\src\remote\server.ico"> + RelativePath="..\..\..\src\remote\window.rc"> + RelativePath="..\..\..\src\jrd\ibinitdll.cpp"> @@ -262,7 +262,7 @@ RelativePath="..\..\..\src\remote\remote.cpp"> + RelativePath="..\..\..\src\remote\wnet.cpp"> diff --git a/builds/win32/msvc7/fbclient_static.vcproj b/builds/win32/msvc7/fbclient_static.vcproj index 1e5e937aed..7c4602af94 100644 --- a/builds/win32/msvc7/fbclient_static.vcproj +++ b/builds/win32/msvc7/fbclient_static.vcproj @@ -210,7 +210,7 @@ RelativePath="..\..\..\src\remote\remote.cpp"> + RelativePath="..\..\..\src\remote\wnet.cpp"> @@ -276,7 +276,7 @@ RelativePath="..\..\..\src\jrd\gds.cpp"> + RelativePath="..\..\..\src\jrd\ibinitdll.cpp"> diff --git a/builds/win32/msvc7/fbembed.vcproj b/builds/win32/msvc7/fbembed.vcproj index 73460c29c9..3bc544be1b 100644 --- a/builds/win32/msvc7/fbembed.vcproj +++ b/builds/win32/msvc7/fbembed.vcproj @@ -147,7 +147,7 @@ Name="JRD files" Filter=""> + RelativePath="..\..\..\src\jrd\ibinitdll.cpp"> @@ -262,7 +262,7 @@ + RelativePath="..\..\..\src\remote\wnet.cpp"> + RelativePath="..\..\..\gen\utilities\dba.cpp"> + RelativePath="..\..\..\src\utilities\ppg.cpp"> + RelativePath="..\..\..\gen\utilities\dba.cpp"> + RelativePath="..\..\..\src\utilities\ppg.cpp"> + RelativePath="..\..\..\src\remote\caution.ico"> + RelativePath="..\..\..\src\remote\server.ico"> + RelativePath="..\..\..\src\remote\window.rc"> + RelativePath="..\..\..\src\jrd\ibinitdll.cpp"> + RelativePath="..\..\..\gen\utilities\dba.cpp"> @@ -135,7 +135,7 @@ RelativePath="..\..\..\src\common\fb_exception.cpp"> + RelativePath="..\..\..\src\utilities\ppg.cpp"> + RelativePath="..\..\..\src\remote\chop.cpp"> + RelativePath="..\..\..\src\remote\cntl.cpp"> + RelativePath="..\..\..\src\remote\ibconfig.cpp"> @@ -133,7 +133,7 @@ RelativePath="..\..\..\src\remote\parser.cpp"> + RelativePath="..\..\..\src\remote\property.cpp"> @@ -145,13 +145,13 @@ RelativePath="..\..\..\src\remote\server.cpp"> + RelativePath="..\..\..\src\remote\srvr_w32.cpp"> + RelativePath="..\..\..\src\remote\window.cpp"> + RelativePath="..\..\..\src\remote\wnet.cpp"> @@ -188,7 +188,7 @@ RelativePath="..\..\..\src\remote\spxnet32_proto.h"> + RelativePath="..\..\..\src\remote\wnet_proto.h"> diff --git a/builds/win32/msvc7/remote_classic.vcproj b/builds/win32/msvc7/remote_classic.vcproj index 4ee5a1a911..0b8a78e3e0 100644 --- a/builds/win32/msvc7/remote_classic.vcproj +++ b/builds/win32/msvc7/remote_classic.vcproj @@ -112,13 +112,13 @@ RelativePath="..\..\..\src\remote\allr.cpp"> + RelativePath="..\..\..\src\remote\chop.cpp"> + RelativePath="..\..\..\src\remote\cntl.cpp"> + RelativePath="..\..\..\src\remote\ibconfig.cpp"> @@ -133,7 +133,7 @@ RelativePath="..\..\..\src\remote\parser.cpp"> + RelativePath="..\..\..\src\remote\property.cpp"> @@ -145,13 +145,13 @@ RelativePath="..\..\..\src\remote\server.cpp"> + RelativePath="..\..\..\src\remote\srvr_w32.cpp"> + RelativePath="..\..\..\src\remote\window.cpp"> + RelativePath="..\..\..\src\remote\wnet.cpp"> @@ -185,7 +185,7 @@ RelativePath="..\..\..\src\remote\spxnet32_proto.h"> + RelativePath="..\..\..\src\remote\wnet_proto.h"> diff --git a/builds/win32/msvc7/utilities.vcproj b/builds/win32/msvc7/utilities.vcproj index 8b98e22e41..7a1d93288c 100644 --- a/builds/win32/msvc7/utilities.vcproj +++ b/builds/win32/msvc7/utilities.vcproj @@ -118,7 +118,7 @@ Name="epp files" Filter="epp"> + RelativePath="..\..\..\src\utilities\dba.epp"> diff --git a/builds/win32/msvc7/utilities_classic.vcproj b/builds/win32/msvc7/utilities_classic.vcproj index 21fb4cba81..e71b2f3f0c 100644 --- a/builds/win32/msvc7/utilities_classic.vcproj +++ b/builds/win32/msvc7/utilities_classic.vcproj @@ -118,7 +118,7 @@ Name="epp files" Filter="epp"> + RelativePath="..\..\..\src\utilities\dba.epp"> diff --git a/builds/win32/prepare.bat b/builds/win32/prepare.bat index 0064e29a04..67ce95ebeb 100644 --- a/builds/win32/prepare.bat +++ b/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%\builds\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%\builds\misc\help.gbak localhost:%DB_PATH%\gen\dbs\help.fdb -@copy %ROOT_PATH%\gen\dbs\metadata.fdb %ROOT_PATH%\gen\dbs\yachts.lnk > nul +@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\src\misc\metadata.gbak localhost:%DB_PATH%\gen\dbs\metadata.fdb +@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\src\misc\security.gbak localhost:%DB_PATH%\gen\dbs\security.fdb +@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\src\msgs\msg.gbak localhost:%DB_PATH%\gen\dbs\msg.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 @echo. @echo Completed Preparations for build diff --git a/builds/win32/preprocess.bat b/builds/win32/preprocess.bat index 23992a1cdb..30e4ed1e3e 100644 --- a/builds/win32/preprocess.bat +++ b/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 (codes, relations, envelope) do @call :PREPROCESS misc %%i +@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) 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 (security) do @call :PREPROCESS utilities/gsec %%i +@for %%i in (dba, security) do @call :PREPROCESS utilities %%i @goto :EOF diff --git a/clean.sh b/clean.sh index 92ee325154..96d0074f3b 100644 --- a/clean.sh +++ b/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 diff --git a/configure.in b/configure.in index e6b7ae6e12..1b6d65b657 100644 --- a/configure.in +++ b/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/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/examples/v5 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/os/win32 +mkdir -p temp/libfbserver/remote 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/os/win32 +mkdir -p temp/libfbstatic/remote 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/os/win32 +mkdir -p temp/libfbembed/remote 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/bin/changeDBAPassword.sh:builds/install/arch-specific/linux/misc/changeDBAPassword.sh.in + gen/firebird/misc/firebird.xinetd:src/install/arch-specific/linux/misc/firebird.xinetd.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 - gen/install/prototype:builds/install/arch-specific/sinixz/prototype.in - gen/install/preinstall:builds/install/arch-specific/sinixz/preinstall.in - gen/install/postinstall:builds/install/arch-specific/sinixz/postinstall.in - gen/install/postremove:builds/install/arch-specific/sinixz/postremove.in + AC_CONFIG_FILES([gen/install/pkginfo:src/install/arch-specific/sinixz/pkginfo.in + gen/install/prototype:src/install/arch-specific/sinixz/prototype.in + gen/install/preinstall:src/install/arch-specific/sinixz/preinstall.in + gen/install/postinstall:src/install/arch-specific/sinixz/postinstall.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 ) diff --git a/doc/README.build.mingw.html b/doc/README.build.mingw.html index c61a51cad6..d5d6b9c0c7 100644 --- a/doc/README.build.mingw.html +++ b/doc/README.build.mingw.html @@ -59,7 +59,7 @@ Author: Blas Rodriguez Somoza blas@puertareal.com

3.- PATCHES TO BUILD FILES