More work on getting the 'testfixture.exe' target to work correctly.

FossilOrigin-Name: 36b72fd609cf151f3db0e65b450d7cd515f2ac49

diff --git a/Makefile.msc b/Makefile.msc
index c3f7f3a2b0c1d04e0a1051a8210960f269009f83..4a8283731d63abe4734f16e26091fec4b8813b0d 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -466,22 +466,30 @@ RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src $(RCOPTS) $(RCCOPTS)
 !IF "$(PLATFORM)"=="x86"
 CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
 SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
+# <<mark>>
 TEST_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall -DINCLUDE_SQLITE_TCL_H=1 -DSQLITE_TCLAPI=__cdecl
+# <</mark>>
 !ELSE
 !IFNDEF PLATFORM
 CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
 SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
+# <<mark>>
 TEST_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall -DINCLUDE_SQLITE_TCL_H=1 -DSQLITE_TCLAPI=__cdecl
+# <</mark>>
 !ELSE
 CORE_CCONV_OPTS =
 SHELL_CCONV_OPTS =
+# <<mark>>
 TEST_CCONV_OPTS =
+# <</mark>>
 !ENDIF
 !ENDIF
 !ELSE
 CORE_CCONV_OPTS =
 SHELL_CCONV_OPTS =
+# <<mark>>
 TEST_CCONV_OPTS =
+# <</mark>>
 !ENDIF
 
 # These are additional compiler options used for the core library.
@@ -1983,12 +1991,20 @@ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC1)
 
 sqlite_tclDecls.h:
        echo #ifndef SQLITE_TCLAPI > sqlite_tclDecls.h
-       echo #  define SQLITE_TCLAPI __cdecl >> sqlite_tclDecls.h
+       echo #  define SQLITE_TCLAPI >> sqlite_tclDecls.h
        echo #endif >> sqlite_tclDecls.h
-       type "$(TCLINCDIR)\tclDecls.h" | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "^(EXTERN\s+?.*?\s+?)Tcl_" "\1 SQLITE_TCLAPI Tcl_" | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "^(EXTERN\s+?(?:void|VOID)\s+?)TclFreeObj" "\1 SQLITE_TCLAPI TclFreeObj" >> sqlite_tclDecls.h
+       type "$(TCLINCDIR)\tclDecls.h" \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "^(EXTERN\s+?.*?\s+?)Tcl_" "\1 SQLITE_TCLAPI Tcl_" \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "^(EXTERN\s+?(?:void|VOID)\s+?)TclFreeObj" "\1 SQLITE_TCLAPI TclFreeObj" \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "\(\*tcl_" "(SQLITE_TCLAPI *tcl_" \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "\(\*tclFreeObj" "(SQLITE_TCLAPI *tclFreeObj" >> sqlite_tclDecls.h
 
 sqlite_tcl.h:  sqlite_tclDecls.h
-       type "$(TCLINCDIR)\tcl.h" | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact tclDecls.h sqlite_tclDecls.h >> sqlite_tcl.h
+       type "$(TCLINCDIR)\tcl.h" | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact tclDecls.h sqlite_tclDecls.h \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "typedef (.*?)\(Tcl_" "typedef \1 (SQLITE_TCLAPI Tcl_" \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "void (*freeProc)" "void (SQLITE_TCLAPI *freeProc)" \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "Tcl_HashEntry *(*findProc)" "Tcl_HashEntry *(SQLITE_TCLAPI *findProc)" \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "Tcl_HashEntry *(*createProc)" "Tcl_HashEntry *(SQLITE_TCLAPI *createProc)" >> sqlite_tcl.h
 
 testfixture.exe:       $(TESTFIXTURE_SRC) $(SQLITE3H) $(LIBRESOBJS) $(HDR) sqlite_tcl.h
        $(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \

diff --git a/manifest b/manifest
index 3195058baeb6427b31286fb5ade00b2fd1c7a012..cb678be722e39a8929c5cc5a15577b828db120cd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Modify\sthe\smksqlite3h.tcl\stool\sto\shandle\sthe\ssyscall\stypedef\sspecially.
-D 2016-07-28T15:38:34.103
+C More\swork\son\sgetting\sthe\s'testfixture.exe'\starget\sto\swork\scorrectly.
+D 2016-07-28T16:09:52.017
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc da4c9f5bc46f6f12d7313d12be18a2d2c55e06c0
+F Makefile.msc 1e5399407885d69150e2659f4710b5712a1e6cef
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1508,7 +1508,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 11ab9c9ab562df98c20abf126a8bac178aef77a8
-R a69c68c4276ee266722a065a80ccdc75
+P 478a84efa6ea13629227ba8970c8ef8545d31074
+R 88324b2461565133820c548ccb01cb7e
 U mistachkin
-Z 9a266ac1c40bfd5d57e83258cb2d1dad
+Z 92e347019c063e4a6ca0b5b196166511

diff --git a/manifest.uuid b/manifest.uuid
index f316f522bd1539d7260d74280f58e6b176a9bd00..132e64c427ef0d1ab74a043fa266e34b90dafb4d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-478a84efa6ea13629227ba8970c8ef8545d31074
\ No newline at end of file
+36b72fd609cf151f3db0e65b450d7cd515f2ac49
\ No newline at end of file