tdbc::odbc

Check-in [6533ba3bfa]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Add $(TDBC_BIN_DIR) to $(TCLLIBPATH) and remove [package ifneeded] script for tdbc from the test target. See https://core.tcl.tk/tdbc/info/c5f7bcffcb626767.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | stu-pkgIndex
Files: files | file ages | folders
SHA3-256: 6533ba3bfa8d57c8814359ef3c7211dee38e8350f3349c5d62f4bdb92ca7961d
User & Date: stu 2017-12-16 23:05:45.894
Context
2018-01-05
06:52
Merge trunk. Closed-Leaf check-in: 0170f895de user: stu tags: stu-pkgIndex
2017-12-16
23:05
Add $(TDBC_BIN_DIR) to $(TCLLIBPATH) and remove [package ifneeded] script for tdbc from the test target. See https://core.tcl.tk/tdbc/info/c5f7bcffcb626767. check-in: 6533ba3bfa user: stu tags: stu-pkgIndex
00:46
Use TEA's CONFIG_CLEAN_FILES instead of user-added CONFIGURE_OUTPUTS. check-in: 5ea0b4bd51 user: stu tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Makefile.in.
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
# package without installing.  The other environment variables allow us
# to test against an uninstalled Tcl.  Add special env vars that you
# require for testing here (like TCLX_LIBRARY).
#========================================================================

EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
#EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
TCLLIBPATH	= $(top_builddir)
TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \
		  TDBC_LIBRARY=`@CYGPATH@ @tdbc_LIBRARY_PATH@`
PKG_ENV		= @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
		  PATH="$(EXTRA_PATH):$(PATH)" \
		  TCLLIBPATH="$(TCLLIBPATH)" \
                  TDBCODBC_LIBRARY=`@CYGPATH@ $(srcdir)/library`








|







121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
# package without installing.  The other environment variables allow us
# to test against an uninstalled Tcl.  Add special env vars that you
# require for testing here (like TCLX_LIBRARY).
#========================================================================

EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
#EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
TCLLIBPATH	= $(top_builddir) $(TDBC_BIN_DIR)
TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \
		  TDBC_LIBRARY=`@CYGPATH@ @tdbc_LIBRARY_PATH@`
PKG_ENV		= @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
		  PATH="$(EXTRA_PATH):$(PATH)" \
		  TCLLIBPATH="$(TCLLIBPATH)" \
                  TDBCODBC_LIBRARY=`@CYGPATH@ $(srcdir)/library`

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
266
267
268
269
270
271
272
273
274
275
276
277
278
279
test: test-jet test-sqlserver test-sqlite

test-jet: binaries libraries
	@echo testing tdbcodbc against Jet
	TDBCODBC_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)];\
		package ifneeded tdbc ${TDBC_VERSION} \
			[list source `@CYGPATH@ $(TDBC_BIN_DIR)/tdbc.tcl`]\;[list load `@CYGPATH@ $(TDBC_BIN_DIR)/$(TDBC_LIB_FILE)` tdbc]"

test-sqlserver: binaries libraries
	@echo testing tdbcodbc against SQL Server
	TDBCODBC_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)];\
		package ifneeded tdbc ${TDBC_VERSION} \
			[list source `@CYGPATH@ $(TDBC_BIN_DIR)/tdbc.tcl`]\;[list load `@CYGPATH@ $(TDBC_BIN_DIR)/$(TDBC_LIB_FILE)` tdbc]"

test-sqlite: binaries libraries
	@echo testing tdbcodbc against SQLite
	TDBCODBC_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)];\
		package ifneeded tdbc ${TDBC_VERSION} \
			[list source `@CYGPATH@ $(TDBC_BIN_DIR)/tdbc.tcl`]\;[list load `@CYGPATH@ $(TDBC_BIN_DIR)/$(TDBC_LIB_FILE)` tdbc]"

valgrind-sqlite: binaries libraries
	TDBCODBC_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)];\
		package ifneeded tdbc ${TDBC_VERSION} \
			[list source `@CYGPATH@ $(TDBC_BIN_DIR)/tdbc.tcl`]\;[list load `@CYGPATH@ $(TDBC_BIN_DIR)/$(TDBC_LIB_FILE)` tdbc]"

shell: binaries libraries
	@$(TCLSH) $(SCRIPT)

gdb:
	$(TCLSH_ENV) $(PKG_ENV) gdb $(TCLSH_PROG) $(SCRIPT)








|
<
<






|
<
<






|
<
<








|
<
<







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
266
267
268
269
270
271
test: test-jet test-sqlserver test-sqlite

test-jet: binaries libraries
	@echo testing tdbcodbc against Jet
	TDBCODBC_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_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_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_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)]"



shell: binaries libraries
	@$(TCLSH) $(SCRIPT)

gdb:
	$(TCLSH_ENV) $(PKG_ENV) gdb $(TCLSH_PROG) $(SCRIPT)