Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch winDebug Excluding Merge-Ins
This is equivalent to a diff from 9b800ee41c to 642e543c28
|
2012-11-27
| ||
| 00:23 | Assume that the NetSurf browser is operated by a human. check-in: 77cd6e0dfb user: drh tags: trunk | |
|
2012-11-26
| ||
| 23:54 | Changes to support easier debugging on Windows. Leaf check-in: 642e543c28 user: mistachkin tags: winDebug | |
| 22:51 | Merge byte-order-mark handling enhancements to trunk. check-in: 9b800ee41c user: mistachkin tags: trunk | |
| 20:47 | Modify commit error message about unresolved merge conflicts to include the option used to disable the check. check-in: 2ff70a3130 user: mistachkin tags: trunk | |
|
2012-11-19
| ||
| 20:39 | Allow the get_utf8_bom function to return the size as well. check-in: d857d20bef user: mistachkin tags: convert_before_commit_v2 | |
Changes to src/main.c.
573 573 ** This procedure runs first. 574 574 */ 575 575 int main(int argc, char **argv) 576 576 { 577 577 const char *zCmdName = "unknown"; 578 578 int idx; 579 579 int rc; 580 + 581 +#if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) 582 + if( _wgetenv(L"FOSSIL_BREAKPOINT")!=0 ) __debugbreak(); 583 +#endif 580 584 581 585 sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); 582 586 memset(&g, 0, sizeof(g)); 583 587 g.now = time(0); 584 588 #ifdef FOSSIL_ENABLE_JSON 585 589 #if defined(NDEBUG) 586 590 g.json.errorDetailParanoia = 2 /* FIXME: make configurable
Changes to win/Makefile.msc.mistachkin.
9 9 # 10 10 B = .. 11 11 SRCDIR = $B\src 12 12 OBJDIR = . 13 13 OX = . 14 14 O = .obj 15 15 E = .exe 16 + 17 +DEBUG = 1 16 18 17 19 # Uncomment below for SSL support 18 20 SSL = 19 21 SSLLIB = 20 -#SSL = -DFOSSIL_ENABLE_SSL=1 21 -#SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib 22 +SSL = -DFOSSIL_ENABLE_SSL=1 23 +SSLINCDIR = $(SRCDIR)\..\openssl-1.0.1c\include 24 +SSLLIBDIR = $(SRCDIR)\..\openssl-1.0.1c 25 +SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib 22 26 23 27 # zlib options 24 28 # When using precompiled from http://zlib.net/zlib125-dll.zip 25 29 #ZINCDIR = C:\zlib125-dll\include 26 30 #ZLIBDIR = C:\zlib125-dll\lib 27 31 #ZLIB = zdll.lib 28 32 ZINCDIR = $(SRCDIR)\..\zlib-1.2.7 29 33 ZLIBDIR = $(SRCDIR)\..\zlib-1.2.7 30 34 ZLIB = zlib.lib 31 35 32 36 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) 33 37 38 +!IF $(DEBUG)!=0 39 +CFLAGS = -nologo -MTd -Od -Zi -D_DEBUG 40 +LFLAGS = -DEBUG 41 +!ELSE 34 42 CFLAGS = -nologo -MT -O2 43 +LFLAGS = 44 +!ENDIF 45 + 35 46 BCC = $(CC) $(CFLAGS) 36 47 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL) 37 48 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) 38 49 LIBDIR = -LIBPATH:$(ZLIBDIR) 39 50 40 51 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0 41 52 42 -SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c 53 +SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c 43 54 44 -OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_config$O $(OX)\json_diff$O $(OX)\json_dir$O $(OX)\json_finfo$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\wysiwyg$O $(OX)\xfer$O $(OX)\xfersetup$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O 55 +OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_config$O $(OX)\json_diff$O $(OX)\json_dir$O $(OX)\json_finfo$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\moderate$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\wysiwyg$O $(OX)\xfer$O $(OX)\xfersetup$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O 45 56 46 57 47 58 APPNAME = $(OX)\fossil$(E) 48 59 49 60 all: $(OX) $(APPNAME) 50 61 51 62 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts 52 63 cd $(OX) 53 - link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts 64 + link /NODEFAULTLIB:msvcrt -OUT:$@ $(LFLAGS) $(LIBDIR) @linkopts 54 65 55 66 $(OX)\linkopts: $B\win\Makefile.msc 56 67 echo $(OX)\add.obj > $@ 57 68 echo $(OX)\allrepo.obj >> $@ 58 69 echo $(OX)\attach.obj >> $@ 59 70 echo $(OX)\bag.obj >> $@ 60 71 echo $(OX)\bisect.obj >> $@ ................................................................................ 108 119 echo $(OX)\leaf.obj >> $@ 109 120 echo $(OX)\login.obj >> $@ 110 121 echo $(OX)\main.obj >> $@ 111 122 echo $(OX)\manifest.obj >> $@ 112 123 echo $(OX)\md5.obj >> $@ 113 124 echo $(OX)\merge.obj >> $@ 114 125 echo $(OX)\merge3.obj >> $@ 126 + echo $(OX)\moderate.obj >> $@ 115 127 echo $(OX)\name.obj >> $@ 116 128 echo $(OX)\path.obj >> $@ 117 129 echo $(OX)\pivot.obj >> $@ 118 130 echo $(OX)\popen.obj >> $@ 119 131 echo $(OX)\pqueue.obj >> $@ 120 132 echo $(OX)\printf.obj >> $@ 121 133 echo $(OX)\rebuild.obj >> $@ ................................................................................ 568 580 translate$E $** > $@ 569 581 570 582 $(OX)\merge3$O : merge3_.c merge3.h 571 583 $(TCC) /Fo$@ -c merge3_.c 572 584 573 585 merge3_.c : $(SRCDIR)\merge3.c 574 586 translate$E $** > $@ 587 + 588 +$(OX)\moderate$O : moderate_.c moderate.h 589 + $(TCC) /Fo$@ -c moderate_.c 590 + 591 +moderate_.c : $(SRCDIR)\moderate.c 592 + translate$E $** > $@ 575 593 576 594 $(OX)\name$O : name_.c name.h 577 595 $(TCC) /Fo$@ -c name_.c 578 596 579 597 name_.c : $(SRCDIR)\name.c 580 598 translate$E $** > $@ 581 599 ................................................................................ 804 822 $(OX)\zip$O : zip_.c zip.h 805 823 $(TCC) /Fo$@ -c zip_.c 806 824 807 825 zip_.c : $(SRCDIR)\zip.c 808 826 translate$E $** > $@ 809 827 810 828 headers: makeheaders$E page_index.h VERSION.h 811 - makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h 829 + makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h 812 830 @copy /Y nul: headers