Menu
▾
▴
[Firebird-checkins] CVS: firebird2/builds/posix Makefile.in.client.gbak,1.8,1.8.2.1 Makefile.in.client.gdef,1.9,1.9.2.1 Makefile.in.client.gfix,1.10,1.10.2.1 Makefile.in.client.gpre,1.14.2.2,1.14.2.3 Makefile.in.client.isql,1.8,1.8.2.1 Makefile.in.client.qli,1.4,1.4.2.1 Makefile.in.client.util,1.20.2.1,1.20.2.2 Makefile.in.firebird,1.57.2.1,1.57.2.2 Makefile.in.refDatabases,1.23.2.1,1.23.2.2 make.defaults,1.36.2.1,1.36.2.2 make.shared.targets,1.17,1.17.2.1 make.shared.variables,1.39.2.5,1.39.2.6
|
From: Adriano d. S. F. <asf...@us...> - 2005-02-27 03:58:08
|
Build Version : T2.0.0.10433 Firebird 2.0 Alpha 1 (writeBuildNum.sh,v 1.10440 2005/02/27 03:54:19 asfernandes ) Update of /cvsroot/firebird/firebird2/builds/posix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11182/builds/posix Modified Files: Tag: B2_0_intl Makefile.in.client.gbak Makefile.in.client.gdef Makefile.in.client.gfix Makefile.in.client.gpre Makefile.in.client.isql Makefile.in.client.qli Makefile.in.client.util Makefile.in.firebird Makefile.in.refDatabases make.defaults make.shared.targets make.shared.variables Log Message: Merge HEAD changes from 2005-02-02 to 2005-02-27 into B2_0_intl branch Index: Makefile.in.client.gbak =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.gbak,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -b -U3 -r1.8 -r1.8.2.1 --- Makefile.in.client.gbak 30 Apr 2004 23:02:07 -0000 1.8 +++ Makefile.in.client.gbak 27 Feb 2005 03:54:46 -0000 1.8.2.1 @@ -41,7 +41,8 @@ @SET_MAKE@ -GBAK_Other_Sources = remote/xdr.cpp jrd/sdl.cpp +GBAK_Other_Sources = remote/xdr.cpp jrd/sdl.cpp\ +common/classes/fb_string.cpp common/classes/alloc.cpp common/fb_exception.cpp GBAK_Files = backup.epp restore.epp \ burp.cpp canonical.cpp misc.cpp mvol.cpp GBAK_Sources = $(addprefix burp/, $(GBAK_Files)) $(GBAK_Other_Sources) @@ -52,7 +53,7 @@ GSPLIT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSPLIT_Sources)))) -AllObjects = $(GBAK_Objects) $(GSPLIT_Objects) +AllObjects = $(GBAK_Objects) $(GSPLIT_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -62,11 +63,11 @@ gbak : $(LIBFBCLIENT_SO) $(GBAK) -$(GBAK): $(GBAK_Objects) +$(GBAK): $(GBAK_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) -gsplit : $(LIBFBCLIENT_SO) $(GSPLIT) +gsplit : $(LIBFBCLIENT_SO) $(GSPLIT) $(CLUMPLETS_Objects) $(GSPLIT): $(GSPLIT_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) Index: Makefile.in.client.gdef =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.gdef,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -b -U3 -r1.9 -r1.9.2.1 --- Makefile.in.client.gdef 30 Apr 2004 23:02:07 -0000 1.9 +++ Makefile.in.client.gdef 27 Feb 2005 03:54:46 -0000 1.9.2.1 @@ -52,9 +52,9 @@ hsh.cpp lex.cpp parse.cpp trn.cpp GDEF_Sources = $(addprefix dudley/, $(GDEF_Files)) $(GDEF_Other_Sources) -GDEF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GDEF_Sources)))) +GDEF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GDEF_Sources)))) $(CLUMPLETS_Objects) -AllObjects = $(GDEF_Objects) +AllObjects = $(GDEF_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) Index: Makefile.in.client.gfix =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.gfix,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -b -U3 -r1.10 -r1.10.2.1 --- Makefile.in.client.gfix 16 Aug 2004 12:56:20 -0000 1.10 +++ Makefile.in.client.gfix 27 Feb 2005 03:54:46 -0000 1.10.2.1 @@ -47,7 +47,7 @@ GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources) GFIX_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GFIX_Sources)))) -AllObjects = $(GFIX_Objects) +AllObjects = $(GFIX_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -57,7 +57,7 @@ gfix : $(LIBFBCLIENT_SO) $(GFIX) -$(GFIX): $(GFIX_Objects) +$(GFIX): $(GFIX_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) Index: Makefile.in.client.gpre =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.gpre,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -b -U3 -r1.14.2.2 -r1.14.2.3 --- Makefile.in.client.gpre 10 Oct 2004 19:55:06 -0000 1.14.2.2 +++ Makefile.in.client.gpre 27 Feb 2005 03:54:46 -0000 1.14.2.3 @@ -40,7 +40,7 @@ @SET_MAKE@ GPRE_Other_Sources = jrd/dsc.cpp jrd/isc.cpp common/utils.cpp \ -common/fb_exception.cpp common/classes/alloc.cpp +common/classes/fb_string.cpp common/fb_exception.cpp common/classes/alloc.cpp GPRE_Files = gpre_meta.epp \ cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp gpre.cpp \ hsh.cpp int_cxx.cpp jrdmet.cpp movg.cpp msc.cpp par.cpp \ @@ -50,7 +50,7 @@ GPRE_Sources = $(addprefix gpre/, $(GPRE_Files)) $(GPRE_Other_Sources) GPRE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GPRE_Sources)))) -AllObjects = $(GPRE_Objects) +AllObjects = $(GPRE_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -60,7 +60,7 @@ gpre : $(LIBFBCLIENT_SO) $(GPRE) -$(GPRE): $(GPRE_Objects) +$(GPRE): $(GPRE_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) Index: Makefile.in.client.isql =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.isql,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -b -U3 -r1.8 -r1.8.2.1 --- Makefile.in.client.isql 30 Apr 2004 23:02:07 -0000 1.8 +++ Makefile.in.client.isql 27 Feb 2005 03:54:46 -0000 1.8.2.1 @@ -42,12 +42,13 @@ unexport ISC_USER unexport ISC_PASSWORD -ISQL_Other_Sources = common/utils.cpp +ISQL_Other_Sources = common/utils.cpp\ +common/classes/fb_string.cpp common/classes/alloc.cpp common/fb_exception.cpp ISQL_Files = extract.epp isql.epp show.epp ISQL_Sources = $(addprefix isql/, $(ISQL_Files)) $(ISQL_Other_Sources) ISQL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(ISQL_Sources)))) -AllObjects = $(ISQL_Objects) +AllObjects = $(ISQL_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -58,7 +59,7 @@ isql : $(LIBFBCLIENT_SO) $(ISQL) -$(ISQL): $(ISQL_Objects) +$(ISQL): $(ISQL_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) Index: Makefile.in.client.qli =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.qli,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -b -U3 -r1.4 -r1.4.2.1 --- Makefile.in.client.qli 30 Apr 2004 23:02:07 -0000 1.4 +++ Makefile.in.client.qli 27 Feb 2005 03:54:46 -0000 1.4.2.1 @@ -49,9 +49,9 @@ hsh.cpp lex.cpp meta.cpp mov.cpp parse.cpp picstr.cpp proc.cpp \ report.cpp show.cpp QLI_Sources = $(addprefix qli/, $(QLI_Files)) $(QLI_Other_Sources) -QLI_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(QLI_Sources)))) +QLI_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(QLI_Sources)))) $(CLUMPLETS_Objects) -AllObjects = $(QLI_Objects) +AllObjects = $(QLI_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) Index: Makefile.in.client.util =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.util,v retrieving revision 1.20.2.1 retrieving revision 1.20.2.2 diff -b -U3 -r1.20.2.1 -r1.20.2.2 --- Makefile.in.client.util 8 Nov 2004 18:24:47 -0000 1.20.2.1 +++ Makefile.in.client.util 27 Feb 2005 03:54:46 -0000 1.20.2.2 @@ -51,7 +51,7 @@ common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources) NBACKUP_Files= nbackup.cpp NBACKUP_Sources = $(addprefix utilities/, $(NBACKUP_Files)) $(NBACKUP_Other_Sources) -NBACKUP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(NBACKUP_Sources)))) +NBACKUP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(NBACKUP_Sources)))) $(CLUMPLETS_Objects) CREATEDB_Files= create_db.cpp CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files)) @@ -72,7 +72,7 @@ GSTAT_Files = dba.epp ppg.cpp GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files)) $(GSTAT_Other_Sources) -GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources)))) +GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources)))) $(CLUMPLETS_Objects) FBGUARD_Other_Sources = jrd/isc.cpp FBGUARD_Files = guard.cpp util.cpp @@ -127,7 +127,7 @@ nbackup: $(LIBFBCLIENT_SO) $(NBACKUP) -$(NBACKUP): $(NBACKUP_Objects) +$(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $(NBACKUP_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) fb_lock_print: $(LIBFBCLIENT_SO) $(LOCKPRINT) @@ -138,8 +138,8 @@ gstat : $(LIBFBCLIENT_SO) $(GSTAT) -$(GSTAT): $(GSTAT_Objects) - $(LD) $(LINK_OPTS) $(GSTAT_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) +$(GSTAT): $(GSTAT_Objects) $(CLUMPLETS_Objects) + $(LD) $(LINK_OPTS) $(GSTAT_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS ) Index: Makefile.in.firebird =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.firebird,v retrieving revision 1.57.2.1 retrieving revision 1.57.2.2 diff -b -U3 -r1.57.2.1 -r1.57.2.2 --- Makefile.in.firebird 8 Nov 2004 18:24:47 -0000 1.57.2.1 +++ Makefile.in.firebird 27 Feb 2005 03:54:46 -0000 1.57.2.2 @@ -279,7 +279,7 @@ $(MAKE) -f $(GEN_ROOT)/Makefile.refDatabases $@ -security.fdb: gdef isql # build the security database +security2.fdb: gdef isql # build the security database $(MAKE) -C utilities $@ Index: Makefile.in.refDatabases =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.refDatabases,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -b -U3 -r1.23.2.1 -r1.23.2.2 --- Makefile.in.refDatabases 8 Nov 2004 18:24:47 -0000 1.23.2.1 +++ Makefile.in.refDatabases 27 Feb 2005 03:54:46 -0000 1.23.2.2 @@ -87,7 +87,7 @@ # Use msg.timestamp as a target to help dependency tracking work. -ref_databases : msg.timestamp help.fdb metadata.fdb $(FIREBIRD)/security.fdb +ref_databases : msg.timestamp help.fdb metadata.fdb $(FIREBIRD)/security2.fdb msg.timestamp: $(MSG_FILES) $(RM) -f msg.fdb @@ -105,11 +105,11 @@ $(TOUCH) $@ $(CHMOD) 444 $@ -$(FIREBIRD)/security.fdb: security.fdb +$(FIREBIRD)/security2.fdb: security2.fdb $(RM) -f $@ $(CP) -f $^ $@ -security.fdb: $(SRC_ROOT)/dbs/security.sql +security2.fdb: $(SRC_ROOT)/dbs/security.sql $(RM) -f $@ echo create database \'$@\'\; | $(ISQL_STATIC) $(ISQL_STATIC) -i $^ $@ Index: make.defaults =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/make.defaults,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -b -U3 -r1.36.2.1 -r1.36.2.2 --- make.defaults 24 Oct 2004 20:27:40 -0000 1.36.2.1 +++ make.defaults 27 Feb 2005 03:54:46 -0000 1.36.2.2 @@ -211,7 +211,7 @@ FBMGR_BIN = $(BIN)/fbmgr.bin$(EXEC_EXT) INSTREG = $(BIN)/instreg$(EXEC_EXT) INSTSVC = $(BIN)/instsvc$(EXEC_EXT) -ISC_GDB = $(FIREBIRD)/security.fdb +ISC_GDB = $(FIREBIRD)/security2.fdb ISC_GBAK = $(BIN)/security.gbak # From qli Index: make.shared.targets =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/make.shared.targets,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -b -U3 -r1.17 -r1.17.2.1 --- make.shared.targets 8 Nov 2003 07:39:06 -0000 1.17 +++ make.shared.targets 27 Feb 2005 03:54:46 -0000 1.17.2.1 @@ -61,9 +61,9 @@ $(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@ -buildb: security.fdb yachts.lnk help.fdb +buildb: security2.fdb yachts.lnk help.fdb -security.fdb : $(ISC_GDB) +security2.fdb : $(ISC_GDB) -$(LN) -f $(ISC_GDB) $@ yachts.lnk: Index: make.shared.variables =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/make.shared.variables,v retrieving revision 1.39.2.5 retrieving revision 1.39.2.6 diff -b -U3 -r1.39.2.5 -r1.39.2.6 --- make.shared.variables 5 Jan 2005 17:20:18 -0000 1.39.2.5 +++ make.shared.variables 27 Feb 2005 03:54:46 -0000 1.39.2.6 @@ -37,7 +37,7 @@ execute_statement.cpp filters.cpp flu.cpp functions.cpp \ idx.cpp inf.cpp intl.cpp intl_builtin.cpp inuse.cpp \ jrd.cpp lck.cpp log.cpp \ - mov.cpp nav.cpp opt.cpp pag.cpp par.cpp \ + mov.cpp nav.cpp opt.cpp Optimizer.cpp pag.cpp par.cpp \ plugin_manager.cpp pwd.cpp rlck.cpp \ rng.cpp rpb_chain.cpp rse.cpp \ sdw.cpp shut.cpp sort.cpp sort_mem.cpp sqz.cpp \ |