[Firebird-checkins] SF.net SVN: firebird:[52533] firebird/branches/B2_5_Release

[<ale...@us...>]

Revision: 52533
          http://firebird.svn.sourceforge.net/firebird/?rev=52533&view=rev
Author:   alexpeshkoff
Date:     2011-03-09 11:59:31 +0000 (Wed, 09 Mar 2011)

Log Message:
-----------
Fixed CORE-3377: During firebird build records about missing fbintl.conf are attempted to be placed in firebird.log in destination (not build) directory

Modified Paths:
--------------
    firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util
    firebird/branches/B2_5_Release/builds/posix/Makefile.in.codes
    firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util
    firebird/branches/B2_5_Release/builds/posix/Makefile.in.examples
    firebird/branches/B2_5_Release/builds/posix/Makefile.in.firebird
    firebird/branches/B2_5_Release/builds/posix/Makefile.in.msgs
    firebird/branches/B2_5_Release/builds/posix/Makefile.in.refDatabases
    firebird/branches/B2_5_Release/configure.in

Added Paths:
-----------
    firebird/branches/B2_5_Release/builds/posix/Makefile.in.static.createdb

Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util	2011-03-09 03:16:38 UTC (rev 52532)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util	2011-03-09 11:59:31 UTC (rev 52533)
@@ -53,11 +53,6 @@
 $(CLUMPLETS_Objects) $(FBCONFIG_Objects)
 
 
-CREATEDB_Files= create_db.cpp
-CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
-CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
-
-
 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)
 
@@ -133,7 +128,7 @@
 RELAY_Sources = $(addprefix utilities/, $(RELAY_Files))
 RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources))))
 
-AllObjects = $(CREATEDB_Object) $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \
+AllObjects = $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \
 			 $(FBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(FBSVCMGR_Objects) \
 			  $(FBTRACEMGR_Objects)
 
@@ -141,17 +136,11 @@
 Dependencies = $(AllObjects:.o=.d) 
 
 
-.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay create_db fb_lock_print \
+.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay fb_lock_print \
 	fbsvcmgr fbtracemgr
 
 all: $(CLIENT_UTIL_TARGETS)
 
-create_db: $(CREATE_DB)
-
-$(CREATE_DB):	$(CREATEDB_Objects) 
-	$(STATICEXE_LINK) $(LINK_OPTS) $(CREATEDB_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-
-
 nbackup: $(LIBFBCLIENT_SO) $(NBACKUP)
 
 $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)

Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.codes
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.codes	2011-03-09 03:16:38 UTC (rev 52532)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.codes	2011-03-09 11:59:31 UTC (rev 52533)
@@ -22,7 +22,8 @@
 # 
 #
 ROOT=..
-ObjModuleType=std
+ObjModuleType=boot
+CXXFLAGS+= -DBOOT_BUILD
 
 include     $(ROOT)/gen/make.defaults
 include     $(ROOT)/gen/make.platform

Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util	2011-03-09 03:16:38 UTC (rev 52532)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util	2011-03-09 11:59:31 UTC (rev 52533)
@@ -56,11 +56,6 @@
 $(FBCONFIG_Objects)
 
 
-CREATEDB_Files= create_db.cpp
-CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
-CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
-
-
 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)
 
@@ -128,30 +123,19 @@
 RELAY_Sources = $(addprefix utilities/, $(RELAY_Files))
 RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources))))
 
