Changeset: fccb763b99e9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fccb763b99e9 Added Files: cmake/Modules/FindSphinx.cmake documentation/CMakeLists.txt documentation/conf.py.in documentation/index.rst documentation/monetdbe/architecture.png documentation/source/build-debian.rst documentation/source/build-fedora.rst documentation/source/build.rst documentation/source/design.rst documentation/source/release.rst gdk/gdk_subquery.c gdk/gdk_subquery.h sql/test/json/Tests/jsonkeyarray.Bug-6858.stable.err sql/test/json/Tests/jsonkeyarray.Bug-6858.stable.out sql/test/miscellaneous/Tests/simple_plans.stable.out.single tools/monetdbe/monetdbe_mapi.h Removed Files: NT/Makefile NT/makelibdef.py NT/monetdb_config.h.in NT/rules.msc NT/wincompile.py NT/winconfig.py README-Debian README-Fedora README.md Release.md buildtools/autogen/autogen.py buildtools/autogen/autogen/__init__.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/filesplit.py buildtools/autogen/autogen/msc.py buildtools/autogen/autogen/var.py buildtools/conf/config.rpath buildtools/conf/rules.mk ctest/tools/embedded/CMakeLists.txt ctest/tools/embedded/backup.c ctest/tools/embedded/example1.c ctest/tools/embedded/example2.c ctest/tools/embedded/example_append.c ctest/tools/embedded/example_blob.c ctest/tools/embedded/example_connections.c ctest/tools/embedded/example_decimals.c ctest/tools/embedded/example_temporal.c ctest/tools/embedded/mapi.c ctest/tools/embedded/mapi.h documentation/monetdbe/index.rst documentation/source/index.rst monetdb5/extras/mal_optimizer_template/opt_sql_append.h monetdb5/modules/atoms/json.h monetdb5/modules/atoms/url.h monetdb5/modules/kernel/batcolor.h monetdb5/modules/mal/json_util.h sql/scripts/10_math.sql tools/embedded/CMakeLists.txt tools/embedded/monetdb_embedded.c tools/embedded/monetdb_embedded.h tools/monetdbe/mapi.h Modified Files: CMakeLists.txt Config.cmake.in clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/mclient.c clients/mapilib/CMakeLists.txt clients/odbc/winsetup/CMakeLists.txt cmake/monetdb-custom-targets.cmake cmake/monetdb-defines.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-functions.cmake cmake/monetdb-options.cmake common/options/CMakeLists.txt common/stream/CMakeLists.txt common/stream/stream.c common/utils/CMakeLists.txt ctest/tools/monetdbe/cmocka_test.c ctest/tools/monetdbe/example1.c ctest/tools/monetdbe/example2.c ctest/tools/monetdbe/example_append.c ctest/tools/monetdbe/example_backup.c ctest/tools/monetdbe/example_blob.c ctest/tools/monetdbe/example_connections.c ctest/tools/monetdbe/example_decimals.c ctest/tools/monetdbe/example_remote.c ctest/tools/monetdbe/example_temporal.c ctest/tools/monetdbe/test_helper.c ctest/tools/monetdbe/test_helper.h ctest/tools/monetdbe/test_helper_template.h documentation/monetdbe/introduction.rst documentation/monetdbe/monetdbe_api.rst documentation/source/manual_pages/monetdbd.rst.in gdk/CMakeLists.txt gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_hash.c gdk/gdk_tracer.c gdk/gdk_tracer.h geom/monetdb5/geom.c geom/monetdb5/geom.h monetdb5/extras/mal_optimizer_template/CMakeLists.txt monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/rapi/rapi.c monetdb5/extras/rapi/rapi.h monetdb5/mal/mal_prelude.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_runtime.c monetdb5/mal/mel.h monetdb5/modules/atoms/CMakeLists.txt monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/color.c monetdb5/modules/atoms/color.h monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/streams.h monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.c monetdb5/modules/atoms/xml.h monetdb5/modules/kernel/CMakeLists.txt monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/alarm.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/group.c monetdb5/modules/kernel/mmath.c monetdb5/modules/mal/CMakeLists.txt monetdb5/modules/mal/batExtensions.h monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/json_util.c monetdb5/modules/mal/tablet.c monetdb5/tools/CMakeLists.txt monetdb_config.h.in monetdb_config_win32.h.in sql/backends/monet5/CMakeLists.txt sql/backends/monet5/generator/generator.c sql/backends/monet5/mal_backend.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_subquery.c sql/backends/monet5/sql_subquery.h sql/backends/monet5/sql_subquery.mal sql/backends/monet5/sql_upgrades.c sql/backends/monet5/wlr.h sql/common/sql_types.c sql/common/sql_types.h sql/include/sql_catalog.h sql/scripts/CMakeLists.txt sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_mvc.h sql/server/sql_qc.h sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/res_table.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2008/Tests/decimal_cast_in_view.SF-2075223.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2014/Tests/missing_alias.Bug-3626.stable.out sql/test/BugTracker-2015/Tests/string-to-inet.Bug-3666.stable.out sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128 sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128 sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-add.Bug-6630.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.out sql/test/BugTracker-2019/Tests/cast-interval.Bug-6793.stable.out sql/test/BugTracker-2020/Tests/select-and.Bug-6878.stable.out sql/test/BugTracker/Tests/convert_dec2varchar.SF-1774312.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/SQLancer/Tests/sqlancer01.sql sql/test/SQLancer/Tests/sqlancer01.stable.err sql/test/SQLancer/Tests/sqlancer01.stable.out sql/test/bugs/Tests/cast_varchar2int-bug-sf-964165.stable.out sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/mergetables/Tests/mergeinit.stable.err sql/test/miscellaneous/Tests/groupings.stable.out sql/test/miscellaneous/Tests/simple_plans.sql sql/test/miscellaneous/Tests/simple_plans.stable.out sql/test/miscellaneous/Tests/simple_selects.stable.out sql/test/pg_regress/Tests/date.stable.out sql/test/pg_regress/Tests/int8.stable.out sql/test/pg_regress/Tests/int8.stable.out.int128 sql/test/subquery/Tests/any_all.sql sql/test/subquery/Tests/any_all.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 testing/CMakeLists.txt tools/CMakeLists.txt tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/monetdbd.1.in tools/monetdbe/CMakeLists.txt tools/monetdbe/monetdbe.c tools/monetdbe/monetdbe.h tools/monetdbe/monetdbe_mapi.c tools/mserver/mserver5.c tools/mserver/shutdowntest.c Branch: unlock Log Message:
Merge with default branch. diffs (truncated from 38253 to 300 lines): diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,10 @@ monetdb_configure_crypto() monetdb_configure_sizes() include(GNUInstallDirs) +# The documentation is unclear on what is the best location to install +# the configuration for the exported targets, especially when building +# the packages (deb/rpm). For now set the variable to a reasonable value +set(EXPORT_TARGET_PATH "${CMAKE_INSTALL_DATAROOTDIR}/monetdb/cmake") # Define the macro variables after configuring the install directories. # Some variables define additional installation settings. @@ -128,7 +132,7 @@ install(TARGETS install(EXPORT monetdb_config_headerTargets FILE monetdb_config_headerTargets.cmake NAMESPACE MonetDB:: - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake + DESTINATION ${EXPORT_TARGET_PATH} COMPONENT monetdbdev) install(FILES @@ -159,7 +163,7 @@ endif() include(CMakePackageConfigHelpers) configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/MonetDBConfig.cmake" - INSTALL_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cmake)" + INSTALL_DESTINATION "${EXPORT_TARGET_PATH}" NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO) @@ -170,13 +174,14 @@ write_basic_package_version_file( install(FILES ${CMAKE_CURRENT_BINARY_DIR}/MonetDBConfig.cmake - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake + DESTINATION ${EXPORT_TARGET_PATH} COMPONENT monetdbdev) include(monetdb-packages) include(CTest) add_subdirectory(ctest) +add_subdirectory(documentation) if(CMAKE_SUMMARY) monetdb_cmake_summary() diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -16,4 +16,3 @@ include("${CMAKE_CURRENT_LIST_DIR}/gdkTa include("${CMAKE_CURRENT_LIST_DIR}/monetdb5Targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/sqlTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/monetdbeTargets.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/embeddedTargets.cmake") diff --git a/NT/Makefile b/NT/Makefile deleted file mode 100644 --- a/NT/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -*- makefile -*- - -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. - -TOPDIR = . -srcdir = $(TOPDIR)\.. - -# location of NT directory -NT = $(srcdir)\NT - -prefix = $(MAKEDIR) - -# ensure "all" is first target -all: _all - -!INCLUDE "$(NT)\rules.msc" - -_all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h unistd.h .monetdb monetdb_hgversion.h - $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" all - -install: targetdirs all - $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" install - $(INSTALL) .monetdb "$(sysconfdir)" - -makewxs: - $(PYTHON) $(NT)\mksqlwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" "$(prefix)" > "$(prefix)\MonetDB5-SQL-Installer.wxs" - $(PYTHON) $(NT)\mkodbcwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" "$(prefix)" > "$(prefix)\MonetDB-ODBC-Installer.wxs" - -$(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag" - cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&$(PYTHON) buildtools\autogen\autogen.py - -monetdb_config.h: "$(TOPDIR)\winconfig_conds.py" "$(NT)\monetdb_config.h.in" - $(CONFIGURE) "$(NT)\monetdb_config.h.in" > monetdb_config.h - -monetdb_hgversion.h: - $(ECHO) #undef MERCURIAL_ID > monetdb_hgversion.h - -unistd.h: - $(ECHO) #ifndef UNISTD_H > unistd.h - $(ECHO) #define UNISTD_H >> unistd.h - $(ECHO) #include "io.h" >> unistd.h - $(ECHO) #ifndef __cplusplus >> unistd.h - $(ECHO) #define open _open >> unistd.h - $(ECHO) #define read _read >> unistd.h - $(ECHO) #define write _write >> unistd.h - $(ECHO) #define close _close >> unistd.h - $(ECHO) #define getpid _getpid >> unistd.h - $(ECHO) #define umask _umask >> unistd.h - $(ECHO) #define isatty _isatty >> unistd.h - $(ECHO) #endif >> unistd.h - $(ECHO) #endif >> unistd.h - -.monetdb: - $(ECHO) user=monetdb> .monetdb - $(ECHO) password=monetdb>> .monetdb - -targetdirs: - if not exist "$(bindir)" $(MKDIR) "$(bindir)" - if not exist "$(sbindir)" $(MKDIR) "$(sbindir)" - if not exist "$(libexecdir)" $(MKDIR) "$(libexecdir)" - if not exist "$(datadir)" $(MKDIR) "$(datadir)" - if not exist "$(sysconfdir)" $(MKDIR) "$(sysconfdir)" - if not exist "$(localstatedir)" $(MKDIR) "$(localstatedir)" - if not exist "$(libdir)" $(MKDIR) "$(libdir)" - if not exist "$(infodir)" $(MKDIR) "$(infodir)" - if not exist "$(mandir)" $(MKDIR) "$(mandir)" - if not exist "$(includedir)" $(MKDIR) "$(includedir)" - if not exist "$(pkgdatadir)" $(MKDIR) "$(pkgdatadir)" - if not exist "$(pkglibdir)" $(MKDIR) "$(pkglibdir)" - if not exist "$(pkgincludedir)" $(MKDIR) "$(pkgincludedir)" - diff --git a/NT/makelibdef.py b/NT/makelibdef.py deleted file mode 100644 --- a/NT/makelibdef.py +++ /dev/null @@ -1,8 +0,0 @@ -import fileinput, re -p = re.compile('^\s*\d+\s+[0-9A-F]+\s+[0-9A-F]+\s+(\w+)') -print('LIBRARY R') -print('EXPORTS') -for line in fileinput.input(): - m = p.match(line) - if m: - print(m.group(1)) diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in deleted file mode 100644 --- a/NT/monetdb_config.h.in +++ /dev/null @@ -1,889 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. - */ - -/* Manual config.h. needed for win32 . */ - -/* We use the value of _MSC_VER to distinguish the various versions of - * Microsoft Visual Studio: - * _MSC_VER = 1200: Visual Studio 6 - * _MSC_VER = 1310: Visual Studio .NET 2003 (a.k.a. Visual Studio 7) - * _MSC_VER = 1400: Visual Studio 8 - * _MSC_VER = 1500: Visual Studio 9.0 - * _MSC_VER = 1600: Visual Studio 10.0 - * _MSC_VER = 1800: Visual Studio 12.0 - * _MSC_VER = 1900: Visual Studio 14.0 - * - * versions below Visual Studio 12.0 are not supported: they lack - * required C-99 functionality. - */ - -#if defined(_MSC_VER) && _MSC_VER < 1800 -#error old versions of Visual Studio are no longer supported -#endif - -#ifndef _SEEN_MONETDB_CONFIG_H -#define _SEEN_MONETDB_CONFIG_H 1 - -/* Prevent pollution through excessive inclusion of include files by - * Windows.h. */ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif - -/* Visual Studio 8 has deprecated lots of stuff: suppress warnings */ -#ifndef _CRT_SECURE_NO_DEPRECATE -#define _CRT_SECURE_NO_DEPRECATE 1 -#endif - -#include <stdlib.h> -#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC) -/* In this case, malloc and friends are redefined in crtdbg.h to debug - * versions. We need to include stdlib.h first or else we get - * conflicting declarations. */ -#include <crtdbg.h> -#endif - -/* standard C-99 include files */ -#include <assert.h> -#include <errno.h> -#include <inttypes.h> -#include <stdarg.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> - -/* Windows include files */ -#include <process.h> -#include <windows.h> -#include <ws2tcpip.h> - -/* and one more include */ -#include <sys/types.h> - -/* indicate to sqltypes.h that windows.h has already been included and - that it doesn't have to define Windows constants */ -#define ALREADY_HAVE_WINDOWS_TYPE 1 - -#define NATIVE_WIN32 1 - -#ifdef __INTEL_COMPILER -/* Definition of NAN is seriously broken on Intel compiler (at least - * in some versions), so we work around it. */ -#define NAN_CANNOT_BE_USED_AS_INITIALIZER -#endif - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -/* read-only architecture-independent data */ -#define DATA_DIR PREFIX "\\share" - -/* Directory separator */ -#define DIR_SEP '\\' - -/* Directory separator */ -#define DIR_SEP_STR "\\" - -/* architecture-dependent files */ -#define EXEC_PREFIX PREFIX - -/* location where binaries are installed */ -#define BINDIR EXEC_PREFIX "\\bin" - -/* Define to nothing if C supports flexible array members, and to 1 if it does - not. That way, with a declaration like `struct s { int n; double - d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99 - compilers. When computing the size of such an object, don't use 'sizeof - (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)' - instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with - MSVC and with C++ compilers. */ -#define FLEXIBLE_ARRAY_MEMBER - -/* Define to 1 if you have the `asctime_r' function. */ -#define HAVE_ASCTIME_R 1 - -/* Define if you have asctime_r(struct tm*,char *buf,size_t s) */ -#define HAVE_ASCTIME_R3 1 -/* there is something very similar to asctime_r on Windows: */ -#define asctime_r(t,b,s) (asctime_s(b,s,t) == 0 ? (b) : NULL) - -/* Define to 1 if you have the `cbrt' function. */ -#define HAVE_CBRT 1 - -/* Define to 1 if you have the `clock_gettime' function. */ -/* #undef HAVE_CLOCK_GETTIME */ - -/* Define if you have the CommonCrypto library */ -/* #undef HAVE_COMMONCRYPTO */ - -/* Define to 1 if you have the `ctime_r' function. */ -#define HAVE_CTIME_R 1 - -/* Define if you have ctime_r(time_t*,char *buf,size_t s) */ -#define HAVE_CTIME_R3 1 -/* there is something very similar to ctime_r on Windows: */ -#define ctime_r(t,b,s) (ctime_s(b,s,t) == 0 ? (b) : NULL) - -/* Define if you have the cURL library */ -/* #undef HAVE_CURL */ - -/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. - */ -/* #undef HAVE_DECL_TZNAME */ - -/* Define to 1 if you have the <dirent.h> header file. */ -/* #undef HAVE_DIRENT_H */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Support for MonetDB as a library */ -/* #undef HAVE_EMBEDDED */ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list