/ Check-in [5ed7633d]
Login

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

Overview
Comment:In the MSVC makefile, allow symbols to be enabled without NDEBUG defined. Also, for the win32lock test, make sure the database is closed prior to shutdown.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | winNativeHeap
Files: files | file ages | folders
SHA1: 5ed7633d41b99929309a7e13d37375a4fdae43b3
User & Date: mistachkin 2011-08-26 05:40:31
Context
2011-08-26
11:18
Merge Win32 native heap support into trunk. check-in: 5238a749 user: mistachkin tags: trunk
05:40
In the MSVC makefile, allow symbols to be enabled without NDEBUG defined. Also, for the win32lock test, make sure the database is closed prior to shutdown. Closed-Leaf check-in: 5ed7633d user: mistachkin tags: winNativeHeap
01:45
Disable checking the winMemData structure signature when compiled with NDEBUG. check-in: 50edc2f9 user: mistachkin tags: winNativeHeap
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

     6      6   # that contains this "Makefile.msc".
     7      7   #
     8      8   TOP = .
     9      9   
    10     10   # Set this non-0 to create and use the SQLite amalgamation file.
    11     11   #
    12     12   USE_AMALGAMATION = 1
           13  +
           14  +# Set this to non-0 to create and use PDBs.
           15  +#
           16  +SYMBOLS = 1
    13     17   
    14     18   # Set this to one of the following values to enable various debugging
    15     19   # features.  Each level includes the debugging options from the previous
    16     20   # levels.  Currently, the recognized values for DEBUG are:
    17     21   #
    18     22   # 0 == NDEBUG: Disables assert() and other runtime diagnostics.
    19     23   # 1 == Disables NDEBUG and all optimizations and then enables PDBs.
................................................................................
    29     33   VERSION = 3.7
    30     34   VERSION_NUMBER = 3007007
    31     35   RELEASE = 3.7.7
    32     36   
    33     37   # C Compiler and options for use in building executables that
    34     38   # will run on the platform that is doing the build.
    35     39   #
    36         -BCC = cl.exe -O2
           40  +BCC = cl.exe
    37     41   
    38     42   # C Compile and options for use in building executables that
    39     43   # will run on the target platform.  (BCC and TCC are usually the
    40     44   # same unless your are cross-compiling.)
    41     45   #
    42         -TCC = cl.exe -W3 -O2 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -fp:precise
           46  +TCC = cl.exe -W3 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -fp:precise
    43     47   
    44     48   # The mksqlite3c.tcl and mksqlite3h.tcl scripts will pull in 
    45     49   # any extension header files by default.  For non-amalgamation
    46     50   # builds, we need to make sure the compiler can find these.
    47     51   #
    48     52   !IF $(USE_AMALGAMATION)==0
    49     53   TCC = $(TCC) -I$(TOP)\ext\fts3
................................................................................
   159    163   
   160    164   TCC = $(TCC) $(OPT_FEATURE_FLAGS)
   161    165   
   162    166   # Add in any optional parameters specified on the make commane line
   163    167   # ie.  make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1".
   164    168   TCC = $(TCC) $(OPTS)
   165    169   
          170  +# If symbols are enabled, enable PDBs.
   166    171   # If debugging is enabled, disable all optimizations and enable PDBs.
   167    172   !IF $(DEBUG)>0
   168         -TCC = $(TCC) -Od -Zi -D_DEBUG
          173  +TCC = $(TCC) -Od -D_DEBUG
          174  +!ELSE
          175  +TCC = $(TCC) -O2
          176  +!ENDIF
          177  +
          178  +!IF $(DEBUG)>0 || $(SYMBOLS)!=0
          179  +TCC = $(TCC) -Zi
   169    180   !ENDIF
   170    181   
   171    182   # libtool compile/link
   172    183   LTCOMPILE = $(TCC) -Fo$@
   173    184   LTLIB = lib.exe
   174    185   LTLINK = $(TCC) -Fe$@
   175    186   
................................................................................
   179    190   # to deduce the binary type based on the object files.
   180    191   !IF "$(PLATFORM)"!=""
   181    192   LTLINKOPTS = /MACHINE:$(PLATFORM)
   182    193   LTLIBOPTS = /MACHINE:$(PLATFORM)
   183    194   !ENDIF
   184    195   
   185    196   # If debugging is enabled, enable PDBs.
   186         -!IF $(DEBUG)>0
          197  +!IF $(DEBUG)>0 || $(SYMBOLS)!=0
   187    198   LTLINKOPTS = $(LTLINKOPTS) /DEBUG
   188    199   !ENDIF
   189    200   
   190    201   # nawk compatible awk.
   191    202   NAWK = gawk.exe
   192    203   
   193    204   # You should not have to change anything below this line

Changes to test/win32lock.test.

   122    122       break
   123    123     }
   124    124     sqlite3_sleep 10
   125    125   }
   126    126   
   127    127   file_control_win32_av_retry db 10 25
   128    128   sqlite3_test_control_pending_byte $old_pending_byte
          129  +db close
   129    130   sqlite3_shutdown
   130    131   test_sqlite3_log 
   131    132   sqlite3_initialize
   132    133   finish_test