Changeset: 77e0b40bb4d1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77e0b40bb4d1
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal_runtime.c
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/storage/store.c
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/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: unlock
Log Message:
Merge with default branch.
diffs (truncated from 5535 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,6 @@ include(monetdb-toolchain)
monetdb_default_toolchain()
#monetdb_default_compiler_options()
-
include(monetdb-defines)
monetdb_hg_revision()
@@ -155,6 +154,7 @@ add_subdirectory(tools)
if(TESTING)
add_subdirectory(testing)
endif()
+add_subdirectory(buildtools)
include(CMakePackageConfigHelpers)
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -4,7 +4,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-# python mkodbcwxs.py VERSION makedefs.txt PREFIX >
PREFIX/MonetDB-ODBC-Installer.wxs
+# python mkodbcwxs.py VERSION BITS PREFIX > PREFIX/MonetDB-ODBC-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch
x64/x86 PREFIX/MonetDB-ODBC-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03
-sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB-ODBC-Installer.wixobj
@@ -29,21 +29,19 @@ def comp(features, id, depth, files, fid
def main():
if len(sys.argv) != 4:
- print(r'Usage: mkodbcwxs.py version makedefs.txt installdir')
+ print(r'Usage: mkodbcwxs.py version bits installdir')
return 1
- makedefs = {}
- for line in open(sys.argv[2]):
- key, val = line.strip().split('=', 1)
- makedefs[key] = val
- if makedefs['bits'] == '64':
+ if sys.argv[2] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
libcrypto = '-x64'
+ vcpkg = r'C:\vcpkg\installed\x64-windows\{}'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
libcrypto = ''
- vs = os.getenv('vs') # inherited from TestTools\common.bat
+ vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
+ vs = '2019'
features = []
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
@@ -59,7 +57,7 @@ def main():
print(r' <CustomAction Id="driverinstall" FileKey="odbcinstall"
ExeCommand="/Install" Execute="deferred" Impersonate="no"/>')
print(r' <CustomAction Id="driveruninstall" FileKey="odbcinstall"
ExeCommand="/Uninstall" Execute="deferred" Impersonate="no"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20{}\Community\VC\Redist\MSVC'.format(vs)
+ msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\{}\Community\VC\Redist\MSVC'.format(vs)
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_{}.msm'.format(arch)
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
@@ -72,14 +70,14 @@ def main():
id = 1
print(r' <Directory Id="lib" Name="lib">')
id = comp(features, id, 14,
- [r'lib\libmapi.dll', r'lib\libmapi.pdb',
- r'lib\libMonetODBC.dll', r'lib\libMonetODBC.pdb',
- r'lib\libMonetODBCs.dll', r'lib\libMonetODBCs.pdb',
- r'lib\libstream.dll', r'lib\libstream.pdb',
- r'{}\bin\iconv-2.dll'.format(makedefs['LIBICONV']),
- r'{}\bin\libbz2.dll'.format(makedefs['LIBBZIP2']),
- r'{}\bin\libcrypto-1_1{}.dll'.format(makedefs['LIBOPENSSL'],
libcrypto),
- r'{}\bin\zlib1.dll'.format(makedefs['LIBZLIB'])])
+ [r'bin\mapi.dll', # r'lib\mapi.pdb',
+ r'bin\MonetODBC.dll', # r'lib\MonetODBC.pdb',
+ r'bin\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
+ r'bin\stream.dll', # r'lib\stream.pdb',
+ vcpkg.format(r'bin\libiconv.dll'),
+ vcpkg.format(r'bin\bz2.dll'),
+ vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)),
+ vcpkg.format(r'bin\zlib1.dll')])
print(r' </Directory>')
id = comp(features, id, 12,
[r'license.rtf'])
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -4,7 +4,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-# python mksqlwxs.py VERSION makedefs.txt PREFIX >
PREFIX/MonetDB5-SQL-Installer.wxs
+# python mksqlwxs.py VERSION BITS PREFIX > PREFIX/MonetDB5-SQL-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch
x64/x86 PREFIX/MonetDB5-SQL-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03
-sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB5-SQL-Installer.wixobj
@@ -36,21 +36,19 @@ def comp(features, id, depth, files, nam
def main():
if len(sys.argv) != 4:
- print(r'Usage: mksqlwxs.py version makedefs.txt installdir')
+ print(r'Usage: mksqlwxs.py version bits installdir')
return 1
- makedefs = {}
- for line in open(sys.argv[2]):
- key, val = line.strip().split('=', 1)
- makedefs[key] = val
- if makedefs['bits'] == '64':
+ if sys.argv[2] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
libcrypto = '-x64'
+ vcpkg = r'C:\vcpkg\installed\x64-windows\{}'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
libcrypto = ''
- vs = os.getenv('vs') # inherited from TestTools\common.bat
+ vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
+ vs = '2019'
features = []
extend = []
debug = []
@@ -104,7 +102,7 @@ def main():
print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20{}\Community\VC\Redist\MSVC'.format(vs)
+ msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\{}\Community\VC\Redist\MSVC'.format(vs)
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_{}.msm'.format(arch)
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
@@ -126,29 +124,27 @@ def main():
[r'bin\mclient.exe',
r'bin\mserver5.exe',
r'bin\msqldump.exe',
- r'bin\stethoscope.exe',
- r'lib\libbat.dll',
- r'lib\libmapi.dll',
- r'lib\libmonetdb5.dll',
- r'lib\libstream.dll',
- r'{}\bin\iconv-2.dll'.format(makedefs['LIBICONV']),
- r'{}\bin\libbz2.dll'.format(makedefs['LIBBZIP2']),
- r'{}\bin\libcrypto-1_1{}.dll'.format(makedefs['LIBOPENSSL'],
libcrypto),
- r'{}\bin\libxml2.dll'.format(makedefs['LIBXML2']),
- r'{}\bin\pcre.dll'.format(makedefs['LIBPCRE']),
- r'{}\bin\zlib1.dll'.format(makedefs['LIBZLIB'])])
- id = comp(debug, id, 14,
- [r'bin\mclient.pdb',
- r'bin\mserver5.pdb',
- r'bin\msqldump.pdb',
- r'bin\stethoscope.pdb',
- r'lib\libbat.pdb',
- r'lib\libmapi.pdb',
- r'lib\libmonetdb5.pdb',
- r'lib\libstream.pdb'])
+ r'bin\gdk.dll',
+ r'bin\mapi.dll',
+ r'bin\monetdb5.dll',
+ r'bin\stream.dll',
+ vcpkg.format(r'bin\libiconv.dll'),
+ vcpkg.format(r'bin\bz2.dll'),
+ vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)),
+ vcpkg.format(r'bin\libxml2.dll'),
+ vcpkg.format(r'bin\pcre.dll'),
+ vcpkg.format(r'bin\zlib1.dll')])
+ # id = comp(debug, id, 14,
+ # [r'bin\mclient.pdb',
+ # r'bin\mserver5.pdb',
+ # r'bin\msqldump.pdb',
+ # r'lib\libbat.pdb',
+ # r'lib\libmapi.pdb',
+ # r'lib\libmonetdb5.pdb',
+ # r'lib\libstream.pdb'])
id = comp(geom, id, 14,
- [r'{}\bin\geos_c.dll'.format(makedefs['LIBGEOS']),
- r'{}\bin\geos.dll'.format(makedefs['LIBGEOS'])])
+ [vcpkg.format(r'bin\geos_c.dll'),
+ vcpkg.format(r'bin\geos.dll')])
print(r' </Directory>')
print(r' <Directory Id="etc" Name="etc">')
id = comp(features, id, 14, [r'etc\.monetdb'])
@@ -176,19 +172,19 @@ def main():
id = comp(geom, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(pyapi3, id, 16,
- [r'lib\monetdb5\lib_pyapi3.dll'])
+ [r'lib\monetdb5\_pyapi3.dll'])
print(r' </Directory>')
id = comp(extend, id, 14,
- [r'lib\libbat.lib',
- r'lib\libmapi.lib',
- r'lib\libmonetdb5.lib',
- r'lib\libstream.lib',
- r'{}\lib\iconv.dll.lib'.format(makedefs['LIBICONV']),
- r'{}\lib\libbz2.lib'.format(makedefs['LIBBZIP2']),
- r'{}\lib\libcrypto.lib'.format(makedefs['LIBOPENSSL']),
- r'{}\lib\libxml2.lib'.format(makedefs['LIBXML2']),
- r'{}\lib\pcre.lib'.format(makedefs['LIBPCRE']),
- r'{}\lib\zdll.lib'.format(makedefs['LIBZLIB'])])
+ [r'lib\gdk.lib',
+ r'lib\mapi.lib',
+ r'lib\monetdb5.lib',
+ r'lib\stream.lib',
+ vcpkg.format(r'lib\libiconv.lib'),
+ vcpkg.format(r'lib\bz2.lib'),
+ vcpkg.format(r'lib\libcrypto.lib'),
+ vcpkg.format(r'lib\libxml2.lib'),
+ vcpkg.format(r'lib\pcre.lib'),
+ vcpkg.format(r'lib\zlib.lib')])
print(r' </Directory>')
print(r' <Directory Id="share" Name="share">')
print(r' <Directory Id="doc" Name="doc">')
@@ -207,8 +203,7 @@ def main():
id = comp(features, id, 12,
[r'license.rtf',
r'M5server.bat',
- r'msqldump.bat',
- r'stethoscope.bat'])
+ r'msqldump.bat'])
id = comp(pyapi3, id, 12,
[r'pyapi_locatepython3.bat'])
id = comp(features, id, 12,
diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/buildtools/CMakeLists.txt
@@ -0,0 +1,9 @@
+#[[
+# 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.
+#]]
+
+add_subdirectory(conf)
diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/buildtools/conf/CMakeLists.txt
@@ -0,0 +1,19 @@
+#[[
+# 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.
+#]]
+
+if(WIN32)
+ install(FILES
+ banner.bmp
+ license.rtf
+ monetdb.ico
+ website.html
+ DESTINATION ${CMAKE_INSTALL_PREFIX}
+ COMPONENT server)
+endif()
+
+# vim: set ts=2:sw=2:et
diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
--- a/clients/CMakeLists.txt
+++ b/clients/CMakeLists.txt
@@ -10,3 +10,6 @@ add_subdirectory(mapiclient)
add_subdirectory(mapilib)
add_subdirectory(odbc)
add_subdirectory(examples)
+if(WIN32)
+ add_subdirectory(NT)
+endif()
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/clients/NT/CMakeLists.txt
@@ -0,0 +1,17 @@
+#[[
+# 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.
+#]]
+
+if(WIN32)
+ install(FILES
+ mclient.bat
+ msqldump.bat
+ DESTINATION ${CMAKE_INSTALL_PREFIX}
+ COMPONENT server)
+endif()
+
+# vim: set ts=2:sw=2:et
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
