Changeset: 02ca5d3b2cd5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02ca5d3b2cd5
Modified Files:
clients/mapilib/mapi.h
common/options/CMakeLists.txt
common/options/monet_getopt.h
common/options/monet_options.h
common/stream/stream.h
common/utils/CMakeLists.txt
common/utils/mcrypt.h
common/utils/msabaoth.h
common/utils/mutils.h
common/utils/muuid.h
embedded/CMakeLists.txt
embedded/monetdb_embedded.h
monetdb5/mal/CMakeLists.txt
monetdb5/mal/mal.h
monetdb5/mal/mal_private.h
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/orderidx.h
monetdb5/optimizer/CMakeLists.txt
monetdb5/optimizer/optimizer_private.h
monetdb5/scheduler/CMakeLists.txt
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/sql_cat.h
sql/backends/monet5/sql_generator.h
sql/backends/monet5/sql_orderidx.h
sql/backends/monet5/sql_statistics.h
sql/backends/monet5/sql_transaction.h
sql/common/CMakeLists.txt
sql/include/sql_mem.h
sql/server/CMakeLists.txt
sql/storage/CMakeLists.txt
sql/storage/bat/CMakeLists.txt
Branch: cmake-monetdblite
Log Message:
Simplify exports. In MonetDBLite we don't have to export all the symbols.
diffs (truncated from 492 to 300 lines):
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -76,7 +76,7 @@ extern "C" {
#endif
/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+#ifdef WIN32
#ifndef LIBMAPI
#define mapi_export extern __declspec(dllimport)
#else
diff --git a/common/options/CMakeLists.txt b/common/options/CMakeLists.txt
--- a/common/options/CMakeLists.txt
+++ b/common/options/CMakeLists.txt
@@ -12,7 +12,7 @@ set(OPTIONS_OBJECTS monet_options.c mone
if(WIN32)
add_library(moptions SHARED ${OPTIONS_OBJECTS})
- target_compile_definitions(moptions PRIVATE LIBMOPTIONS LIBGDK LIBMAPI)
+ target_compile_definitions(moptions PRIVATE LIBMOPTIONS)
install(TARGETS moptions DESTINATION ${LIBDIR})
install(FILES $<TARGET_PDB_FILE:moptions> DESTINATION ${LIBDIR}
OPTIONAL)
else()
diff --git a/common/options/monet_getopt.h b/common/options/monet_getopt.h
--- a/common/options/monet_getopt.h
+++ b/common/options/monet_getopt.h
@@ -48,8 +48,8 @@ extern "C" {
#ifndef moptions_export
/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
+#if defined(WIN32) && !defined(HAVE_EMBEDDED)
+#if !defined(LIBMOPTIONS)
#define moptions_export extern __declspec(dllimport)
#else
#define moptions_export extern __declspec(dllexport)
diff --git a/common/options/monet_options.h b/common/options/monet_options.h
--- a/common/options/monet_options.h
+++ b/common/options/monet_options.h
@@ -27,8 +27,8 @@ extern "C" {
#ifndef moptions_export
/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
+#if defined(WIN32) && !defined(HAVE_EMBEDDED)
+#if !defined(LIBMOPTIONS)
#define moptions_export extern __declspec(dllimport)
#else
#define moptions_export extern __declspec(dllexport)
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -29,7 +29,7 @@
#include <limits.h>
/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(WIN32) && !defined(HAVE_EMBEDDED)
# ifndef LIBSTREAM
# define stream_export extern __declspec(dllimport)
# else
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -14,19 +14,18 @@ set(MSABAOTH_OBJECTS muuid.h muuid.c msa
if(WIN32)
add_library(mutils SHARED ${MUTILS_OBJECTS})
- target_compile_definitions(mutils PRIVATE LIBMUTILS LIBGDK LIBMEROUTIL)
+ target_compile_definitions(mutils PRIVATE LIBMUTILS)
install(TARGETS mutils DESTINATION ${LIBDIR})
install(FILES $<TARGET_PDB_FILE:mutils> DESTINATION ${LIBDIR} OPTIONAL)
add_library(mcrypt SHARED ${MCRYPT_OBJECTS})
- target_compile_definitions(mcrypt PRIVATE LIBMAPI LIBMCRYPT)
+ target_compile_definitions(mcrypt PRIVATE LIBMCRYPT)
target_link_libraries(mcrypt PRIVATE ${CRYPTO_LIBRARIES} mutils)
install(TARGETS mcrypt DESTINATION ${LIBDIR})
install(FILES $<TARGET_PDB_FILE:mcrypt> DESTINATION ${LIBDIR} OPTIONAL)
add_library(msabaoth SHARED ${MSABAOTH_OBJECTS})
- target_compile_definitions(msabaoth PRIVATE LIBMSABAOTH LIBMUUID LIBMAL
LIBATOMS LIBKERNEL LIBOPTIMIZER LIBSCHEDULER
- LIBMONETDB5)
+ target_compile_definitions(msabaoth PRIVATE LIBMSABAOTH LIBMUUID)
target_link_libraries(msabaoth PRIVATE ${CRYPTO_LIBRARIES} mutils)
install(TARGETS msabaoth DESTINATION ${LIBDIR})
install(FILES $<TARGET_PDB_FILE:msabaoth> DESTINATION ${LIBDIR}
OPTIONAL)
diff --git a/common/utils/mcrypt.h b/common/utils/mcrypt.h
--- a/common/utils/mcrypt.h
+++ b/common/utils/mcrypt.h
@@ -9,8 +9,8 @@
#ifndef MT_SEEN_MCRYPT_H
#define MT_SEEN_MCRYPT_H 1
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMAPI) && !defined(LIBMCRYPT)
+#if defined(WIN32) && !defined(HAVE_EMBEDDED)
+#if !defined(LIBMCRYPT)
#define mcrypt_export extern __declspec(dllimport)
#else
#define mcrypt_export extern __declspec(dllexport)
diff --git a/common/utils/msabaoth.h b/common/utils/msabaoth.h
--- a/common/utils/msabaoth.h
+++ b/common/utils/msabaoth.h
@@ -53,8 +53,8 @@ typedef struct Ssabuplog {
double crashavg30; /* average of crashes in the last 30 start attempts
*/
} sabuplog;
-#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
+#if defined(WIN32) && !defined(HAVE_EMBEDDED)
+#if !defined(LIBMSABAOTH)
#define msab_export extern __declspec(dllimport)
#else
#define msab_export extern __declspec(dllexport)
diff --git a/common/utils/mutils.h b/common/utils/mutils.h
--- a/common/utils/mutils.h
+++ b/common/utils/mutils.h
@@ -11,8 +11,8 @@
#include "monetdb_config.h"
-#ifdef WIN32
-#if !defined(LIBMUTILS) && !defined(LIBGDK) && !defined(LIBMEROUTIL)
+#if defined(WIN32) && !defined(HAVE_EMBEDDED)
+#if !defined(LIBMUTILS)
#define mutils_export extern __declspec(dllimport)
#else
#define mutils_export extern __declspec(dllexport)
diff --git a/common/utils/muuid.h b/common/utils/muuid.h
--- a/common/utils/muuid.h
+++ b/common/utils/muuid.h
@@ -14,8 +14,8 @@
* exported so that the call in sql can be satisfied by the version
* that is included in monetdb5 */
extern
-#ifdef WIN32
-#if !defined(LIBMSABAOTH) && !defined(LIBMUUID)
+#if defined(WIN32) && !defined(HAVE_EMBEDDED)
+#if !defined(LIBMUUID)
__declspec(dllimport)
#else
__declspec(dllexport)
diff --git a/embedded/CMakeLists.txt b/embedded/CMakeLists.txt
--- a/embedded/CMakeLists.txt
+++ b/embedded/CMakeLists.txt
@@ -11,12 +11,8 @@ include_directories(${CMAKE_CURRENT_BINA
../monetdb5/optimizer
../sql/backends/monet5 ../sql/include ../sql/common ../sql/server
../sql/storage ../sql/storage/bat)
-add_definitions(${COMPILER_OPTION}DLIBMUTILS ${COMPILER_OPTION}DLIBMEROUTIL
${COMPILER_OPTION}DLIBSTREAM
- ${COMPILER_OPTION}DLIBGDK
${COMPILER_OPTION}DLIBMAL ${COMPILER_OPTION}DLIBATOMS
- ${COMPILER_OPTION}DLIBKERNEL
${COMPILER_OPTION}DLIBSCHEDULER ${COMPILER_OPTION}DLIBMONETDB5
- ${COMPILER_OPTION}DLIBOPTIMIZER
${COMPILER_OPTION}DLIBSQL ${COMPILER_OPTION}DLIBSQLSERVER
- ${COMPILER_OPTION}DLIBSQLCOMMON
${COMPILER_OPTION}DLIBBATSTORE ${COMPILER_OPTION}DLIBSTORE
- ${COMPILER_OPTION}DLIBMOPTIONS
${COMPILER_OPTION}DLIBEMBEDDED ${COMPILER_OPTION}DHAVE_EMBEDDED)
+add_definitions(${COMPILER_OPTION}DLIBGDK ${COMPILER_OPTION}DLIBMONETDB5
${COMPILER_OPTION}DLIBSQL
+ ${COMPILER_OPTION}DLIBEMBEDDED
${COMPILER_OPTION}DHAVE_EMBEDDED)
bison_target(sqlparserlite ../sql/server/sql_parser.y
${CMAKE_CURRENT_BINARY_DIR}/sql_sqlparserlite.tab.c
COMPILE_FLAGS "-d -p sql -r all" DEFINES_FILE
${CMAKE_CURRENT_BINARY_DIR}/sql_sqlparserlite.tab.h)
diff --git a/embedded/monetdb_embedded.h b/embedded/monetdb_embedded.h
--- a/embedded/monetdb_embedded.h
+++ b/embedded/monetdb_embedded.h
@@ -21,7 +21,7 @@ extern "C" {
#include <stdint.h>
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+#ifdef WIN32
#if !defined(LIBEMBEDDED)
#define embedded_export extern __declspec(dllimport)
#else
diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -119,7 +119,7 @@ add_library(mal OBJECT
mal_type.c mal_type.h
mal_utils.c mal_utils.h
mal_private.h)
-target_compile_definitions(mal PRIVATE LIBMAL LIBATOMS LIBKERNEL LIBOPTIMIZER
LIBSCHEDULER LIBMONETDB5)
+target_compile_definitions(mal PRIVATE LIBMONETDB5)
set_target_properties(mal PROPERTIES POSITION_INDEPENDENT_CODE ON)
set(MONETDB5_OBJECTS ${MONETDB5_OBJECTS} $<TARGET_OBJECTS:mal> PARENT_SCOPE)
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -17,7 +17,7 @@
#include "gdk.h"
#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && !defined(LIBMONETDB5)
+#if !defined(LIBMONETDB5)
#define mal_export extern __declspec(dllimport)
#else
#define mal_export extern __declspec(dllexport)
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -8,7 +8,7 @@
/* This file should not be included in any file outside of this directory */
-#ifndef LIBMAL
+#ifndef LIBMONETDB5
#error this file should not be included outside its source directory
#endif
diff --git a/monetdb5/modules/atoms/CMakeLists.txt
b/monetdb5/modules/atoms/CMakeLists.txt
--- a/monetdb5/modules/atoms/CMakeLists.txt
+++ b/monetdb5/modules/atoms/CMakeLists.txt
@@ -23,6 +23,6 @@ add_library(atoms OBJECT
url.c url.h
uuid.c
xml.c xml.h)
-target_compile_definitions(atoms PRIVATE LIBMAL LIBATOMS LIBKERNEL
LIBOPTIMIZER LIBSCHEDULER LIBMONETDB5)
+target_compile_definitions(atoms PRIVATE LIBMONETDB5)
set_target_properties(atoms PROPERTIES POSITION_INDEPENDENT_CODE ON)
set(MONETDB5_OBJECTS ${MONETDB5_OBJECTS} $<TARGET_OBJECTS:atoms> PARENT_SCOPE)
diff --git a/monetdb5/modules/kernel/CMakeLists.txt
b/monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt
+++ b/monetdb5/modules/kernel/CMakeLists.txt
@@ -20,6 +20,6 @@ add_library(kernel OBJECT
microbenchmark.c microbenchmark.h
mmath.c mmath.h mmath_private.h
status.c status.h)
-target_compile_definitions(kernel PRIVATE LIBMAL LIBATOMS LIBKERNEL
LIBOPTIMIZER LIBSCHEDULER LIBMONETDB5)
+target_compile_definitions(kernel PRIVATE LIBMONETDB5)
set_target_properties(kernel PROPERTIES POSITION_INDEPENDENT_CODE ON)
set(MONETDB5_OBJECTS ${MONETDB5_OBJECTS} $<TARGET_OBJECTS:kernel> PARENT_SCOPE)
diff --git a/monetdb5/modules/mal/CMakeLists.txt
b/monetdb5/modules/mal/CMakeLists.txt
--- a/monetdb5/modules/mal/CMakeLists.txt
+++ b/monetdb5/modules/mal/CMakeLists.txt
@@ -41,7 +41,7 @@ add_library(malmodules OBJECT
sample.c sample.h
json_util.c json_util.h
calc.c batcalc.c)
-target_compile_definitions(malmodules PRIVATE LIBMAL LIBATOMS LIBKERNEL
LIBOPTIMIZER LIBSCHEDULER LIBMONETDB5)
+target_compile_definitions(malmodules PRIVATE LIBMONETDB5)
set_target_properties(malmodules PROPERTIES POSITION_INDEPENDENT_CODE ON)
set(MONETDB5_OBJECTS ${MONETDB5_OBJECTS} $<TARGET_OBJECTS:malmodules>
PARENT_SCOPE)
diff --git a/monetdb5/modules/mal/orderidx.h b/monetdb5/modules/mal/orderidx.h
--- a/monetdb5/modules/mal/orderidx.h
+++ b/monetdb5/modules/mal/orderidx.h
@@ -15,22 +15,12 @@
#include "mal_interpreter.h"
#include "mal_namespace.h"
-#ifdef WIN32
-#if !defined(LIBATOMS) && !defined(LIBKERNEL) && !defined(LIBMAL) &&
!defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && !defined(LIBMONETDB5)
-#define orderidx_export extern __declspec(dllimport)
-#else
-#define orderidx_export extern __declspec(dllexport)
-#endif
-#else
-#define orderidx_export extern
-#endif
-
//#define _DEBUG_OIDX_
-orderidx_export str OIDXcreate(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-orderidx_export str OIDXcreateImplementation(Client cntxt, int tpe, BAT *b,
int pieces);
-orderidx_export str OIDXdropImplementation(Client cntxt, BAT *b);
-orderidx_export str OIDXorderidx(bat *ret, const bat *bid, const bit *stable);
-orderidx_export str OIDXmerge(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-orderidx_export str OIDXhasorderidx(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-orderidx_export str OIDXgetorderidx(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+mal_export str OIDXcreate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+mal_export str OIDXcreateImplementation(Client cntxt, int tpe, BAT *b, int
pieces);
+mal_export str OIDXdropImplementation(Client cntxt, BAT *b);
+mal_export str OIDXorderidx(bat *ret, const bat *bid, const bit *stable);
+mal_export str OIDXmerge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+mal_export str OIDXhasorderidx(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+mal_export str OIDXgetorderidx(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
#endif /* _OIDX_H */
diff --git a/monetdb5/optimizer/CMakeLists.txt
b/monetdb5/optimizer/CMakeLists.txt
--- a/monetdb5/optimizer/CMakeLists.txt
+++ b/monetdb5/optimizer/CMakeLists.txt
@@ -47,6 +47,6 @@ add_library(optimizer OBJECT
opt_postfix.c opt_postfix.h
opt_volcano.c opt_volcano.h
opt_wrapper.c)
-target_compile_definitions(optimizer PRIVATE LIBMAL LIBATOMS LIBKERNEL
LIBOPTIMIZER LIBSCHEDULER LIBMONETDB5)
+target_compile_definitions(optimizer PRIVATE LIBMONETDB5)
set_target_properties(optimizer PROPERTIES POSITION_INDEPENDENT_CODE ON)
set(MONETDB5_OBJECTS ${MONETDB5_OBJECTS} $<TARGET_OBJECTS:optimizer>
PARENT_SCOPE)
diff --git a/monetdb5/optimizer/optimizer_private.h
b/monetdb5/optimizer/optimizer_private.h
--- a/monetdb5/optimizer/optimizer_private.h
+++ b/monetdb5/optimizer/optimizer_private.h
@@ -8,7 +8,7 @@
/* This file should not be included in any file outside of this directory */
-#ifndef LIBOPTIMIZER
+#ifndef LIBMONETDB5
#error this file should not be included outside its source directory
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