-AllObjects = $(CREATEDB_Object) $(DROP_Object) $(FBSVCMGR_Objects) \
+AllObjects = $(DROP_Object) $(FBSVCMGR_Objects) \
 			 $(GSEC_Objects) $(GSTAT_Object) $(FBGUARD_Objects) \
 			 $(IBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(CLUMPLETS_Objects)
 
 Dependencies = $(AllObjects:.o=.d) 
 
 
-.PHONY: create_db gstat gds_drop gds_relay gsec fbguard ibmgr_bin nbackup fb_lock_print \
+.PHONY: gstat gds_drop gds_relay gsec fbguard ibmgr_bin nbackup fb_lock_print \
 	fbsvcmgr fbtracemgr
 
 all: $(EMBED_UTIL_TARGETS)
 
 
-# it's important to note here that create_db is linked against the static
-# 'boot' libraries rather than the later embedded shared library.  The
-# other utilities are released but create_db is used in construction.
-# MOD 29-July-2002
-
-create_db: $(CREATE_DB)
-
-$(CREATE_DB):	$(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
-	$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
-
-
 nbackup: $(LIBFBEMBED_SO) $(NBACKUP)
 
 $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)

Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.examples
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.examples	2011-03-09 03:16:38 UTC (rev 52532)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.examples	2011-03-09 11:59:31 UTC (rev 52533)
@@ -29,7 +29,8 @@
 #
 #
 ROOT=../..
-ObjModuleType=std
+ObjModuleType=boot
+CXXFLAGS+= -DBOOT_BUILD
 
 # Add the install include directory to the search path since the
 # examples need to build using those headers values.

Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.firebird
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.firebird	2011-03-09 03:16:38 UTC (rev 52532)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.firebird	2011-03-09 11:59:31 UTC (rev 52533)
@@ -263,7 +263,7 @@
 $(ISC_GDB): create_db empty_db gbak_static isql_static ref_databases
 
 create_db:
-	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(CREATE_DB)
+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.createdb
 
 gbak_static:
 	$(MAKE) $(CPU_OPTION) -f $(GEN_ROOT)/Makefile.static.gbak
@@ -286,8 +286,7 @@
 
 #--------------------------------------------------------------------------
 #Phase3: Now we start building the tools we are actually going to use
-#  against the shared library.
-#  an empty database (lock manager and create_db).  Then we rebuild all the
+#  against the shared library. Then we rebuild all the
 #  items we have built in the static library into a dynamic library.
 #  (It's probably possible to directly build the dynamic library - but thats
 #  for another day). We still don't have the security database stuff.

Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.msgs
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.msgs	2011-03-09 03:16:38 UTC (rev 52532)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.msgs	2011-03-09 11:59:31 UTC (rev 52533)
@@ -28,7 +28,8 @@
 # 
 #
 ROOT=..
-ObjModuleType=std
+ObjModuleType=boot
+CXXFLAGS+= -DBOOT_BUILD
 
 include     $(ROOT)/gen/make.defaults
 include     $(ROOT)/gen/make.platform

Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.refDatabases
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.refDatabases	2011-03-09 03:16:38 UTC (rev 52532)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.refDatabases	2011-03-09 11:59:31 UTC (rev 52533)
@@ -29,7 +29,8 @@
 #
 #
 ROOT=..
-ObjModuleType=std
+ObjModuleType=boot
+CXXFLAGS+= -DBOOT_BUILD
 
 include     $(ROOT)/gen/make.defaults
 include     $(ROOT)/gen/make.platform
@@ -53,8 +54,8 @@
 
 .PHONY: empty_db refDatabases
 
-# This is where you are going to have trouble if there is one, at creating 
-# the first empty database.  Things to watch out for, $INTERBASE variable 
+# This is where you are going to have trouble if there is one, at creating
+# the first empty database.  Things to watch out for, $INTERBASE variable
 # pointing in the wrong place, shared library path LD_LIBRARY_PATH
 # not pointing to new stuff (mind you this point it should be creating
 # using create_db statically linked).
@@ -62,7 +63,7 @@
 empty_db : empty.fdb yachts.lnk
 
 empty.fdb : $(CREATE_DB)
-	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(BIN)/create_db
+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.createdb
 	-$(RM) $@
 	$(BIN)/create_db $@
 	$(TOUCH) $@

Added: firebird/branches/B2_5_Release/builds/posix/Makefile.in.static.createdb
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.static.createdb	                        (rev 0)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.static.createdb	2011-03-09 11:59:31 UTC (rev 52533)
@@ -0,0 +1,66 @@
+# 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 <mar...@lu...>
+#
+#  Contributor(s):
+# 
+#
+#
+ROOT=..
+ObjModuleType=boot
+CXXFLAGS+= -DBOOT_BUILD
+
+include     $(ROOT)/gen/make.defaults
+include     $(ROOT)/gen/make.platform
+include     $(ROOT)/gen/make.rules
+include     $(ROOT)/gen/make.shared.variables
+
+
+@SET_MAKE@
+
+
+CREATEDB_Files= create_db.cpp
+CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
+CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
+
+
+AllObjects = $(CREATEDB_Object) $(CLUMPLETS_Objects)
+
+Dependencies = $(AllObjects:.o=.d) 
+
+
+.PHONY: all create_db
+
+all: create_db
+
+create_db: $(CREATE_DB)
+
+$(CREATE_DB):	$(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+	$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
+
+
+include $(ROOT)/gen/make.shared.targets
+
+-include $(Dependencies)


Property changes on: firebird/branches/B2_5_Release/builds/posix/Makefile.in.static.createdb
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: firebird/branches/B2_5_Release/configure.in
===================================================================
--- firebird/branches/B2_5_Release/configure.in	2011-03-09 03:16:38 UTC (rev 52532)
+++ firebird/branches/B2_5_Release/configure.in	2011-03-09 11:59:31 UTC (rev 52533)
@@ -1388,6 +1388,7 @@
 gen/Makefile.static.gpre:${MAKE_SRC_DIR}/Makefile.in.static.gpre
 gen/Makefile.static.gbak:${MAKE_SRC_DIR}/Makefile.in.static.gbak
 gen/Makefile.static.isql:${MAKE_SRC_DIR}/Makefile.in.static.isql
+gen/Makefile.static.createdb:${MAKE_SRC_DIR}/Makefile.in.static.createdb
 gen/Makefile.refDatabases:${MAKE_SRC_DIR}/Makefile.in.refDatabases
 gen/Makefile.fbserver:${MAKE_SRC_DIR}/Makefile.in.fbserver
 gen/Makefile.smp_server:${MAKE_SRC_DIR}/Makefile.in.smp_server


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.