SQLITE_NOTICE(283): recovered 1 frames from WAL file /fossil/sqlite.fossil-wal

SQLite: Check-in [c9bef0f2]
/ Check-in [c9bef0f2]
Login

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

Overview
Comment:Enhance the MSVC makefile for better debugging symbol support.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: c9bef0f29a5a7f04914d80e58105104babd4168c
User & Date: mistachkin 2014-01-30 12:45:32
Context
2014-01-30
14:10
Update a requirement mark and add some additional test cases to cover the requirement associated with ORDER BY and LIMIT on compound SELECT statements. check-in: 8560091e user: drh tags: trunk
12:45
Enhance the MSVC makefile for better debugging symbol support. check-in: c9bef0f2 user: mistachkin tags: trunk
12:16
Do not run test script mmapfault.test as part of the "inmemory_journal" permutation test. check-in: b222b61a user: dan tags: trunk
11:12
Enhance the MSVC makefile for better debugging symbol support. Closed-Leaf check-in: c723ec27 user: mistachkin tags: msvcDebug
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   265    265   #
   266    266   !IF $(USE_AMALGAMATION)==0
   267    267   TCC = $(TCC) -I$(TOP)\ext\fts3
   268    268   RCC = $(RCC) -I$(TOP)\ext\fts3
   269    269   TCC = $(TCC) -I$(TOP)\ext\rtree
   270    270   RCC = $(RCC) -I$(TOP)\ext\rtree
   271    271   !ENDIF
          272  +
          273  +# The mksqlite3c.tcl script accepts some options on the command
          274  +# line.  When compiling with debugging enabled, some of these
          275  +# options are necessary in order to allow debugging symbols to
          276  +# work correctly with Visual Studio when using the amalgamation.
          277  +#
          278  +!IF $(DEBUG)>0
          279  +MKSQLITE3C_ARGS = --linemacros
          280  +!ELSE
          281  +MKSQLITE3C_ARGS =
          282  +!ENDIF
   272    283   
   273    284   # Define -DNDEBUG to compile without debugging (i.e., for production usage)
   274    285   # Omitting the define will cause extra debugging code to be inserted and
   275    286   # includes extra comments when "EXPLAIN stmt" is used.
   276    287   #
   277    288   !IF $(DEBUG)==0
   278    289   TCC = $(TCC) -DNDEBUG
................................................................................
   912    923   	for %i in ($(SRC)) do copy /Y %i tsrc
   913    924   	del /Q tsrc\sqlite.h.in tsrc\parse.y
   914    925   	$(TCLSH_CMD) $(TOP)\tool\vdbe-compress.tcl $(OPTS) < tsrc\vdbe.c > vdbe.new
   915    926   	move vdbe.new tsrc\vdbe.c
   916    927   	echo > .target_source
   917    928   
   918    929   sqlite3.c:	.target_source $(TOP)\tool\mksqlite3c.tcl
   919         -	$(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl
          930  +	$(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl $(MKSQLITE3C_ARGS)
   920    931   	copy tsrc\shell.c .
   921    932   	copy tsrc\sqlite3ext.h .
   922    933   
   923    934   sqlite3-all.c:	sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
   924    935   	$(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
   925    936   
   926    937   # Set the source code file to be used by executables and libraries when
................................................................................
  1330   1341   	$(NAWK) -f $(TOP)\tool\tostr.awk $(TOP)\tool\spaceanal.tcl >> $@
  1331   1342   	echo ; return zMainloop; } >> $@
  1332   1343   
  1333   1344   sqlite3_analyzer.exe:	sqlite3_analyzer.c $(LIBRESOBJS)
  1334   1345   	$(LTLINK) -DBUILD_sqlite -DTCLSH=2 -I$(TCLINCDIR) sqlite3_analyzer.c \
  1335   1346   		/link $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
  1336   1347   
  1337         -showdb.exe:	$(TOP)\tool\showdb.c sqlite3.c
  1338         -	$(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o $@ \
  1339         -		$(TOP)\tool\showdb.c sqlite3.c
         1348  +showdb.exe:	$(TOP)\tool\showdb.c $(SQLITE3C)
         1349  +	$(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
         1350  +		$(TOP)\tool\showdb.c $(SQLITE3C)
  1340   1351   
  1341         -wordcount.exe:	$(TOP)\test\wordcount.c sqlite3.c
  1342         -	$(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o $@ \
  1343         -		$(TOP)\test\wordcount.c sqlite3.c
         1352  +wordcount.exe:	$(TOP)\test\wordcount.c $(SQLITE3C)
         1353  +	$(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
         1354  +		$(TOP)\test\wordcount.c $(SQLITE3C)
  1344   1355   
  1345         -speedtest1.exe:	$(TOP)\test\speedtest1.c sqlite3.c
  1346         -	$(LTLINK) -DSQLITE_OMIT_LOAD_EXTENSION -o $@ \
  1347         -		$(TOP)\test\speedtest1.c sqlite3.c
         1356  +speedtest1.exe:	$(TOP)\test\speedtest1.c $(SQLITE3C)
         1357  +	$(LTLINK) -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
         1358  +		$(TOP)\test\speedtest1.c $(SQLITE3C)
  1348   1359   
  1349   1360   clean:
  1350   1361   	del /Q *.lo *.ilk *.lib *.obj *.pdb sqlite3.exe libsqlite3.lib
  1351   1362   	del /Q *.cod *.da *.bb *.bbg gmon.out
  1352   1363   	del /Q sqlite3.h opcodes.c opcodes.h
  1353   1364   	del /Q lemon.exe lempar.c parse.*
  1354   1365   	del /Q mkkeywordhash.exe keywordhash.h