Generate files for exported symbols, so we don't have to keep 2 different

files up to date. Symbols should be added (or removed) now in libmariadb/CMakeLists.txt

Author: 9EOR9

libmariadb/CMakeLists.txt

@@ -7,6 +7,238 @@ ADD_DEFINITIONS(-D HAVE_COMPRESS)
 ADD_DEFINITIONS(-D LIBMARIADB)
 ADD_DEFINITIONS(-D THREAD)
 
+SET(EXPORT_SYMBOLS
+ load_defaults
+ mariadb_connection
+ mariadb_convert_string
+ mariadb_deinitialize_ssl
+ mariadb_dyncol_check
+ mariadb_dyncol_column_cmp_named
+ mariadb_dyncol_column_count
+ mariadb_dyncol_create_many_named
+ mariadb_dyncol_create_many_num
+ mariadb_dyncol_exists_named
+ mariadb_dyncol_exists_num
+ mariadb_dyncol_free
+ mariadb_dyncol_get_named
+ mariadb_dyncol_get_num
+ mariadb_dyncol_has_names
+ mariadb_dyncol_json
+ mariadb_dyncol_list_named
+ mariadb_dyncol_list_num
+ mariadb_dyncol_unpack
+ mariadb_dyncol_update_many_named
+ mariadb_dyncol_update_many_num
+ mariadb_dyncol_val_double
+ mariadb_dyncol_val_long
+ mariadb_dyncol_val_str
+ myodbc_remove_escape
+ mysql_affected_rows
+ mysql_autocommit
+ mysql_autocommit_cont
+ mysql_autocommit_start
+ mysql_change_user
+ mysql_change_user_cont
+ mysql_change_user_start
+ mysql_character_set_name
+ mysql_client_find_plugin
+ mysql_client_register_plugin
+ mysql_close
+ mysql_close_cont
+ mysql_close_start
+ mysql_commit
+ mysql_commit_cont
+ mysql_commit_start
+ mysql_data_seek
+ mysql_debug
+ mysql_dump_debug_info
+ mysql_dump_debug_info_cont
+ mysql_dump_debug_info_start
+ mysql_eof
+ mysql_errno
+ mysql_error
+ mysql_escape_string
+ mysql_fetch_field
+ mysql_fetch_field_direct
+ mysql_fetch_fields
+ mysql_fetch_lengths
+ mysql_fetch_row
+ mysql_fetch_row_cont
+ mysql_fetch_row_start
+ mysql_field_count
+ mysql_field_seek
+ mysql_field_tell
+ mysql_free_result
+ mysql_free_result_cont
+ mysql_free_result_start
+ mysql_get_character_set_info
+ mysql_get_charset_by_name
+ mysql_get_charset_by_nr
+ mysql_get_client_info
+ mysql_get_client_version
+ mysql_get_host_info
+ mysql_get_parameters
+ mysql_get_proto_info
+ mysql_get_server_info
+ mysql_get_server_name
+ mysql_get_server_version
+ mysql_get_socket
+ mysql_get_ssl_cipher
+ mysql_get_timeout_value
+ mysql_get_timeout_value_ms
+ mysql_hex_string
+ mysql_info
+ mysql_init
+ mysql_insert_id
+ mysql_kill
+ mysql_kill_cont
+ mysql_kill_start
+ mysql_list_dbs
+ mysql_list_dbs_cont
+ mysql_list_dbs_start
+ mysql_list_fields
+ mysql_list_fields_cont
+ mysql_list_fields_start
+ mysql_list_processes
+ mysql_list_processes_cont
+ mysql_list_processes_start
+ mysql_list_tables
+ mysql_list_tables_cont
+ mysql_list_tables_start
+ mysql_load_plugin;
+ mysql_load_plugin_v
+ mysql_more_results
+ mysql_next_result
+ mysql_next_result_cont
+ mysql_next_result_start
+ mysql_num_fields
+ mysql_num_rows
+ mysql_options
+ mysql_optionsv
+ mysql_ping
+ mysql_ping_cont
+ mysql_ping_start
+ mysql_ps_fetch_functions
+ mysql_query
+ mysql_query_cont
+ mysql_query_start
+ mysql_read_query_result
+ mysql_read_query_result_cont
+ mysql_read_query_result_start
+ mysql_real_connect
+ mysql_real_connect_cont
+ mysql_real_connect_start
+ mysql_real_escape_string
+ mysql_real_query
+ mysql_real_query_cont
+ mysql_real_query_start
+ mysql_refresh
+ mysql_refresh_cont
+ mysql_refresh_start
+ mysql_rollback
+ mysql_rollback_cont
+ mysql_rollback_start
+ mysql_row_seek
+ mysql_row_tell
+ mysql_select_db
+ mysql_select_db_cont
+ mysql_select_db_start
+ mysql_send_query
+ mysql_send_query_cont
+ mysql_send_query_start
+ mysql_server_end
+ mysql_server_init
+ mysql_set_character_set
+ mysql_set_character_set_cont
+ mysql_set_character_set_start
+ mysql_set_local_infile_default
+ mysql_set_local_infile_handler
+ mysql_set_server_option
+ mysql_set_server_option_cont
+ mysql_set_server_option_start
+ mysql_shutdown
+ mysql_shutdown_cont
+ mysql_shutdown_start
+ mysql_sqlstate
+ mysql_ssl_set
+ mysql_stat
+ mysql_stat_cont
+ mysql_stat_start
+ mysql_stmt_affected_rows
+ mysql_stmt_attr_get
+ mysql_stmt_attr_set
+ mysql_stmt_bind_param
+ mysql_stmt_bind_result
+ mysql_stmt_close
+ mysql_stmt_close_cont
+ mysql_stmt_close_start
+ mysql_stmt_data_seek
+ mysql_stmt_errno
+ mysql_stmt_error
+ mysql_stmt_execute
+ mysql_stmt_execute_cont
+ mysql_stmt_execute_start
+ mysql_stmt_fetch
+ mysql_stmt_fetch_column
+ mysql_stmt_fetch_cont
+ mysql_stmt_fetch_start
+ mysql_stmt_field_count
+ mysql_stmt_free_result
+ mysql_stmt_free_result_cont
+ mysql_stmt_free_result_start
+ mysql_stmt_init
+ mysql_stmt_insert_id
+ mysql_stmt_more_results
+ mysql_stmt_next_result
+ mysql_stmt_next_result_cont
+ mysql_stmt_next_result_start
+ mysql_stmt_num_rows
+ mysql_stmt_param_count
+ mysql_stmt_param_metadata
+ mysql_stmt_prepare
+ mysql_stmt_prepare_cont
+ mysql_stmt_prepare_start
+ mysql_stmt_reset
+ mysql_stmt_reset_cont
+ mysql_stmt_reset_start
+ mysql_stmt_result_metadata
+ mysql_stmt_row_seek
+ mysql_stmt_row_tell
+ mysql_stmt_send_long_data
+ mysql_stmt_send_long_data_cont
+ mysql_stmt_send_long_data_start
+ mysql_stmt_sqlstate
+ mysql_stmt_store_result
+ mysql_stmt_store_result_cont
+ mysql_stmt_store_result_start
+ mysql_store_result
+ mysql_store_result_cont
+ mysql_store_result_start
+ mysql_thread_end
+ mysql_thread_id
+ mysql_thread_init
+ mysql_thread_safe
+ mysql_use_result
+ mysql_warning_count)
+
+IF(WIN32)
+  SET(EXPORT_CONTENT "EXPORTS\n")
+  FOREACH(SYMBOL ${EXPORT_SYMBOLS})
+    SET(EXPORT_CONTENT "${EXPORT_CONTENT}  ${SYMBOL}\n")
+  ENDFOREACH()
+  SET(EXPORT_FILE "${CMAKE_BINARY_DIR}/libmariadb/exports.def")
+  SET(EXPORT_LINK ${EXPORT_FILE})
+ELSE()
+  SET(EXPORT_CONTENT "{\nglobal:\n")
+  FOREACH(SYMBOL ${EXPORT_SYMBOLS})
+    SET(EXPORT_CONTENT "${EXPORT_CONTENT} ${SYMBOL}\\;\n")
+  ENDFOREACH()
+  SET(EXPORT_FILE "${CMAKE_BINARY_DIR}/libmariadb/exports.txt")
+  SET(EXPORT_CONTENT "${EXPORT_CONTENT}local:\n *\\;\n}\\;")
+ENDIF()
+
+FILE(WRITE ${EXPORT_FILE} ${EXPORT_CONTENT})
+
 SET(LIBMARIADB_SOURCES 
 array.c 
 ma_dyncol.c
@@ -92,10 +324,6 @@ my_auth.c
 ma_secure.c
 )
 
-IF(MSVC)
-  SET(EXPORT_FILE libmariadb_exports.def)
-ENDIF()
-
 IF(WIN32)
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/win-iconv)
   SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES}
@@ -141,20 +369,20 @@ IF(UNIX)
   SET_TARGET_PROPERTIES(mariadb_obj PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
 ENDIF()
 
-ADD_LIBRARY(mariadbclient STATIC $<TARGET_OBJECTS:mariadb_obj> ${EXPORT_FILE})
+ADD_LIBRARY(mariadbclient STATIC $<TARGET_OBJECTS:mariadb_obj> ${EXPORT_LINK})
 TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
 
-ADD_LIBRARY(libmariadb SHARED $<TARGET_OBJECTS:mariadb_obj> ${EXPORT_FILE})
+ADD_LIBRARY(libmariadb SHARED $<TARGET_OBJECTS:mariadb_obj> ${EXPORT_LINK})
 TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS})
 IF(UNIX)
   SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
 ENDIF()
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
-  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/version_script.txt")
+  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${EXPORT_FILE}")
   TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--no-undefined")
-  TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/version_script.txt")
+  TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${EXPORT_FILE}")
 ENDIF()
 
 SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")