Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[51775] firebird/trunk
|
From: <ale...@us...> - 2010-10-25 15:48:42
|
Revision: 51775
http://firebird.svn.sourceforge.net/firebird/?rev=51775&view=rev
Author: alexpeshkoff
Date: 2010-10-25 15:48:35 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
Patches from Damyan Ivanov
Modified Paths:
--------------
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/builds/posix/Makefile.in.examples
firebird/trunk/builds/posix/Makefile.in.plugins_examples
firebird/trunk/builds/posix/make.defaults
firebird/trunk/builds/posix/make.rules
firebird/trunk/builds/posix/prefix.linux_powerpc
firebird/trunk/builds/posix/prefix.linux_sparc32
firebird/trunk/src/common/classes/fb_atomic.h
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/Makefile.in 2010-10-25 15:48:35 UTC (rev 51775)
@@ -209,6 +209,8 @@
-$(RM) $@
$(LN) $^ $@
+export LD_LIBRARY_PATH += :$(FIREBIRD)/lib
+
metadata.fdb: $(BLD_ROOT)/misc/metadata.gbak
$(GBAK) -MODE read_only -R $< $@
$(TOUCH) $@
@@ -396,14 +398,14 @@
.PHONY: qli examples message_file
-rest: qli examples message_file
+rest: qli examples message_file include_generic
qli: $(QLI)
$(QLI): $(QLI_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
-examples:
+examples: include_generic
$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
$(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/
@@ -416,7 +418,51 @@
$(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+#---------------------------------------------------------------------------
+# This target builds the include files for disttribution with the release
+# Some of the files differ from the ones used internally to compile the
+# software - mainly they are just flattened out to make the view simpler
+# from an external point of view.
+
+INCLUDE_DEST= $(FIREBIRD)/include
+
+include_generic: $(INCLUDE_DEST)/ib_util.h \
+ $(INCLUDE_DEST)/ibase.h
+
+# ib_util.h actually is a marker for a number of headers
+
+# All these files are #includes in ibase.h here we cat them all together
+# and remove the embedded #includes to make it simpler for external usage.
+
+IBASE_ExtraFiles = include/types_pub.h include/consts_pub.h dsql/sqlda_pub.h common/dsc_pub.h jrd/ibase.h jrd/inf_pub.h jrd/blr.h include/gen/iberror.h
+SRC_IBASE_ExtraFiles = $(addprefix $(SRC_ROOT)/, $(IBASE_ExtraFiles))
+MAKE_HEADER_Src = $(addprefix $(SRC_ROOT)/, misc/makeHeader.cpp)
+MAKE_HEADER_Bin = ./makeHeader
+
+$(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles)
+ $(STATICEXE_LINK) -o $(MAKE_HEADER_Bin) $(MAKE_HEADER_Src)
+ $(CP) $^ .
+ $(MAKE_HEADER_Bin) <ibase.h >$@
+ $(RM) -f ibase.h
+
+# Copy all the other headers to the distribution directory. we use
+# ib_util.h as the marker for all the files.
+
+OtherDistribHeaders = extlib/ib_util.h \
+ yvalve/perf.h \
+ include/gen/iberror.h
+
+SRC_OtherDistribHeaders = $(addprefix $(SRC_ROOT)/, $(OtherDistribHeaders))
+
+$(INCLUDE_DEST)/ib_util.h : $(SRC_OtherDistribHeaders)
+ mkdir -p $(INCLUDE_DEST)
+ $(CP) $^ $(INCLUDE_DEST)/
+
+
+# There are also gds*f and gds*ada header files around if someone
+# wants them. You might need to hunt around in the old cvs tree for them.
+
#___________________________________________________________________________
# track dependencies
#
Modified: firebird/trunk/builds/posix/Makefile.in.examples
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.examples 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/Makefile.in.examples 2010-10-25 15:48:35 UTC (rev 51775)
@@ -33,7 +33,7 @@
# Add the install include directory to the search path since the
# examples need to build using those headers values.
-CFLAGS := $(CFLAGS) -I$(ROOT)/gen/firebird/include
+CFLAGS := $(CFLAGS) -I$(FIREBIRD)/include
include $(ROOT)/gen/make.defaults
Modified: firebird/trunk/builds/posix/Makefile.in.plugins_examples
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.plugins_examples 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/Makefile.in.plugins_examples 2010-10-25 15:48:35 UTC (rev 51775)
@@ -29,7 +29,7 @@
#
ROOT=../..
-CXXFLAGS+= -I$(ROOT)/gen/firebird/include
+CXXFLAGS+= -I$(FIREBIRD)/include
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/make.defaults 2010-10-25 15:48:35 UTC (rev 51775)
@@ -213,7 +213,7 @@
#LibraryFileName=libfbclient
LibraryFileName=libfbclient
LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion}
-LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.${MajorVer}
+LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.2
LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT}
LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName)
Modified: firebird/trunk/builds/posix/make.rules
===================================================================
--- firebird/trunk/builds/posix/make.rules 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/make.rules 2010-10-25 15:48:35 UTC (rev 51775)
@@ -39,9 +39,9 @@
endif
ifeq ($(TARGET),Release)
- WFLAGS:= $(WFLAGS) $(PROD_FLAGS)
+ WFLAGS:= $(PROD_FLAGS) $(WFLAGS)
else
- WFLAGS:= $(WFLAGS) $(DEV_FLAGS) -DDEV_BUILD
+ WFLAGS:= $(DEV_FLAGS) $(WFLAGS) -DDEV_BUILD
endif
WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS)
Modified: firebird/trunk/builds/posix/prefix.linux_powerpc
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_powerpc 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/prefix.linux_powerpc 2010-10-25 15:48:35 UTC (rev 51775)
@@ -18,7 +18,7 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3 -mcpu=powerpc
+PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3
DEV_FLAGS=-ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
#DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
Modified: firebird/trunk/builds/posix/prefix.linux_sparc32
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_sparc32 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/prefix.linux_sparc32 2010-10-25 15:48:35 UTC (rev 51775)
@@ -18,7 +18,7 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-COMMON_FLAGS=-m32 -DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
+COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 $(COMMON_FLAGS)
DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
CXXFLAGS:= $(CXXFLAGS) -fno-rtti
Modified: firebird/trunk/src/common/classes/fb_atomic.h
===================================================================
--- firebird/trunk/src/common/classes/fb_atomic.h 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/src/common/classes/fb_atomic.h 2010-10-25 15:48:35 UTC (rev 51775)
@@ -437,7 +437,10 @@
// wbo 2009-10 - We tested libatomic_ops against Firebird 2.5/HPUX and the
// atomic implementation was incomplete on IA-64/HPPA
+extern "C" {
+#define AO_REQUIRE_CAS
#include <atomic_ops.h>
+};
namespace Firebird {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
