tdbc::sqlite3

Check-in [c68d359658]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

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

Overview
Comment:Put the 'make test' fixes on the correct branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: c68d359658964f3873244a9c5e9ecebf9dc8482d
User & Date: dkf 2012-11-15 00:56:11
Context
2012-11-15
00:56
minor: autoconf regen check-in: ba428b8e9f user: dkf tags: trunk
00:56
Put the 'make test' fixes on the correct branch. check-in: c68d359658 user: dkf tags: trunk
2012-11-14
16:57
REPOSITORY REFACTOR : remove local tclconfig/ in favour of using nested checkout check-in: 34a9533245 user: 200002852 tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.in.

94
95
96
97
98
99
100




101
102
103
104
105
106
107
...
185
186
187
188
189
190
191
192
193
194


195
196
197
198
199
200
201
PACKAGE_VERSION	= @[email protected]
#TCL_DEFS	= @[email protected]
TCL_BIN_DIR	= @[email protected]
TCL_SRC_DIR	= @[email protected]
#TK_BIN_DIR	= @[email protected]
#TK_SRC_DIR	= @[email protected]





# Not used, but retained for reference of what libs Tcl required
#TCL_LIBS	= @[email protected]

#========================================================================
# TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
# package without installing.  The other environment variables allow us
# to test against an uninstalled Tcl.  Add special env vars that you
................................................................................

# If the semicolon is omitted after the [list source ...], then
# at least one version of msys make replaces the slashes in the
# $(srcdir)/library/tdbcsqlite3.tcl path with backslashes, causing
# the [package ifneeded] to fail. Leave it in, even though it's
# spurious.
test: libraries
	$(TCLSH) `@[email protected] $(srcdir)/tests/all.tcl` $(TESTFLAGS) \
		-load "package ifneeded tdbc::sqlite3 $(PACKAGE_VERSION) \
			[list source `@[email protected] $(srcdir)/library/tdbcsqlite3.tcl`]\;"



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

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







>
>
>
>







 







|
|
|
>
>







94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
...
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
PACKAGE_VERSION	= @[email protected]
#TCL_DEFS	= @[email protected]
TCL_BIN_DIR	= @[email protected]
TCL_SRC_DIR	= @[email protected]
#TK_BIN_DIR	= @[email protected]
#TK_SRC_DIR	= @[email protected]

TDBC_VERSION	= @[email protected]
TDBC_BIN_DIR	= @[email protected]
TDBC_LIB_FILE	= @[email protected]

# Not used, but retained for reference of what libs Tcl required
#TCL_LIBS	= @[email protected]

#========================================================================
# TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
# package without installing.  The other environment variables allow us
# to test against an uninstalled Tcl.  Add special env vars that you
................................................................................

# If the semicolon is omitted after the [list source ...], then
# at least one version of msys make replaces the slashes in the
# $(srcdir)/library/tdbcsqlite3.tcl path with backslashes, causing
# the [package ifneeded] to fail. Leave it in, even though it's
# spurious.
test: libraries
	$(TCLSH) `@[email protected] $(srcdir)/tests/all.tcl` $(TESTFLAGS) -load \
		"package ifneeded tdbc::sqlite3 $(PACKAGE_VERSION) \
			[list source `@[email protected] $(srcdir)/library/tdbcsqlite3.tcl`];\
		package ifneeded tdbc ${TDBC_VERSION} \
			[list source `@[email protected] $(TDBC_BIN_DIR)/tdbc.tcl`]\;[list load `@[email protected] $(TDBC_BIN_DIR)/$(TDBC_LIB_FILE)` tdbc]"

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

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

Changes to configure.in.

25
26
27
28
29
30
31



32
33
34
35
36
37
38
#----------------------------------------------------------------------
# Load the tdbcConfig.sh file
#----------------------------------------------------------------------

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)




#-----------------------------------------------------------------------
# Handle the --prefix=... option by defaulting to what Tcl gave.
# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
#-----------------------------------------------------------------------

TEA_PREFIX






>
>
>







25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
#----------------------------------------------------------------------
# Load the tdbcConfig.sh file
#----------------------------------------------------------------------

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)
AC_SUBST(TDBC_VERSION)
AC_SUBST(tdbc_BIN_DIR)
AC_SUBST(TDBC_LIB_FILE)

#-----------------------------------------------------------------------
# Handle the --prefix=... option by defaulting to what Tcl gave.
# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
#-----------------------------------------------------------------------

TEA_PREFIX