Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Change odbcStubs.h and odbcStubInit.c so that stub generation is again supported. Regenerate ODBC stubs. Fix errors in Makefile.in logic that governs test platform selection |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | detect-sqlwchar-size |
Files: | files | file ages | folders |
SHA3-256: |
6ee8d704f3bd8ff4426b9a94345bd540 |
User & Date: | kbk 2018-05-12 16:39:28.517 |
Context
2018-05-12
| ||
16:47 | Advance version to 1.1.0 Closed-Leaf check-in: afd530a0ed user: kbk tags: detect-sqlwchar-size | |
16:39 | Change odbcStubs.h and odbcStubInit.c so that stub generation is again supported. Regenerate ODBC stubs. Fix errors in Makefile.in logic that governs test platform selection check-in: 6ee8d704f3 user: kbk tags: detect-sqlwchar-size | |
2018-05-09
| ||
15:21 | add missing pieces to the changes, thanks apn for testing check-in: e566edc779 user: chw tags: detect-sqlwchar-size | |
Changes
Changes to Makefile.in.
︙ | ︙ | |||
231 232 233 234 235 236 237 | $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \ done test: test-jet test-sqlserver test-sqlite test-jet: binaries libraries @echo testing tdbcodbc against Jet | | | | | | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \ done test: test-jet test-sqlserver test-sqlite test-jet: binaries libraries @echo testing tdbcodbc against Jet TDBCODBC_TEST_TYPE=jet \ $(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \ -load "package ifneeded tdbc::odbc $(PACKAGE_VERSION) \ [list source `@CYGPATH@ $(srcdir)/library/tdbcodbc.tcl`]\;[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]" test-sqlserver: binaries libraries @echo testing tdbcodbc against SQL Server TDBCODBC_TEST_TYPE=sqlserver \ $(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \ -load "package ifneeded tdbc::odbc ${PACKAGE_VERSION} \ [list source `@CYGPATH@ $(srcdir)/library/tdbcodbc.tcl`]\;[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]" test-sqlite: binaries libraries @echo testing tdbcodbc against SQLite TDBCODBC_TEST_TYPE=sqlite \ $(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \ -load "package ifneeded tdbc::odbc ${PACKAGE_VERSION} \ [list source `@CYGPATH@ $(srcdir)/library/tdbcodbc.tcl`]\;[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]" valgrind-sqlite: binaries libraries TDBCODBC_TEST_TYPE=sqlite \ $(PKG_ENV) $(TCLSH_ENV) \ LD_PRELOAD=$(PKG_LIB_FILE) \ $(VALGRIND) $(VALGRINDARGS) \ $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \ -load "package ifneeded tdbc::odbc ${PACKAGE_VERSION} \ [list source `@CYGPATH@ $(srcdir)/library/tdbcodbc.tcl`]\;[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]" |
︙ | ︙ |
Changes to generic/odbcStubDefs.txt.
︙ | ︙ | |||
8 9 10 11 12 13 14 | # that the material in this file is not subject to copyright, under the # doctrines of scenes a faire and of the merger of idea and expression. # Accordingly, this file is in the public domain. # #----------------------------------------------------------------------------- * STUBSTRUCT: odbcStubs | < | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # that the material in this file is not subject to copyright, under the # doctrines of scenes a faire and of the merger of idea and expression. # Accordingly, this file is in the public domain. # #----------------------------------------------------------------------------- * STUBSTRUCT: odbcStubs * CONVENTION: SQL_API SQLRETURN SQLAllocHandle(SQLSMALLINT,SQLHANDLE,SQLHANDLE*); SQLRETURN SQLBindParameter(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*); SQLRETURN SQLCloseCursor(SQLHSTMT); SQLRETURN SQLColumnsW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT ,SQLWCHAR*,SQLSMALLINT ); SQLRETURN SQLDataSourcesW(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*); |
︙ | ︙ |
Changes to generic/odbcStubInit.c.
1 2 3 4 5 6 | /* * odbcStubInit.c -- * * Stubs tables for the foreign ODBC libraries so that * Tcl extensions can use them without the linker's knowing about them. * | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | /* * odbcStubInit.c -- * * Stubs tables for the foreign ODBC libraries so that * Tcl extensions can use them without the linker's knowing about them. * * @CREATED@ 2018-05-12 16:18:48Z by genExtStubs.tcl from odbcStubDefs.txt * * Copyright (c) 2010 by Kevin B. Kenny. * * Please refer to the file, 'license.terms' for the conditions on * redistribution of this file and for a DISCLAIMER OF ALL WARRANTIES. * *----------------------------------------------------------------------------- |
︙ | ︙ | |||
54 55 56 57 58 59 60 | static const char *const odbcOptLibNumbers[] = { "", "2.6", "0.0", NULL }; #else static const char *const odbcStubLibNames[] = { | < | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | static const char *const odbcOptLibNumbers[] = { "", "2.6", "0.0", NULL }; #else static const char *const odbcStubLibNames[] = { #if defined(__APPLE__) "libiodbc.2", #elif defined(__OpenBSD__) "libiodbc", #else "odbc32", "odbc", "libodbc32", "libodbc", "libiodbc", #endif |
︙ | ︙ |
Changes to generic/odbcStubs.h.
1 2 3 | /* *----------------------------------------------------------------------------- * | | | < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* *----------------------------------------------------------------------------- * * odbcStubs.h -- * * Stubs for procedures in odbcStubDefs.txt * * Generated by genExtStubs.tcl: DO NOT EDIT * 2018-05-12 16:18:48Z * *----------------------------------------------------------------------------- */ typedef struct odbcStubDefs { SQLRETURN (SQL_API*SQLAllocHandlePtr)(SQLSMALLINT,SQLHANDLE,SQLHANDLE*); SQLRETURN (SQL_API*SQLBindParameterPtr)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*); SQLRETURN (SQL_API*SQLCloseCursorPtr)(SQLHSTMT); SQLRETURN (SQL_API*SQLColumnsWPtr)(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT ,SQLWCHAR*,SQLSMALLINT ); SQLRETURN (SQL_API*SQLDataSourcesWPtr)(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*); SQLRETURN (SQL_API*SQLDescribeColWPtr)(SQLHSTMT,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*); SQLRETURN (SQL_API*SQLDescribeParamPtr)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*); |
︙ | ︙ |