Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[60615] firebird/trunk
|
From: <asf...@us...> - 2015-02-03 14:56:23
|
Revision: 60615
http://sourceforge.net/p/firebird/code/60615
Author: asfernandes
Date: 2015-02-03 14:56:20 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
Fix Windows (cmake only) build. Linux build currently is not using udr_plugin.vers when linking examples/udr.
Modified Paths:
--------------
firebird/trunk/builds/posix/make.defaults
firebird/trunk/examples/CMakeLists.txt
firebird/trunk/examples/udr/Functions.cpp
firebird/trunk/src/include/firebird/UdrCppEngine.h
Added Paths:
-----------
firebird/trunk/builds/posix/udr_plugin.vers
firebird/trunk/builds/win32/defs/udr_plugin.def
Removed Paths:
-------------
firebird/trunk/builds/posix/udr_engine.vers
firebird/trunk/builds/win32/defs/udr_engine.def
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults 2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/builds/posix/make.defaults 2015-02-03 14:56:20 UTC (rev 60615)
@@ -259,17 +259,17 @@
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 @@
$(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)
Deleted: firebird/trunk/builds/posix/udr_engine.vers
===================================================================
--- firebird/trunk/builds/posix/udr_engine.vers 2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/builds/posix/udr_engine.vers 2015-02-03 14:56:20 UTC (rev 60615)
@@ -1,31 +0,0 @@
-#
-# Version script to hide private symbols from Firebird libraries
-# GNU and Solaris linkers should understand it
-#
-# The contents of this file are subject to the Initial
-# Developer's Public License Version 1.0 (the "License");
-# 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 <nic...@br...>
-# and all contributors signed below.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-# Adriano dos Santos Fernandes
-#
-#
-
-firebird_plugin
-fbUdrRegFunction
-fbUdrRegProcedure
-fbUdrRegTrigger
Copied: firebird/trunk/builds/posix/udr_plugin.vers (from rev 60611, firebird/trunk/builds/posix/udr_engine.vers)
===================================================================
--- firebird/trunk/builds/posix/udr_plugin.vers (rev 0)
+++ firebird/trunk/builds/posix/udr_plugin.vers 2015-02-03 14:56:20 UTC (rev 60615)
@@ -0,0 +1,28 @@
+#
+# Version script to hide private symbols from Firebird libraries
+# GNU and Solaris linkers should understand it
+#
+# The contents of this file are subject to the Initial
+# Developer's Public License Version 1.0 (the "License");
+# 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) 2015 Adriano dos Santos Fernandes <adr...@gm...>
+# and all contributors signed below.
+#
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+# Adriano dos Santos Fernandes
+#
+#
+
+firebird_udr_plugin
Property changes on: firebird/trunk/builds/posix/udr_plugin.vers
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: firebird/trunk/builds/win32/defs/udr_engine.def
===================================================================
--- firebird/trunk/builds/win32/defs/udr_engine.def 2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/builds/win32/defs/udr_engine.def 2015-02-03 14:56:20 UTC (rev 60615)
@@ -1,22 +0,0 @@
-; The contents of this file are subject to the Initial
-; Developer's Public License Version 1.0 (the "License");
-; 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 Adriano dos Santos Fernandes
-; for the Firebird Open Source RDBMS project.
-;
-; Copyright (c) 2008 Adriano dos Santos Fernandes <adr...@uo...>
-; and all contributors signed below.
-;
-; All Rights Reserved.
-; Contributor(s): ______________________________________.
-
-EXPORTS
- firebird_plugin
Copied: firebird/trunk/builds/win32/defs/udr_plugin.def (from rev 60611, firebird/trunk/builds/win32/defs/udr_engine.def)
===================================================================
--- firebird/trunk/builds/win32/defs/udr_plugin.def (rev 0)
+++ firebird/trunk/builds/win32/defs/udr_plugin.def 2015-02-03 14:56:20 UTC (rev 60615)
@@ -0,0 +1,22 @@
+; The contents of this file are subject to the Initial
+; Developer's Public License Version 1.0 (the "License");
+; 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 Adriano dos Santos Fernandes
+; for the Firebird Open Source RDBMS project.
+;
+; Copyright (c) 2015 Adriano dos Santos Fernandes <adr...@gm...>
+; and all contributors signed below.
+;
+; All Rights Reserved.
+; Contributor(s): ______________________________________.
+
+EXPORTS
+ firebird_udr_plugin
Property changes on: firebird/trunk/builds/win32/defs/udr_plugin.def
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: firebird/trunk/examples/CMakeLists.txt
===================================================================
--- firebird/trunk/examples/CMakeLists.txt 2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/examples/CMakeLists.txt 2015-02-03 14:56:20 UTC (rev 60615)
@@ -79,6 +79,7 @@
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)
Modified: firebird/trunk/examples/udr/Functions.cpp
===================================================================
--- firebird/trunk/examples/udr/Functions.cpp 2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/examples/udr/Functions.cpp 2015-02-03 14:56:20 UTC (rev 60615)
@@ -157,4 +157,5 @@
// This should be used in only one of the UDR library files.
+// Build must export firebird_udr_plugin function.
FB_UDR_IMPLEMENT_ENTRY_POINT
Modified: firebird/trunk/src/include/firebird/UdrCppEngine.h
===================================================================
--- firebird/trunk/src/include/firebird/UdrCppEngine.h 2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/src/include/firebird/UdrCppEngine.h 2015-02-03 14:56:20 UTC (rev 60615)
@@ -31,6 +31,7 @@
#include <string.h>
+// Build must export firebird_udr_plugin function.
#define FB_UDR_IMPLEMENT_ENTRY_POINT \
namespace Firebird \
{ \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
