From: Alexander P. <ale...@us...> - 2010-02-28 18:01:19
|
Build Version : T3.0.0.27784 Firebird 3.0 Unstable (writeBuildNum.sh,v 1.27959 2010/02/28 18:00:40 alexpeshkof ) Update of /cvsroot/firebird/firebird2/builds/posix In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14999/builds/posix Modified Files: Makefile.in.client.util Makefile.in.embed.util make.rules make.shared.targets make.shared.variables prefix.aix_powerpc_xlc Log Message: Extend format of firebird configuration file with a set of additional parameters for any parameter. Use traditional firebird configuration files format in all places (intl, trace, etc.). Add per-database configuration facility to aliases.conf (currently 15 parameters from firebird.conf). Index: Makefile.in.client.util =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.util,v retrieving revision 1.69 retrieving revision 1.70 diff -b -U3 -r1.69 -r1.70 --- Makefile.in.client.util 14 Dec 2009 12:09:49 -0000 1.69 +++ Makefile.in.client.util 28 Feb 2010 18:00:37 -0000 1.70 @@ -40,7 +40,8 @@ LOCKPRINT_Other_Sources = jrd/isc_sync.cpp jrd/isc.cpp jrd/db_alias.cpp \ -common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources) +common/config/config.cpp common/config/config_file.cpp common/config/ConfigCache.cpp \ +$(OS_SPECIFIC_Sources) LOCKPRINT_Files= print.cpp LOCKPRINT_Sources = $(addprefix lock/, $(LOCKPRINT_Files)) $(LOCKPRINT_Other_Sources) LOCKPRINT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(LOCKPRINT_Sources)))) \ @@ -59,7 +60,8 @@ DROP_Other_Sources = common/utils.cpp lock/lock.cpp jrd/isc_sync.cpp jrd/isc.cpp \ -common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources) +common/config/config.cpp common/config/config_file.cpp common/config/ConfigCache.cpp \ +$(OS_SPECIFIC_Sources) DROP_Files= drop.cpp DROP_Sources = $(addprefix utilities/, $(DROP_Files)) $(DROP_Other_Sources) Index: Makefile.in.embed.util =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.embed.util,v retrieving revision 1.59 retrieving revision 1.60 diff -b -U3 -r1.59 -r1.60 --- Makefile.in.embed.util 16 Dec 2009 12:34:11 -0000 1.59 +++ Makefile.in.embed.util 28 Feb 2010 18:00:37 -0000 1.60 @@ -62,7 +62,8 @@ DROP_Other_Sources += common/utils.cpp jrd/isc_sync.cpp jrd/isc.cpp \ -common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources) +common/config/config.cpp common/config/config_file.cpp common/config/ConfigCache.cpp \ +$(OS_SPECIFIC_Sources) DROP_Files= drop.cpp DROP_Sources = $(addprefix utilities/, $(DROP_Files)) $(DROP_Other_Sources) @@ -71,9 +72,8 @@ GSEC_Other_Sources = jrd/enc.cpp jrd/sha.cpp jrd/guid.cpp \ jrd/isc_file.cpp common/config/config.cpp common/config/config_file.cpp \ -common/config/dir_list.cpp \ -jrd/ThreadData.cpp \ -$(OS_SPECIFIC_Sources) +common/config/ConfigCache.cpp common/config/dir_list.cpp \ +jrd/ThreadData.cpp $(OS_SPECIFIC_Sources) GSEC_Files = gsec.cpp security.cpp call_service.cpp gsecMain.cpp GSEC_Sources = $(addprefix utilities/gsec/, $(GSEC_Files)) $(GSEC_Other_Sources) Index: make.rules =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/make.rules,v retrieving revision 1.47 retrieving revision 1.48 diff -b -U3 -r1.47 -r1.48 --- make.rules 1 Jan 2010 18:39:39 -0000 1.47 +++ make.rules 28 Feb 2010 18:00:37 -0000 1.48 @@ -32,8 +32,7 @@ # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002 -WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan \ - -DNAMESPACE=Vulcan +WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include ifeq ($(STD_ICU),false) WFLAGS:= $(WFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n Index: make.shared.targets =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/make.shared.targets,v retrieving revision 1.34 retrieving revision 1.35 diff -b -U3 -r1.34 -r1.35 --- make.shared.targets 5 Dec 2009 14:21:46 -0000 1.34 +++ make.shared.targets 28 Feb 2010 18:00:37 -0000 1.35 @@ -78,6 +78,7 @@ $(OBJ)/dsql/Parser.h: $(SRC_ROOT)/dsql/dsql.tab.h $(OBJ)/dsql/StmtNodes.o: $(SRC_ROOT)/include/gen/blrtable.h +$(OBJ)/dsql/AggNodes.o: $(SRC_ROOT)/include/gen/blrtable.h # Special cases for building cpp from epp $(OBJ)/dsql/metd.cpp: $(SRC_ROOT)/dsql/metd.epp Index: make.shared.variables =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/make.shared.variables,v retrieving revision 1.129 retrieving revision 1.130 diff -b -U3 -r1.129 -r1.130 --- make.shared.variables 14 Feb 2010 19:08:12 -0000 1.129 +++ make.shared.variables 28 Feb 2010 18:00:37 -0000 1.130 @@ -217,7 +217,7 @@ # # common/config -FBCONFIG_ClientFiles=config.cpp config_file.cpp dir_list.cpp +FBCONFIG_ClientFiles=config.cpp config_file.cpp dir_list.cpp ConfigCache.cpp FBCONFIG_ServerFiles= FBCONFIG_Files= $(FBCONFIG_ClientFiles) $(FBCONFIG_ServerFiles) @@ -229,10 +229,7 @@ # # config -CONFIG_ClientFiles=AdminException.cpp Args.cpp ArgsException.cpp \ - ConfObj.cpp ConfObject.cpp ConfigFile.cpp Configuration.cpp \ - Element.cpp FileName.cpp InputFile.cpp \ - InputStream.cpp Lex.cpp ScanDir.cpp Stream.cpp StreamSegment.cpp +CONFIG_ClientFiles=ScanDir.cpp CONFIG_ServerFiles= CONFIG_Files= $(CONFIG_ClientFiles) $(CONFIG_ServerFiles) @@ -244,7 +241,7 @@ # # vulcan -VULCAN_ClientFiles=PathName.cpp RefObject.cpp +VULCAN_ClientFiles= VULCAN_ServerFiles= VULCAN_Files= $(VULCAN_ClientFiles) $(VULCAN_ServerFiles) Index: prefix.aix_powerpc_xlc =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/prefix.aix_powerpc_xlc,v retrieving revision 1.11 retrieving revision 1.12 diff -b -U3 -r1.11 -r1.12 --- prefix.aix_powerpc_xlc 10 Nov 2009 15:36:34 -0000 1.11 +++ prefix.aix_powerpc_xlc 28 Feb 2010 18:00:37 -0000 1.12 @@ -114,7 +114,7 @@ OS_ServerFiles=inet_server.cpp INTL_Files2=common/utils.cpp \ - common/config/config.cpp common/config/config_file.cpp \ + common/config/config.cpp common/config/config_file.cpp common/config/ConfigCache.cpp \ common/classes/MsgPrint.cpp common/classes/SafeArg.cpp \ common/classes/BaseStream.cpp common/classes/fb_string.cpp \ common/classes/TempFile.cpp \ |