Fossil SCM

Changes to support easier debugging on Windows.

mistachkin 2012-11-26 23:54 UTC trunk
Commit 642e543c2890212c2661611064a96176d2d78278
Parent 9b800ee41c32c4e…
2 files changed +4 +24 -6
~ src/main.c ~ win/Makefile.msc.mistachkin
M src/main.c
+4
--- src/main.c
+++ src/main.c
@@ -575,10 +575,14 @@
575575
 int main(int argc, char **argv)
576576
 {
577577
 const char *zCmdName = "unknown";
578578
 int idx;
579579
 int rc;
580
+
581
+#if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG)
582
+ if( _wgetenv(L"FOSSIL_BREAKPOINT")!=0 ) __debugbreak();
583
+#endif
580584
581585
 sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
582586
 memset(&g, 0, sizeof(g));
583587
 g.now = time(0);
584588
 #ifdef FOSSIL_ENABLE_JSON
585589
--- src/main.c
+++ src/main.c
@@ -575,10 +575,14 @@
575 int main(int argc, char **argv)
576 {
577 const char *zCmdName = "unknown";
578 int idx;
579 int rc;
 
 
 
 
580
581 sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
582 memset(&g, 0, sizeof(g));
583 g.now = time(0);
584 #ifdef FOSSIL_ENABLE_JSON
585
--- src/main.c
+++ src/main.c
@@ -575,10 +575,14 @@
575 int main(int argc, char **argv)
576 {
577 const char *zCmdName = "unknown";
578 int idx;
579 int rc;
580
581 #if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG)
582 if( _wgetenv(L"FOSSIL_BREAKPOINT")!=0 ) __debugbreak();
583 #endif
584
585 sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
586 memset(&g, 0, sizeof(g));
587 g.now = time(0);
588 #ifdef FOSSIL_ENABLE_JSON
589
M win/Makefile.msc.mistachkin
+24 -6
--- win/Makefile.msc.mistachkin
+++ win/Makefile.msc.mistachkin
@@ -11,16 +11,20 @@
1111
 SRCDIR = $B\src
1212
 OBJDIR = .
1313
 OX = .
1414
 O = .obj
1515
 E = .exe
16
+
17
+DEBUG = 1
1618
1719
 # Uncomment below for SSL support
1820
 SSL =
1921
 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
2226
2327
 # zlib options
2428
 # When using precompiled from http://zlib.net/zlib125-dll.zip
2529
 #ZINCDIR = C:\zlib125-dll\include
2630
 #ZLIBDIR = C:\zlib125-dll\lib
@@ -29,30 +33,37 @@
2933
 ZLIBDIR = $(SRCDIR)\..\zlib-1.2.7
3034
 ZLIB = zlib.lib
3135
3236
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
3337
38
+!IF $(DEBUG)!=0
39
+CFLAGS = -nologo -MTd -Od -Zi -D_DEBUG
40
+LFLAGS = -DEBUG
41
+!ELSE
3442
 CFLAGS = -nologo -MT -O2
43
+LFLAGS =
44
+!ENDIF
45
+
3546
 BCC = $(CC) $(CFLAGS)
3647
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
3748
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
3849
 LIBDIR = -LIBPATH:$(ZLIBDIR)
3950
4051
 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
4152
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
4354
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
4556
4657
4758
 APPNAME = $(OX)\fossil$(E)
4859
4960
 all: $(OX) $(APPNAME)
5061
5162
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
5263
 cd $(OX)
53
- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts
64
+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LFLAGS) $(LIBDIR) @linkopts
5465
5566
 $(OX)\linkopts: $B\win\Makefile.msc
5667
 echo $(OX)\add.obj > $@
5768
 echo $(OX)\allrepo.obj >> $@
5869
 echo $(OX)\attach.obj >> $@
@@ -110,10 +121,11 @@
110121
 echo $(OX)\main.obj >> $@
111122
 echo $(OX)\manifest.obj >> $@
112123
 echo $(OX)\md5.obj >> $@
113124
 echo $(OX)\merge.obj >> $@
114125
 echo $(OX)\merge3.obj >> $@
126
+ echo $(OX)\moderate.obj >> $@
115127
 echo $(OX)\name.obj >> $@
116128
 echo $(OX)\path.obj >> $@
117129
 echo $(OX)\pivot.obj >> $@
118130
 echo $(OX)\popen.obj >> $@
119131
 echo $(OX)\pqueue.obj >> $@
@@ -570,10 +582,16 @@
570582
 $(OX)\merge3$O : merge3_.c merge3.h
571583
 $(TCC) /Fo$@ -c merge3_.c
572584
573585
 merge3_.c : $(SRCDIR)\merge3.c
574586
 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 $** > $@
575593
576594
 $(OX)\name$O : name_.c name.h
577595
 $(TCC) /Fo$@ -c name_.c
578596
579597
 name_.c : $(SRCDIR)\name.c
@@ -806,7 +824,7 @@
806824
807825
 zip_.c : $(SRCDIR)\zip.c
808826
 translate$E $** > $@
809827
810828
 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
812830
 @copy /Y nul: headers
813831
--- win/Makefile.msc.mistachkin
+++ win/Makefile.msc.mistachkin
@@ -11,16 +11,20 @@
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
 
 
16
17 # Uncomment below for SSL support
18 SSL =
19 SSLLIB =
20 #SSL = -DFOSSIL_ENABLE_SSL=1
21 #SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
 
 
22
23 # zlib options
24 # When using precompiled from http://zlib.net/zlib125-dll.zip
25 #ZINCDIR = C:\zlib125-dll\include
26 #ZLIBDIR = C:\zlib125-dll\lib
@@ -29,30 +33,37 @@
29 ZLIBDIR = $(SRCDIR)\..\zlib-1.2.7
30 ZLIB = zlib.lib
31
32 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
33
 
 
 
 
34 CFLAGS = -nologo -MT -O2
 
 
 
35 BCC = $(CC) $(CFLAGS)
36 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
37 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
38 LIBDIR = -LIBPATH:$(ZLIBDIR)
39
40 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
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
43
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
45
46
47 APPNAME = $(OX)\fossil$(E)
48
49 all: $(OX) $(APPNAME)
50
51 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
52 cd $(OX)
53 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts
54
55 $(OX)\linkopts: $B\win\Makefile.msc
56 echo $(OX)\add.obj > $@
57 echo $(OX)\allrepo.obj >> $@
58 echo $(OX)\attach.obj >> $@
@@ -110,10 +121,11 @@
110 echo $(OX)\main.obj >> $@
111 echo $(OX)\manifest.obj >> $@
112 echo $(OX)\md5.obj >> $@
113 echo $(OX)\merge.obj >> $@
114 echo $(OX)\merge3.obj >> $@
 
115 echo $(OX)\name.obj >> $@
116 echo $(OX)\path.obj >> $@
117 echo $(OX)\pivot.obj >> $@
118 echo $(OX)\popen.obj >> $@
119 echo $(OX)\pqueue.obj >> $@
@@ -570,10 +582,16 @@
570 $(OX)\merge3$O : merge3_.c merge3.h
571 $(TCC) /Fo$@ -c merge3_.c
572
573 merge3_.c : $(SRCDIR)\merge3.c
574 translate$E $** > $@
 
 
 
 
 
 
575
576 $(OX)\name$O : name_.c name.h
577 $(TCC) /Fo$@ -c name_.c
578
579 name_.c : $(SRCDIR)\name.c
@@ -806,7 +824,7 @@
806
807 zip_.c : $(SRCDIR)\zip.c
808 translate$E $** > $@
809
810 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
812 @copy /Y nul: headers
813
--- win/Makefile.msc.mistachkin
+++ win/Makefile.msc.mistachkin
@@ -11,16 +11,20 @@
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16
17 DEBUG = 1
18
19 # Uncomment below for SSL support
20 SSL =
21 SSLLIB =
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
26
27 # zlib options
28 # When using precompiled from http://zlib.net/zlib125-dll.zip
29 #ZINCDIR = C:\zlib125-dll\include
30 #ZLIBDIR = C:\zlib125-dll\lib
@@ -29,30 +33,37 @@
33 ZLIBDIR = $(SRCDIR)\..\zlib-1.2.7
34 ZLIB = zlib.lib
35
36 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
37
38 !IF $(DEBUG)!=0
39 CFLAGS = -nologo -MTd -Od -Zi -D_DEBUG
40 LFLAGS = -DEBUG
41 !ELSE
42 CFLAGS = -nologo -MT -O2
43 LFLAGS =
44 !ENDIF
45
46 BCC = $(CC) $(CFLAGS)
47 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
48 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
49 LIBDIR = -LIBPATH:$(ZLIBDIR)
50
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
52
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
54
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
56
57
58 APPNAME = $(OX)\fossil$(E)
59
60 all: $(OX) $(APPNAME)
61
62 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
63 cd $(OX)
64 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LFLAGS) $(LIBDIR) @linkopts
65
66 $(OX)\linkopts: $B\win\Makefile.msc
67 echo $(OX)\add.obj > $@
68 echo $(OX)\allrepo.obj >> $@
69 echo $(OX)\attach.obj >> $@
@@ -110,10 +121,11 @@
121 echo $(OX)\main.obj >> $@
122 echo $(OX)\manifest.obj >> $@
123 echo $(OX)\md5.obj >> $@
124 echo $(OX)\merge.obj >> $@
125 echo $(OX)\merge3.obj >> $@
126 echo $(OX)\moderate.obj >> $@
127 echo $(OX)\name.obj >> $@
128 echo $(OX)\path.obj >> $@
129 echo $(OX)\pivot.obj >> $@
130 echo $(OX)\popen.obj >> $@
131 echo $(OX)\pqueue.obj >> $@
@@ -570,10 +582,16 @@
582 $(OX)\merge3$O : merge3_.c merge3.h
583 $(TCC) /Fo$@ -c merge3_.c
584
585 merge3_.c : $(SRCDIR)\merge3.c
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 $** > $@
593
594 $(OX)\name$O : name_.c name.h
595 $(TCC) /Fo$@ -c name_.c
596
597 name_.c : $(SRCDIR)\name.c
@@ -806,7 +824,7 @@
824
825 zip_.c : $(SRCDIR)\zip.c
826 translate$E $** > $@
827
828 headers: makeheaders$E page_index.h VERSION.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
830 @copy /Y nul: headers
831

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button