/ Check-in [af1c5718]
Login

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

Overview
Comment:Integrate build changes for sqlite3_analyzer into the MSVC makefile. Also, more cleanup of build files, including sqlite3_analyzer, for all makefiles.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: af1c5718292c0326b785416b7109eafefaeb59a7
User & Date: mistachkin 2011-09-22 00:06:44
Context
2011-09-22
00:56
Update the version number to 3.7.9. check-in: 14e28eb9 user: drh tags: trunk
00:06
Integrate build changes for sqlite3_analyzer into the MSVC makefile. Also, more cleanup of build files, including sqlite3_analyzer, for all makefiles. check-in: af1c5718 user: mistachkin tags: trunk
2011-09-21
20:10
Minor tweaks to the TCL code for sqlite3_analyzer. check-in: 3a261f38 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

   924    924   	rm -f sqlite3.h opcodes.*
   925    925   	rm -rf .libs .deps
   926    926   	rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
   927    927   	rm -f mkkeywordhash$(BEXE) keywordhash.h
   928    928   	rm -f $(PUBLISH)
   929    929   	rm -f *.da *.bb *.bbg gmon.out
   930    930   	rm -rf tsrc .target_source
          931  +	rm -f tclsqlite3$(TEXE)
   931    932   	rm -f testfixture$(TEXE) test.db
   932         -	rm -f sqlite3.dll sqlite3.lib sqlite3.def
          933  +	rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
   933    934   	rm -f sqlite3.c
          935  +	rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
   934    936   
   935    937   distclean:	clean
   936    938   	rm -f config.log config.status libtool Makefile sqlite3.pc
   937    939   
   938    940   #
   939    941   # Windows section
   940    942   #

Changes to Makefile.msc.

   922    922   
   923    923   soaktest:	testfixture.exe sqlite3.exe
   924    924   	.\testfixture.exe $(TOP)\test\all.test -soak=1
   925    925   
   926    926   test:	testfixture.exe sqlite3.exe
   927    927   	.\testfixture.exe $(TOP)\test\veryquick.test
   928    928   
   929         -spaceanal_tcl.h:	$(TOP)\tool\spaceanal.tcl
   930         -	$(NAWK) -f $(TOP)/tool/tostr.awk \
   931         -		$(TOP)\tool\spaceanal.tcl > spaceanal_tcl.h
          929  +sqlite3_analyzer.c: sqlite3.c $(TOP)\src\test_stat.c $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl
          930  +	copy sqlite3.c + $(TOP)\src\test_stat.c + $(TOP)\src\tclsqlite.c $@
          931  +	echo static const char *tclsh_main_loop(void){ >> $@
          932  +	echo static const char *zMainloop = >> $@
          933  +	$(NAWK) -f $(TOP)\tool\tostr.awk $(TOP)\tool\spaceanal.tcl >> $@
          934  +	echo ; return zMainloop; } >> $@
   932    935   
   933         -sqlite3_analyzer.exe:	$(TESTFIXTURE_SRC) spaceanal_tcl.h
   934         -	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
   935         -		-DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \
   936         -		-DBUILD_sqlite -I$(TCLINCDIR) \
   937         -		$(TESTFIXTURE_SRC) \
          936  +sqlite3_analyzer.exe:	sqlite3_analyzer.c
          937  +	$(LTLINK) -DBUILD_sqlite -DTCLSH=2 -I$(TCLINCDIR) sqlite3_analyzer.c \
   938    938   		/link $(LTLINKOPTS) /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS)
   939    939   
   940    940   clean:
   941    941   	del /Q *.lo *.ilk *.lib *.obj *.pdb sqlite3.exe libsqlite3.lib
   942    942   	del /Q sqlite3.h opcodes.c opcodes.h
   943    943   	del /Q lemon.exe lempar.c parse.*
   944    944   	del /Q mkkeywordhash.exe keywordhash.h
   945    945   	-rmdir /Q/S tsrc
   946    946   	del /Q .target_source
          947  +	del /Q tclsqlite3.exe
   947    948   	del /Q testfixture.exe testfixture.exp test.db
   948    949   	del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
   949    950   	del /Q sqlite3.c
   950         -	del /Q sqlite3_analyzer.exe sqlite3_analyzer.exp spaceanal_tcl.h
          951  +	del /Q sqlite3_analyzer.exe sqlite3_analyzer.exp sqlite3_analyzer.c
   951    952   
   952    953   #
   953    954   # Windows section
   954    955   #
   955    956   dll: sqlite3.dll
   956    957   
   957    958   sqlite3.def: libsqlite3.lib

Changes to main.mk.

   589    589   #
   590    590   install:	sqlite3 libsqlite3.a sqlite3.h
   591    591   	mv sqlite3 /usr/bin
   592    592   	mv libsqlite3.a /usr/lib
   593    593   	mv sqlite3.h /usr/include
   594    594   
   595    595   clean:	
   596         -	rm -f *.o sqlite3 libsqlite3.a sqlite3.h opcodes.*
          596  +	rm -f *.o sqlite3 sqlite3.exe libsqlite3.a sqlite3.h opcodes.*
   597    597   	rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h
   598    598   	rm -f $(PUBLISH)
   599    599   	rm -f *.da *.bb *.bbg gmon.out
   600    600   	rm -rf tsrc target_source
   601    601   	rm -f testloadext.dll libtestloadext.so
          602  +	rm -f amalgamation-testfixture amalgamation-testfixture.exe
          603  +	rm -f fts3-testfixture fts3-testfixture.exe
          604  +	rm -f testfixture testfixture.exe
          605  +	rm -f threadtest3 threadtest3.exe
   602    606   	rm -f sqlite3.c fts?amal.c tclsqlite3.c
          607  +	rm -f sqlite3_analyzer sqlite3_analyzer.exe sqlite3_analyzer.c