Changeset: d75bf0508044 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d75bf0508044
Modified Files:
configure.ag
gdk/gdk.h
gdk/gdk_col.c
gdk/gdk_system.c
gdk/gdk_system.h
geom/lib/libgeom.c
geom/lib/libgeom.h
monetdb5/modules/kernel/algebra.mx
sql/backends/monet5/sql.mx
sql/backends/monet5/vaults/Makefile.ag
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 1657 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,7 +1,6 @@
%define name MonetDB
%define version 11.2.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
-%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
# groups of related archs
%define all_x86 i386 i586 i686
@@ -12,6 +11,13 @@
%define bits 64
%endif
+# only add .oidXX suffix if oid size differs from bit size
+%if %{bits} == 64 && %{?oid32:1}%{!?oid32:0}
+%define oidsuf .oid32
+%endif
+
+%define release %{buildno}%{?dist}%{?oidsuf:.oidsuf}
+
Name: %{name}
Version: %{version}
Release: %{release}
diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c
+++ b/buildtools/Mx/Code.c
@@ -70,7 +70,6 @@
break;
case Cdef:
case Csrc:
- case CCsrc:
case Clex:
case Cyacc:
case Prolog:
diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c
+++ b/buildtools/Mx/Def.c
@@ -295,7 +295,6 @@
case Pimpl:
case Cdef:
case Csrc:
- case CCsrc:
case Cyacc:
case Clex:
case Prolog:
diff --git a/buildtools/Mx/Form.c b/buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c
+++ b/buildtools/Mx/Form.c
@@ -164,9 +164,6 @@
case Pspec:
PrCodeDisplay(d, "spec");
break;
- case CCsrc:
- PrCodeDisplay(d, "cc");
- break;
case Csrc:
PrCodeDisplay(d, "c");
break;
diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c
+++ b/buildtools/Mx/Mx.c
@@ -66,13 +66,12 @@
Message("\t-T <string>\tDefine default hide text <string>");
Message("\t-l\t\tNo #line and alike statements");
Message("\t-n\t\tNon changed files won't be touched");
- Message("\t-+\t\tTreat @c (C code) as @C (C++ code)");
}
int
main(int argc, char **argv)
{
- int i, k;
+ int i;
if (argc == 1) {
usage();
@@ -83,7 +82,7 @@
/* Preprocess the arguments.
*/
- while ((i = getopt(argc, argv, "icC:x:Bdg:D:R:H:T:ln+")) != EOF) {
+ while ((i = getopt(argc, argv, "icC:x:Bdg:D:R:H:T:ln")) != EOF) {
switch (i) {
case 'i':
textmode = M_TEXI;
@@ -131,13 +130,6 @@
case 'n':
notouch = 1;
break;
- case '+':
- k = 0;
- do {
- if (str2dir[k].code == Csrc)
- str2dir[k].ext = MX_CXX_SUFFIX;
- } while (str2dir[k++].code != Nop);
- break;
default:
Error("Unknown flag:%c", i);
usage();
@@ -183,7 +175,6 @@
{"+", Section, "",},
{"-", Subsection, "",},
{".", Paragraph, "",},
- {"C", CCsrc, MX_CXX_SUFFIX,},
{"i", Pimpl, "impl",},
{"s", Pspec, "spec",},
{"h", Cdef, "h",},
@@ -251,7 +242,6 @@
};
static struct comments comments[] = {
- { CCsrc, NULL, "//", NULL},
{ Cdef, "/*", " *", " */"},
{ Csrc, "/*", " *", " */"},
{ Cyacc, "/*", " *", " */"},
diff --git a/buildtools/Mx/Mx.h b/buildtools/Mx/Mx.h
--- a/buildtools/Mx/Mx.h
+++ b/buildtools/Mx/Mx.h
@@ -67,7 +67,7 @@
Bfile, Efile, Ofile, Mxmacro, Ifdef, Ifndef, Endif,
Title, Author, Version, Date, InHide, OutHide, Comment,
Module, Section, Subsection, Paragraph, Qcode, Continue,
- Pspec, Pimpl, Cdef, Csrc, CCsrc, ODLspec, SQL,
+ Pspec, Pimpl, Cdef, Csrc, ODLspec, SQL,
OQLspec, Cyacc, Clex, Prolog, Haskell, MALcode,
Qnap, HTML, Java,
ProC, Shell, fGrammar, Macro, XML, DTD, XSL, Config, Swig,
diff --git a/buildtools/Mx/disclaimer.c b/buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.c
+++ b/buildtools/Mx/disclaimer.c
@@ -133,15 +133,13 @@
const char *comment_prefix;
const char *comment_end;
} suffixes[] = {
- {
- "c", "/*", " * ", " */",}, {
- "h", "/*", " * ", " */",}, {
- MX_CXX_SUFFIX, "/*", " * ", " */",}, {
- "html", "<!--", "", " -->",}, {
- "tex", "", "% ", "",}, {
- "mal", "", "# ", "",}, {
- "mx", "", "@' ", ""}, {
- 0, 0, 0, 0}, /* sentinel */
+ {"c", "/*", " * ", " */",},
+ {"h", "/*", " * ", " */",},
+ {"html", "<!--", "", " -->",},
+ {"tex", "", "% ", "",},
+ {"mal", "", "# ", "",},
+ {"mx", "", "@' ", ""},
+ {0, 0, 0, 0}, /* sentinel */
};
#define DISC_SUFFIXES (sizeof(suffixes)/sizeof(siffixes[0]))
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -35,6 +35,7 @@
pushd "%srcdir%"
call "%buildbase%\testing\Mtest.py" "--package=%pkg%"
"--dbfarm=%buildbase%\%pkg%\dbfarm" "--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3
%4 %5 %6 %7 %8 %9
+if ERRORLEVEL 1 exit %ERRORLEVEL%
popd
endlocal
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -785,8 +785,7 @@
if (view) {
/* the table is actually a view */
- mnstr_printf(toConsole, "CREATE VIEW \"%s\".\"%s\" AS %s\n",
- schema, tname, view);
+ mnstr_printf(toConsole, "%s\n", view);
goto doreturn;
}
diff --git a/clients/odbc/driver/ODBCGlobal.h b/clients/odbc/driver/ODBCGlobal.h
--- a/clients/odbc/driver/ODBCGlobal.h
+++ b/clients/odbc/driver/ODBCGlobal.h
@@ -92,7 +92,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
-#include <assert.h>
#ifdef NATIVE_WIN32
# define strdup _strdup
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -35,7 +35,6 @@
#include <unistd.h>
#include <ctype.h>
-#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -464,7 +464,7 @@
enable_strict=$enableval,
enable_strict=$dft_strict)
dnl Set compiler switches.
-dnl The idea/goal is to be as strict as possible, i.e., enable preferable
+dnl The idea/goal is to be as strict as possible, i.e., enable preferably
dnl *all* warnings and make them errors. This should help keeping the code
dnl as clean and portable as possible.
dnl It turned out, though, that this, especially turning all warnings into
@@ -764,7 +764,6 @@
AC_SUBST(THREAD_SAVE_FLAGS)
AC_SUBST(NO_OPTIMIZE_FILES)
-AC_PROG_CXX
AC_PROG_INSTALL
AC_LIBTOOL_DLOPEN
AC_LIBTOOL_WIN32_DLL
@@ -2409,7 +2408,7 @@
fi
if test "x$have_geos" != xno; then
GEOS_INCS="`$GEOS_CONFIG --cflags`"
- GEOS_LIBS="`$GEOS_CONFIG --libs | sed 's:geos:geos_c:'`"
+ GEOS_LIBS="`$GEOS_CONFIG --libs | sed 's:-lgeos:-lgeos_c:'`"
fi
if test "x$have_geos" = xno; then
if test "x$enable_geom" = xyes; then
@@ -2544,15 +2543,6 @@
xmmintrin.h \
])
-AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(iostream,
- AC_DEFINE(HAVE_IOSTREAM, 1,
- [Define to 1 if you have the <iostream> header file.]),,[ ])
-AC_CHECK_HEADER(cstdio,
- AC_DEFINE(HAVE_CSTDIO, 1,
- [Define to 1 if you have the <cstdio> header file.]),,[ ])
-AC_LANG_POP([C++])
-
SOCKET_LIBS=""
have_setsockopt=no
@@ -2930,9 +2920,6 @@
AC_SUBST(HWCOUNTERS_LIBS)
AC_SUBST(HWCOUNTERS_INCS)
-dnl miscellany
-AC_DEFINE(MX_CXX_SUFFIX, "cc", [Suffix for C++ files])
-
dnl check dependencies (might need more than just SQL)
if test x"$enable_sql" = xyes && test x"$enable_monetdb5" = x"no" ; then
AC_MSG_ERROR([sql needs monetdb5]);
@@ -3092,10 +3079,11 @@
dnl add some includes that we want to be there always (by default)
dnl this is kind of bad practice, but consider it legacy that would be
dnl good to clean up some day
-AH_BOTTOM([
+AH_TOP([
#ifndef _SEEN_MONETDB_CONFIG_H
#define _SEEN_MONETDB_CONFIG_H 1
-
+])
+AH_BOTTOM([
/* AC_FUNC_ALLOCA autoconf documented code */
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
@@ -3227,7 +3215,7 @@
echo "MonetDB is configured as follows:"
echo "* Compilation specifics:"
echo " Host: " ${ac_cv_host}
-echo " Compiler: " ${CC}/${CXX}
+echo " Compiler: " ${CC}
echo " CFLAGS: " ${CFLAGS}
echo " X_CFLAGS: " ${X_CFLAGS}
echo " LDFLAGS: " ${LDFLAGS}
diff --git a/debian/python-monetdb.install b/debian/python-monetdb.install
--- a/debian/python-monetdb.install
+++ b/debian/python-monetdb.install
@@ -1,2 +1,2 @@
debian/tmp/usr/lib/python2.6/site-packages/monetdb
usr/lib/python2.6/site-packages
-debian/tmp/usr/lib/python2.6/site-packages/python_monetdb-1.0-py2.6.egg-info
usr/lib/python2.6/site-packages
+debian/tmp/usr/lib/python2.6/site-packages/python_monetdb-*.egg-info
usr/lib/python2.6/site-packages
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1364,26 +1364,13 @@
return bi;
}
-#define BUNfirst(b) ((b)->first)
-#ifdef NDEBUG
-#define BUNlast(b) ((b)->first + (b)->count)
-#else
-static inline BUN
-BUNlast(COL *b)
-{
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
