Integrate build changes for sqlite3_analyzer into the MSVC makefile. Also, more...

FossilOrigin-Name: af1c5718292c0326b785416b7109eafefaeb59a7

diff --git a/Makefile.in b/Makefile.in
index 80dcc83909bb13a85458afd69959edce00bff801..2c08e03b9fac3c04651f2f657eb1cc8efdaa34d0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -928,9 +928,11 @@ clean:
        rm -f $(PUBLISH)
        rm -f *.da *.bb *.bbg gmon.out
        rm -rf tsrc .target_source
+       rm -f tclsqlite3$(TEXE)
        rm -f testfixture$(TEXE) test.db
-       rm -f sqlite3.dll sqlite3.lib sqlite3.def
+       rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
        rm -f sqlite3.c
+       rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
 
 distclean:     clean
        rm -f config.log config.status libtool Makefile sqlite3.pc

diff --git a/Makefile.msc b/Makefile.msc
index 01f490b42b429df3959c1b2debeaf00b58156194..1521ceb5aed6deb3d6029023d62a7a4ffbaf3f13 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -926,15 +926,15 @@ soaktest: testfixture.exe sqlite3.exe
 test:  testfixture.exe sqlite3.exe
        .\testfixture.exe $(TOP)\test\veryquick.test
 
-spaceanal_tcl.h:       $(TOP)\tool\spaceanal.tcl
-       $(NAWK) -f $(TOP)/tool/tostr.awk \
-               $(TOP)\tool\spaceanal.tcl > spaceanal_tcl.h
-
-sqlite3_analyzer.exe:  $(TESTFIXTURE_SRC) spaceanal_tcl.h
-       $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
-               -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \
-               -DBUILD_sqlite -I$(TCLINCDIR) \
-               $(TESTFIXTURE_SRC) \
+sqlite3_analyzer.c: sqlite3.c $(TOP)\src\test_stat.c $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl
+       copy sqlite3.c + $(TOP)\src\test_stat.c + $(TOP)\src\tclsqlite.c $@
+       echo static const char *tclsh_main_loop(void){ >> $@
+       echo static const char *zMainloop = >> $@
+       $(NAWK) -f $(TOP)\tool\tostr.awk $(TOP)\tool\spaceanal.tcl >> $@
+       echo ; return zMainloop; } >> $@
+
+sqlite3_analyzer.exe:  sqlite3_analyzer.c
+       $(LTLINK) -DBUILD_sqlite -DTCLSH=2 -I$(TCLINCDIR) sqlite3_analyzer.c \
                /link $(LTLINKOPTS) /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS)
 
 clean:
@@ -944,10 +944,11 @@ clean:
        del /Q mkkeywordhash.exe keywordhash.h
        -rmdir /Q/S tsrc
        del /Q .target_source
+       del /Q tclsqlite3.exe
        del /Q testfixture.exe testfixture.exp test.db
        del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
        del /Q sqlite3.c
-       del /Q sqlite3_analyzer.exe sqlite3_analyzer.exp spaceanal_tcl.h
+       del /Q sqlite3_analyzer.exe sqlite3_analyzer.exp sqlite3_analyzer.c
 
 #
 # Windows section

diff --git a/main.mk b/main.mk
index 70ba4a1cee4241dd107a6e38e51a1c67dfbd7547..2668b854e11089564cb98fcf05693dc33198f3fe 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -593,10 +593,15 @@ install:  sqlite3 libsqlite3.a sqlite3.h
        mv sqlite3.h /usr/include
 
 clean: 
-       rm -f *.o sqlite3 libsqlite3.a sqlite3.h opcodes.*
+       rm -f *.o sqlite3 sqlite3.exe libsqlite3.a sqlite3.h opcodes.*
        rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h
        rm -f $(PUBLISH)
        rm -f *.da *.bb *.bbg gmon.out
        rm -rf tsrc target_source
        rm -f testloadext.dll libtestloadext.so
+       rm -f amalgamation-testfixture amalgamation-testfixture.exe
+       rm -f fts3-testfixture fts3-testfixture.exe
+       rm -f testfixture testfixture.exe
+       rm -f threadtest3 threadtest3.exe
        rm -f sqlite3.c fts?amal.c tclsqlite3.c
+       rm -f sqlite3_analyzer sqlite3_analyzer.exe sqlite3_analyzer.c

diff --git a/manifest b/manifest
index 0323ff0b9a92a9c113f08b55a51d9963e5955a7b..ec378965eff8cce1cc9a5a22f7dade02ba5bbfc8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Minor\stweaks\sto\sthe\sTCL\scode\sfor\ssqlite3_analyzer.
-D 2011-09-21T20:10:42.584
+C Integrate\sbuild\schanges\sfor\ssqlite3_analyzer\sinto\sthe\sMSVC\smakefile.\s\sAlso,\smore\scleanup\sof\sbuild\sfiles,\sincluding\ssqlite3_analyzer,\sfor\sall\smakefiles.
+D 2011-09-22T00:06:44.751
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in b6c543a666dbd1eaad06c3705778e75231c0e297
+F Makefile.in 8de00a4e52f308ef6d564834c0973e53646e0d4c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc b5e917439d5ed42364173d1648aae1d418e323ea
+F Makefile.msc 6676bcfe711f621a0b1916ecfa5d0927f8084517
 F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
@@ -104,7 +104,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk cdd9d05779dedd4e72712286e807e15c4c666e46
+F main.mk aa43670ca62ce7a3f4d80a5f8980c9a9ad076903
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -963,7 +963,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 0bd8fd352d290637d8c4d4fb76e8dd28f0149fa0
-R fe88c011dfd8ce1303bfab126d559106
-U drh
-Z f9ab27a8b8af4fdd9533127fd7d4648e
+P 3a261f383f11d839d3a23d454b4422298bef9c88
+R 333437cf067e53e389b09715ac478b4b
+U mistachkin
+Z 0999590e6e1cd2394f226d9ff7df4c00

diff --git a/manifest.uuid b/manifest.uuid
index f6dca2ce1a7cc1dec8579ff0cc06c6929042c3fe..e0738b2bdff96c13d1161b8ab58f13141cf7f5b6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3a261f383f11d839d3a23d454b4422298bef9c88
\ No newline at end of file
+af1c5718292c0326b785416b7109eafefaeb59a7
\ No newline at end of file