firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:43:02 +01:00
Code Issues

Fix Windows (cmake only) build. Linux build currently is not using udr_plugin.vers when linking examples/udr.

Browse Source
This commit is contained in:
asfernandes 2015-02-03 14:56:20 +00:00
parent 6d7af88734
commit 69ccf374b7
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builds/posix/make.defaults
View File

@ -259,17 +259,17 @@ endif
FIREBIRD_VERS = firebird.vers
FBINTL_VERS = fbintl.vers
IB_UTIL_VERS = ib_util.vers
UDR_ENGINE_VERS = udr_engine.vers
UDR_PLUGIN_VERS = udr_plugin.vers
EMPTY_VERS = empty.vers
PLUGIN_VERS = fbplugin.vers
ALLVERS = $(FIREBIRD_VERS) $(FBINTL_VERS) $(IB_UTIL_VERS)
ALLVERS += $(UDR_ENGINE_VERS) $(EMPTY_VERS) $(PLUGIN_VERS)
ALLVERS += $(UDR_PLUGIN_VERS) $(EMPTY_VERS) $(PLUGIN_VERS)
LINK_FIREBIRD_SYMBOLS = $(call LIB_LINK_MAPFILE,$(FIREBIRD_VERS))
LINK_FBINTL_SYMBOLS = $(call LIB_LINK_MAPFILE,$(FBINTL_VERS))
LINK_IBUTIL_SYMBOLS = $(call LIB_LINK_MAPFILE,$(IB_UTIL_VERS))
LINK_UDRENG_SYMBOLS = $(call LIB_LINK_MAPFILE,$(UDR_ENGINE_VERS))
LINK_UDR_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,$(UDR_PLUGIN_VERS))
LINK_EMPTY_SYMBOLS = $(call LIB_LINK_MAPFILE,$(EMPTY_VERS))
LINK_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,$(PLUGIN_VERS))
LINK_EXEC_EXPORT=-rdynamic
@ -320,7 +320,7 @@ LINK_ENGINE = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREB
$(call LIB_LINK_SONAME,$(EngineSoName)) $(call LIB_LINK_RPATH,lib)
LINK_ENGINE_LIBS = $(LINK_FIREBIRD_LIBS) $(FIREBIRD_LIBRARY_LINK)
LINK_UDRENG = $(LIB_LINK) $(LINK_UDRENG_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)
LINK_UDRENG = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)
LINK_UDRENG_LIBS = -L$(LIB) $(SO_LINK_LIBS)
LINK_PLUGIN = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)

17
builds/posix/udr_engine.vers → builds/posix/udr_plugin.vers
View File

@ -7,25 +7,22 @@
# you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
#
#
# Software distributed under the License is distributed AS IS,
# WITHOUT WARRANTY OF ANY KIND, either express or implied.
# See the License for the specific language governing rights
# and limitations under the License.
#
#
# The Original Code was created by Nickolay Samofatov
# for the Firebird Open Source RDBMS project.
#
# Copyright (c) 2004 Nickolay Samofatov <nickolay@broadviewsoftware.com>
#
# Copyright (c) 2015 Adriano dos Santos Fernandes <adrianosf@gmail.com>
# and all contributors signed below.
#
#
# All Rights Reserved.
# Contributor(s): ______________________________________.
# Adriano dos Santos Fernandes
#
#
#
firebird_plugin
fbUdrRegFunction
fbUdrRegProcedure
fbUdrRegTrigger
firebird_udr_plugin

4
builds/win32/defs/udr_engine.def → builds/win32/defs/udr_plugin.def
View File

@ -12,11 +12,11 @@
; The Original Code was created by Adriano dos Santos Fernandes
; for the Firebird Open Source RDBMS project.
;
; Copyright (c) 2008 Adriano dos Santos Fernandes <adrianosf@uol.com.br>
; Copyright (c) 2015 Adriano dos Santos Fernandes <adrianosf@gmail.com>
; and all contributors signed below.
;
; All Rights Reserved.
; Contributor(s): ______________________________________.
EXPORTS
firebird_plugin
firebird_udr_plugin

1
examples/CMakeLists.txt
View File

@ -79,6 +79,7 @@ file(GLOB udrcpp_example_src "udr/*")
add_library (udrcpp_example SHARED ${udrcpp_example_src})
target_link_libraries (udrcpp_example yvalve)
set_exported_symbols (udrcpp_example udr_plugin)
set_output_directory (udrcpp_example plugins/udr)
project_group (udrcpp_example Examples)

1
examples/udr/Functions.cpp
View File

@ -157,4 +157,5 @@ FB_UDR_END_FUNCTION
// This should be used in only one of the UDR library files.
// Build must export firebird_udr_plugin function.
FB_UDR_IMPLEMENT_ENTRY_POINT

1
src/include/firebird/UdrCppEngine.h
View File

@ -31,6 +31,7 @@
#include <string.h>
// Build must export firebird_udr_plugin function.
#define FB_UDR_IMPLEMENT_ENTRY_POINT \
namespace Firebird \
{ \