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