/ Check-in [def8f598]
Login

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

Overview
Comment:Adjust the MSVC makefile to use Tcl8.6 by default.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: def8f598b8e33b5bab3a024cc57f4c5e300cd8cd
User & Date: drh 2016-11-02 19:49:22
Context
2016-11-23
21:33
Updates makefiles and build scripts on windows to used Tcl 8.6. check-in: f693850a user: drh tags: branch-3.15
2016-11-03
02:25
Fix an possible NULL pointer deference in the command-line shell that can occur when using imposter mode. check-in: ad08753a user: drh tags: trunk
2016-11-02
19:49
Adjust the MSVC makefile to use Tcl8.6 by default. check-in: def8f598 user: drh tags: trunk
14:50
Fix an issue that was causing the new database image to be assembled entirely in heap memory when VACUUMing a database, even if it should use a temp file. This could cause SQLITE_NOMEM errors when vacuuming very large databases on 32-bit systems. check-in: 30288453 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   790    790   !ENDIF
   791    791   
   792    792   !IFNDEF TCLLIBDIR
   793    793   TCLLIBDIR = c:\tcl\lib
   794    794   !ENDIF
   795    795   
   796    796   !IFNDEF LIBTCL
   797         -LIBTCL = tcl85.lib
          797  +LIBTCL = tcl86.lib
   798    798   !ENDIF
   799    799   
   800    800   !IFNDEF LIBTCLSTUB
   801         -LIBTCLSTUB = tclstub85.lib
          801  +LIBTCLSTUB = tclstub86.lib
   802    802   !ENDIF
   803    803   
   804    804   !IFNDEF LIBTCLPATH
   805    805   LIBTCLPATH = c:\tcl\bin
   806    806   !ENDIF
   807    807   
   808    808   # The locations of the ICU header and library files.  These variables
................................................................................
   824    824   
   825    825   # This is the command to use for tclsh - normally just "tclsh", but we may
   826    826   # know the specific version we want to use.  This variable (TCLSH_CMD) may be
   827    827   # overridden via the environment prior to running nmake in order to select a
   828    828   # specific Tcl shell to use.
   829    829   #
   830    830   !IFNDEF TCLSH_CMD
   831         -TCLSH_CMD = tclsh85
          831  +TCLSH_CMD = tclsh
   832    832   !ENDIF
   833    833   # <</mark>>
   834    834   
   835    835   # Compiler options needed for programs that use the readline() library.
   836    836   #
   837    837   !IFNDEF READLINE_FLAGS
   838    838   READLINE_FLAGS = -DHAVE_READLINE=0

Changes to test/wal6.test.

   234    234     catchsql { SELECT * FROM t2 } db2 
   235    235   } {1 {database disk image is malformed}}
   236    236   
   237    237   #-------------------------------------------------------------------------
   238    238   # Confirm that it is possible to get an SQLITE_BUSY_SNAPSHOT error from
   239    239   # "BEGIN EXCLUSIVE" if the connection already has an open read-transaction.
   240    240   #
          241  +db close
          242  +db2 close
   241    243   reset_db
   242    244   sqlite3 db2 test.db
   243    245   do_execsql_test 5.1 {
   244    246     PRAGMA journal_mode = wal;
   245    247     CREATE TABLE t1(x, y);
   246    248     INSERT INTO t1 VALUES(1, 2);
   247    249     INSERT INTO t1 VALUES(3, 4);