Changeset: a84d813e7f57 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a84d813e7f57 Modified Files: MonetDB.spec NT/mksqlwxs.py README.rst buildtools/autogen/setup.py buildtools/conf/website.html clients/mapiclient/mclient.1 debian/control sql/backends/monet5/UDF/cudf/README tools/mserver/monet_version.c.in tools/mserver/mserver5.c Branch: default Log Message:
Merge with Jul2017 branch. diffs (155 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -131,8 +131,8 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 -URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2 +URL: https://www.monetdb.org/ +Source: https://www.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -107,6 +107,16 @@ def main(): id = comp(features, id, 16, [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x: x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))]) print(r' </Directory>') + id = comp(features, id, 14, + [r'lib\libmapi.lib', + r'lib\libstream.lib', + r'%s\lib\iconv.lib' % makedefs['LIBICONV'], + r'%s\lib\libbz2.lib' % makedefs['LIBBZIP2'], + r'%s\lib\libeay32.lib' % makedefs['LIBOPENSSL'], + r'%s\lib\libxml2.lib' % makedefs['LIBXML2'], + r'%s\lib\pcre.lib' % makedefs['LIBPCRE'], + r'%s\lib\ssleay32.lib' % makedefs['LIBOPENSSL'], + r'%s\lib\zdll.lib' % makedefs['LIBZLIB']]) print(r' </Directory>') print(r' <Directory Id="share" Name="share">') print(r' <Directory Id="doc" Name="doc">') @@ -134,7 +144,7 @@ def main(): args = '/STARTED-FROM-MENU -lsql -Ecp437', sid = 'mclient_bat') id = comp(features, id, 12, - [r'MSQLServer.bat'], + [r'MSQLserver.bat'], name = 'MonetDB SQL Server', sid = 'msqlserver_bat') print(r' </Directory>') diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -2,16 +2,16 @@ The MonetDB Database System =========================== The MonetDB database is developed by the CWI database research group -(see http://www.monetdb.org/). +(see https://www.monetdb.org/). Via the MonetDB project we have brought the MonetDB system in open source, -where it is accessible at http://www.monetdb.org/Downloads/ +where it is accessible at https://www.monetdb.org/Downloads/ The MonetDB database system is a high-performance database kernel for query-intensive applications. The MonetDB source can be found at our `Mercurial server`__. There is also a `github mirror`__ that is updated once a day. -.. _MonetDB: http://dev.monetdb.org/hg/MonetDB/ +.. _MonetDB: https://dev.monetdb.org/hg/MonetDB/ __ MonetDB_ .. _github: https://github.com/MonetDB/MonetDB diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py --- a/buildtools/autogen/setup.py +++ b/buildtools/autogen/setup.py @@ -13,7 +13,7 @@ setup(name = "autogen", description = "MonetDB autogen script", author = "MonetDB Team, CWI", author_email = "i...@monetdb.org", - url = "http://www.monetdb.org/";, + url = "https://www.monetdb.org/";, maintainer = "Sjoerd Mullender", maintainer_email = "i...@monetdb.org", license = "Mozilla Public License, v. 2.0", diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -10,7 +10,7 @@ Copyright 1997 - July 2008 CWI, August 2 <html> <head> <title>redirect</title> - <meta http-equiv="Refresh" content="0;URL=http://www.monetdb.org/";> + <meta http-equiv="Refresh" content="0;URL=https://www.monetdb.org/";> </head> <body> diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1 --- a/clients/mapiclient/mclient.1 +++ b/clients/mapiclient/mclient.1 @@ -444,7 +444,7 @@ in the CSV file. This, because otherwise the remainder of the file will be interpreted as SQL queries. .PP -See http://www.monetdb.org/Documentation/Manuals/SQLreference/CopyInto +See https://www.monetdb.org/Documentation/Manuals/SQLreference/CopyInto for more information about the COPY INTO query. .SH SEE ALSO .IR msqldump (1), diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: monetdb Section: misc Priority: extra Maintainer: MonetDB BV <i...@monetdb.org> -Homepage: http://www.monetdb.org/ -Vcs-Browser: http://dev.monetdb.org/hg/MonetDB/ -Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/ +Homepage: https://www.monetdb.org/ +Vcs-Browser: https://dev.monetdb.org/hg/MonetDB/ +Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/ Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev, libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0), libpcre3-dev, libreadline-dev, liblzma-dev, diff --git a/sql/backends/monet5/UDF/cudf/README b/sql/backends/monet5/UDF/cudf/README --- a/sql/backends/monet5/UDF/cudf/README +++ b/sql/backends/monet5/UDF/cudf/README @@ -1,7 +1,7 @@ This directory is a template for extending SQL with a new user-defined function (UDF). For further documentation, see the MonetDB website at -http://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/UserDefinedFunction +https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/UserDefinedFunction as well as the Mercurial repository at -http://dev.monetdb.org/hg/MonetDB-extend +https://dev.monetdb.org/hg/MonetDB-extend and especially the file reverse/README.rst in there, which contains a lot of hands-on information for creating a UDF. diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in --- a/tools/mserver/monet_version.c.in +++ b/tools/mserver/monet_version.c.in @@ -49,7 +49,7 @@ monet_version(void) printf("This is an unreleased version\n"); printf("Copyright (c) 1993-July 2008 CWI\n" "Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved\n"); - printf("Visit http://www.monetdb.org/ for further information\n"); + printf("Visit https://www.monetdb.org/ for further information\n"); printf("Found %.1fGiB available memory, %d available cpu core%s\n", sz_mem_gb, cores, cores != 1 ? "s" : ""); /* don't want to GDKinit just for this diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c --- a/tools/mserver/mserver5.c +++ b/tools/mserver/mserver5.c @@ -167,7 +167,7 @@ monet_hello(void) #endif printf("# Copyright (c) 1993-July 2008 CWI.\n"); printf("# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved\n"); - printf("# Visit http://www.monetdb.org/ for further information\n"); + printf("# Visit https://www.monetdb.org/ for further information\n"); // The properties shipped through the performance profiler len = snprintf(monet_characteristics, sizeof(monet_characteristics)-1, "{\n\"version\":\"%s\",\n", VERSION); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
