Changeset: 4d02e9a765a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d02e9a765a8
Modified Files:
gdk/gdk_posix.c
gdk/gdk_posix.h
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Debian
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 2782 to 300 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -315,6 +315,7 @@
"BITS32_FALSE=$(BITS32_FALSE)" \
"BITS64_FALSE=$(BITS64_FALSE)" \
"DOCTOOLS_FALSE=$(DOCTOOLS_FALSE)" \
+ "HAVE_CFITSIO_FALSE=$(HAVE_CFITSIO_FALSE)" \
"HAVE_JAVAJDBC_FALSE=$(HAVE_JAVAJDBC_FALSE)" \
"HAVE_JAVAXRPC_FALSE=$(HAVE_JAVAXRPC_FALSE)" \
"HAVE_JAVA_FALSE=$(HAVE_JAVA_FALSE)" \
@@ -322,6 +323,7 @@
"HAVE_LIBXML2_FALSE=$(HAVE_LIBXML2_FALSE)" \
"HAVE_LIBZ_FALSE=$(HAVE_LIBZ_FALSE)" \
"HAVE_MONETDB5_FALSE=$(HAVE_MONETDB5_FALSE)" \
+ "HAVE_MSEED_FALSE=$(HAVE_MSEED_FALSE)" \
"HAVE_NETCDF_FALSE=$(HAVE_NETCDF_FALSE)" \
"HAVE_OPENSSL_FALSE=$(HAVE_OPENSSL_FALSE)" \
"HAVE_ODBC_FALSE=$(HAVE_ODBC_FALSE)" \
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -48,33 +48,15 @@
("@NOT_WIN32_FALSE@", ''),
("@PATHSEP@", ';')]
-packages = {
- 'MONETDB': 'monetdb',
- 'TESTING': 'monetdb-testing',
- 'CLIENTS': 'monetdb-clients',
- 'MONETDB4': 'monetdb4',
- 'MONETDB5': 'monetdb5',
- 'MONETDB_JAVA': 'monetdb-java',
-}
-
while len(sys.argv) > 2 and '=' in sys.argv[1]:
arg = sys.argv[1]
i = arg.find('=')
subs.append(('@'+arg[:i]+'@', arg[i+1:]))
del sys.argv[1]
- if arg[i-7:i] == '_PREFIX' and packages.has_key(arg[:i-7]):
- config = os.path.join(arg[i+1:], 'bin', packages[arg[:i-7]])
- try:
- p = subprocess.Popen(['%s-config.bat' % config, '--version'],
- universal_newlines = True,
- stdout = subprocess.PIPE)
- out, err = p.communicate()
- val = out.strip()
- if val:
- key = '@%s_VERSION@' % arg[:i-7]
- subs.append((key, val))
- except:
- pass
+ if arg[:i] == 'TOPDIR':
+ subs.append(('@BUILD@', os.path.abspath(arg[i+1:])))
+
+subs.append(('@SOURCE@',
os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0])))))
for key, val in subs[:]:
subs.insert(0, ('@X'+key[1:], val))
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -2,7 +2,7 @@
if not "%1"=="" goto skip
call %0 -rq
-goto end
+goto :EOF
:skip
@@ -10,29 +10,31 @@
set pkg=clients
set buildbase=@XBUILD@
-set builddir=%buildbase%\clients
-set srcdir=@XSOURCE@\clients
+set srcdir=@XSOURCE@
+rem binaries (.exe)
+set PATH=%buildbase%\clients\examples\C;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%PATH%
+set PATH=%buildbase%\clients\odbc\samples;%PATH%
set PATH=%buildbase%\testing;%PATH%
-set
PATH=%builddir%\examples\C;%builddir%\examples\php;%builddir%\examples\python;%builddir%\perl\Tests;%PATH%
-set PATH=%builddir%\mapiclient;%PATH%
-set PATH=%builddir%\mapilib;%PATH%
+rem libraries (.dll)
+set PATH=%buildbase%\clients\mapilib;%PATH%
+set PATH=%buildbase%\clients\perl\Cimpl;%PATH%
+set PATH=%buildbase%\common\stream;%PATH%
-set
PYTHONPATH=%builddir%\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
-set perlib=%builddir%\perl;%srcdir%\perl
+set perlib=%buildbase%\clients\perl;%srcdir%\clients\perl
set PERLLIB=%perlib%;%PERLLIB%
set PERL5LIB=%perlib%;%PERL5LIB%
-REM execute Mtest.py in the source directory
-pushd %srcdir%
+rem execute Mtest.py in the source directory
+pushd "%srcdir%"
-call "%buildbase%\testing\Mtest.py" --package=%pkg%
"--dbfarm=%builddir%\dbfarm" "--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\Mtest.py" "--package=%pkg%"
"--dbfarm=%buildbase%\%pkg%\dbfarm" "--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3
%4 %5 %6 %7 %8 %9
popd
endlocal
-
-:end
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
@@ -101,6 +101,8 @@
#ifdef SQLLEN /* it's a define for 32, a typedef for 64 */
#define LENFMT "%d"
#define ULENFMT "%u"
+#define LENCAST (int)
+#define ULENCAST (unsigned int)
#else
#ifdef _MSC_VER
#define LENFMT "%I64d"
@@ -109,6 +111,8 @@
#define LENFMT "%ld"
#define ULENFMT "%lu"
#endif
+#define LENCAST (long)
+#define ULENCAST (unsigned long)
#endif
/* these functions are called from within the library */
diff --git a/clients/odbc/driver/SQLBindCol.c b/clients/odbc/driver/SQLBindCol.c
--- a/clients/odbc/driver/SQLBindCol.c
+++ b/clients/odbc/driver/SQLBindCol.c
@@ -52,7 +52,7 @@
ODBCDesc *desc; /* Application Row Descriptor */
#ifdef ODBCDEBUG
- ODBCLOG("SQLBindCol " PTRFMT " %d %d " LENFMT "\n", PTRFMTCAST hStmt,
nCol, nTargetType, nTargetValueMax);
+ ODBCLOG("SQLBindCol " PTRFMT " %d %d " LENFMT "\n", PTRFMTCAST hStmt,
nCol, nTargetType, LENCAST nTargetValueMax);
#endif
if (!isValidStmt(stmt))
diff --git a/clients/odbc/driver/SQLBindParameter.c
b/clients/odbc/driver/SQLBindParameter.c
--- a/clients/odbc/driver/SQLBindParameter.c
+++ b/clients/odbc/driver/SQLBindParameter.c
@@ -256,7 +256,7 @@
SQLLEN BufferLength, SQLLEN *StrLen_or_IndPtr)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLBindParameter " PTRFMT " %hd %hd %hd %hd " ULENFMT "
%hd\n", PTRFMTCAST hStmt, ParameterNumber, InputOutputType, ValueType,
ParameterType, ColumnSize, DecimalDigits);
+ ODBCLOG("SQLBindParameter " PTRFMT " %hd %hd %hd %hd " ULENFMT "
%hd\n", PTRFMTCAST hStmt, ParameterNumber, InputOutputType, ValueType,
ParameterType, ULENCAST ColumnSize, DecimalDigits);
#endif
return SQLBindParameter_((ODBCStmt *) hStmt, ParameterNumber,
InputOutputType, ValueType, ParameterType, ColumnSize, DecimalDigits,
ParameterValuePtr, BufferLength, StrLen_or_IndPtr);
diff --git a/clients/odbc/driver/SQLExtendedFetch.c
b/clients/odbc/driver/SQLExtendedFetch.c
--- a/clients/odbc/driver/SQLExtendedFetch.c
+++ b/clients/odbc/driver/SQLExtendedFetch.c
@@ -55,7 +55,7 @@
SQLRETURN rc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLExtendedFetch " PTRFMT " %d " LENFMT "\n", PTRFMTCAST
hStmt, nOrientation, (SQLLEN) nOffset);
+ ODBCLOG("SQLExtendedFetch " PTRFMT " %d " LENFMT "\n", PTRFMTCAST
hStmt, nOrientation, LENCAST nOffset);
#endif
if (!isValidStmt(stmt))
diff --git a/clients/odbc/driver/SQLFetchScroll.c
b/clients/odbc/driver/SQLFetchScroll.c
--- a/clients/odbc/driver/SQLFetchScroll.c
+++ b/clients/odbc/driver/SQLFetchScroll.c
@@ -174,7 +174,7 @@
ODBCStmt *stmt = (ODBCStmt *) hStmt;
#ifdef ODBCDEBUG
- ODBCLOG("SQLFetchScroll " PTRFMT " %d " LENFMT "\n", PTRFMTCAST hStmt,
FetchOrientation, (SQLLEN) FetchOffset);
+ ODBCLOG("SQLFetchScroll " PTRFMT " %d " LENFMT "\n", PTRFMTCAST hStmt,
FetchOrientation, LENCAST FetchOffset);
#endif
if (!isValidStmt(stmt))
diff --git a/clients/odbc/driver/SQLGetConnectAttr.c
b/clients/odbc/driver/SQLGetConnectAttr.c
--- a/clients/odbc/driver/SQLGetConnectAttr.c
+++ b/clients/odbc/driver/SQLGetConnectAttr.c
@@ -123,7 +123,7 @@
SQLINTEGER *StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetConnectAttr " PTRFMT " %d\n", PTRFMTCAST hDbc,
Attribute);
+ ODBCLOG("SQLGetConnectAttr " PTRFMT " %d\n", PTRFMTCAST hDbc, (int)
Attribute);
#endif
if (!isValidDbc((ODBCDbc *) hDbc))
@@ -158,7 +158,7 @@
SQLINTEGER n;
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetConnectAttrW " PTRFMT " %d\n", PTRFMTCAST hDbc,
Attribute);
+ ODBCLOG("SQLGetConnectAttrW " PTRFMT " %d\n", PTRFMTCAST hDbc, (int)
Attribute);
#endif
if (!isValidDbc(dbc))
diff --git a/clients/odbc/driver/SQLGetEnvAttr.c
b/clients/odbc/driver/SQLGetEnvAttr.c
--- a/clients/odbc/driver/SQLGetEnvAttr.c
+++ b/clients/odbc/driver/SQLGetEnvAttr.c
@@ -52,7 +52,7 @@
ODBCEnv *env = (ODBCEnv *) EnvironmentHandle;
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetEnvAttr " PTRFMT " %d\n", PTRFMTCAST EnvironmentHandle,
Attribute);
+ ODBCLOG("SQLGetEnvAttr " PTRFMT " %d\n", PTRFMTCAST EnvironmentHandle,
(int) Attribute);
#endif
(void) BufferLength; /* Stefan: unused!? */
diff --git a/clients/odbc/driver/SQLGetStmtAttr.c
b/clients/odbc/driver/SQLGetStmtAttr.c
--- a/clients/odbc/driver/SQLGetStmtAttr.c
+++ b/clients/odbc/driver/SQLGetStmtAttr.c
@@ -151,7 +151,7 @@
SQLINTEGER *StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetStmtAttr " PTRFMT " %d\n", PTRFMTCAST hStmt, Attribute);
+ ODBCLOG("SQLGetStmtAttr " PTRFMT " %d\n", PTRFMTCAST hStmt, (int)
Attribute);
#endif
if (!isValidStmt((ODBCStmt *) hStmt))
@@ -181,7 +181,7 @@
SQLINTEGER *StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetStmtAttrW " PTRFMT " %d\n", PTRFMTCAST hStmt, Attribute);
+ ODBCLOG("SQLGetStmtAttrW " PTRFMT " %d\n", PTRFMTCAST hStmt, (int)
Attribute);
#endif
if (!isValidStmt((ODBCStmt *) hStmt))
diff --git a/clients/odbc/driver/SQLNativeSql.c
b/clients/odbc/driver/SQLNativeSql.c
--- a/clients/odbc/driver/SQLNativeSql.c
+++ b/clients/odbc/driver/SQLNativeSql.c
@@ -58,7 +58,7 @@
return SQL_ERROR;
}
#ifdef ODBCDEBUG
- ODBCLOG("\"%.*s\"\n", cbSqlStrIn, (char*)szSqlStrIn);
+ ODBCLOG("\"%.*s\"\n", (int) cbSqlStrIn, (char *) szSqlStrIn);
#endif
query = ODBCTranslateSQL(szSqlStrIn, (size_t) cbSqlStrIn, stmt->noScan);
diff --git a/clients/odbc/driver/SQLParamOptions.c
b/clients/odbc/driver/SQLParamOptions.c
--- a/clients/odbc/driver/SQLParamOptions.c
+++ b/clients/odbc/driver/SQLParamOptions.c
@@ -45,7 +45,7 @@
RETCODE rc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLParamOptions " PTRFMT " " ULENFMT "\n", PTRFMTCAST hStmt,
nRow);
+ ODBCLOG("SQLParamOptions " PTRFMT " " ULENFMT "\n", PTRFMTCAST hStmt,
ULENCAST nRow);
#endif
/* use mapping as described in ODBC 3 SDK Help file */
diff --git a/clients/odbc/driver/SQLSetConnectAttr.c
b/clients/odbc/driver/SQLSetConnectAttr.c
--- a/clients/odbc/driver/SQLSetConnectAttr.c
+++ b/clients/odbc/driver/SQLSetConnectAttr.c
@@ -104,7 +104,7 @@
SQLINTEGER StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetConnectAttr " PTRFMT " %d\n", PTRFMTCAST
ConnectionHandle, Attribute);
+ ODBCLOG("SQLSetConnectAttr " PTRFMT " %d\n", PTRFMTCAST
ConnectionHandle, (int) Attribute);
#endif
if (!isValidDbc((ODBCDbc *) ConnectionHandle))
@@ -137,7 +137,7 @@
SQLRETURN rc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetConnectAttrW " PTRFMT " %d\n", PTRFMTCAST
ConnectionHandle, Attribute);
+ ODBCLOG("SQLSetConnectAttrW " PTRFMT " %d\n", PTRFMTCAST
ConnectionHandle, (int) Attribute);
#endif
if (!isValidDbc(dbc))
diff --git a/clients/odbc/driver/SQLSetConnectOption.c
b/clients/odbc/driver/SQLSetConnectOption.c
--- a/clients/odbc/driver/SQLSetConnectOption.c
+++ b/clients/odbc/driver/SQLSetConnectOption.c
@@ -87,7 +87,7 @@
ODBCDbc *dbc = (ODBCDbc *) hDbc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetConnectOption " PTRFMT " %d " ULENFMT "\n", PTRFMTCAST
hDbc, nOption, vParam);
+ ODBCLOG("SQLSetConnectOption " PTRFMT " %d " ULENFMT "\n", PTRFMTCAST
hDbc, nOption, ULENCAST vParam);
#endif
if (!isValidDbc(dbc))
@@ -118,7 +118,7 @@
SQLRETURN rc;
#ifdef ODBCDEBUG
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
