Fossil SCM

Add a mechanism to allow resource files (such as the TCL script used to implement the --tk option) to be stored separately in the source tree but then automatically compiled into byte-arrays in the executable.

drh 2014-10-27 15:41 UTC trunk

Commit d93d92eb5ac2a7e063b1e0fdb2f25f69f6bb762c

Parent 476f812e185015c…

10 files changed +1 +1 -387 +22 -1 +64 -9 +61 +6 -3 +18 -6 +28 -2 +19 -1

+ src/builtin.c + src/diff.tcl ~ src/diffcmd.c ~ src/main.mk ~ src/makemake.tcl + src/mkbuiltin.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc

A src/builtin.c

		--- a/src/builtin.c
		+++ b/src/builtin.c
		@@ -0,0 +1 @@
	1	+sizeof(aBuiltinFilesizeof(aBuiltinFil/if(==0 )

	--- a/src/builtin.c
	+++ b/src/builtin.c
	@@ -0,0 +1 @@

	--- a/src/builtin.c
	+++ b/src/builtin.c
	@@ -0,0 +1 @@
1	sizeof(aBuiltinFilesizeof(aBuiltinFil/if(==0 )

A src/diff.tcl

No diff available

M src/diffcmd.c

+1 -387

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -617,396 +617,10 @@
617	617	zName = "diff-command";
618	618	}
619	619	return db_get(zName, zDefault);
620	620	}
621	621
622		-/* A Tcl/Tk script used to render diff output.
623		-*/
624		-static const char zDiffScript[] =
625		-@ set prog {
626		-@ package require Tk
627		-@
628		-@ array set CFG {
629		-@ TITLE {Fossil Diff}
630		-@ LN_COL_BG #dddddd
631		-@ LN_COL_FG #444444
632		-@ TXT_COL_BG #ffffff
633		-@ TXT_COL_FG #000000
634		-@ MKR_COL_BG #444444
635		-@ MKR_COL_FG #dddddd
636		-@ CHNG_BG #d0d0ff
637		-@ ADD_BG #c0ffc0
638		-@ RM_BG #ffc0c0
639		-@ HR_FG #888888
640		-@ HR_PAD_TOP 4
641		-@ HR_PAD_BTM 8
642		-@ FN_BG #444444
643		-@ FN_FG #ffffff
644		-@ FN_PAD 5
645		-@ ERR_FG #ee0000
646		-@ PADX 5
647		-@ WIDTH 80
648		-@ HEIGHT 45
649		-@ LB_HEIGHT 25
650		-@ }
651		-@
652		-@ if {![namespace exists ttk]} {
653		-@ interp alias {} ::ttk::scrollbar {} ::scrollbar
654		-@ interp alias {} ::ttk::menubutton {} ::menubutton
655		-@ }
656		-@
657		-@ proc dehtml {x} {
658		-@ set x [regsub -all {<[^>]*>} $x {}]
659		-@ return [string map {& & < < > > ' ' " \"} $x]
660		-@ }
661		-@
662		-@ proc cols {} {
663		-@ return [list .lnA .txtA .mkr .lnB .txtB]
664		-@ }
665		-@
666		-@ proc colType {c} {
667		-@ regexp {[a-z]+} $c type
668		-@ return $type
669		-@ }
670		-@
671		-@ proc getLine {difftxt N iivar} {
672		-@ upvar $iivar ii
673		-@ if {$ii>=$N} {return -1}
674		-@ set x [lindex $difftxt $ii]
675		-@ incr ii
676		-@ return $x
677		-@ }
678		-@
679		-@ proc readDiffs {fossilcmd} {
680		-@ global difftxt
681		-@ if {![info exists difftxt]} {
682		-@ set in [open $fossilcmd r]
683		-@ fconfigure $in -encoding utf-8
684		-@ set difftxt [split [read $in] \n]
685		-@ close $in
686		-@ }
687		-@ set N [llength $difftxt]
688		-@ set ii 0
689		-@ set nDiffs 0
690		-@ array set widths {txt 0 ln 0 mkr 0}
691		-@ while {[set line [getLine $difftxt $N ii]] != -1} {
692		-@ set fn2 {}
693		-@ if {![regexp {^=+ (.?) =+ versus =+ (.?) =+$} $line all fn fn2]
694		-@ && ![regexp {^=+ (.*?) =+$} $line all fn]
695		-@ } {
696		-@ continue
697		-@ }
698		-@ set errMsg ""
699		-@ set line [getLine $difftxt $N ii]
700		-@ if {[string compare -length 6 $line "<table"]
701		-@ && ![regexp {<p[^>]*>(.+)} $line - errMsg]} {
702		-@ continue
703		-@ }
704		-@ incr nDiffs
705		-@ set idx [expr {$nDiffs > 1 ? [.txtA index end] : "1.0"}]
706		-@ .wfiles.lb insert end $fn
707		-@
708		-@ foreach c [cols] {
709		-@ if {$nDiffs > 1} {
710		-@ $c insert end \n -
711		-@ }
712		-@ if {[colType $c] eq "txt"} {
713		-@ $c insert end $fn\n fn
714		-@ if {$fn2!=""} {set fn $fn2}
715		-@ } else {
716		-@ $c insert end \n fn
717		-@ }
718		-@ $c insert end \n -
719		-@
720		-@ if {$errMsg ne ""} continue
721		-@ while {[getLine $difftxt $N ii] ne "<pre>"} continue
722		-@ set type [colType $c]
723		-@ set str {}
724		-@ while {[set line [getLine $difftxt $N ii]] ne "</pre>"} {
725		-@ set len [string length [dehtml $line]]
726		-@ if {$len > $widths($type)} {
727		-@ set widths($type) $len
728		-@ }
729		-@ append str $line\n
730		-@ }
731		-@
732		-@ set re {<span class="diff([a-z]+)">([^<]*)</span>}
733		-@ # Use \r as separator since it can't appear in the diff output (it gets
734		-@ # converted to a space).
735		-@ set str [regsub -all $re $str "\r\\1\r\\2\r"]
736		-@ foreach {pre class mid} [split $str \r] {
737		-@ if {$class ne ""} {
738		-@ $c insert end [dehtml $pre] - [dehtml $mid] [list $class -]
739		-@ } else {
740		-@ $c insert end [dehtml $pre] -
741		-@ }
742		-@ }
743		-@ }
744		-@
745		-@ if {$errMsg ne ""} {
746		-@ foreach c {.txtA .txtB} {$c insert end [string trim $errMsg] err}
747		-@ foreach c [cols] {$c insert end \n -}
748		-@ }
749		-@ }
750		-@
751		-@ foreach c [cols] {
752		-@ set type [colType $c]
753		-@ if {$type ne "txt"} {
754		-@ $c config -width $widths($type)
755		-@ }
756		-@ $c config -state disabled
757		-@ }
758		-@ if {$nDiffs <= [.wfiles.lb cget -height]} {
759		-@ .wfiles.lb config -height $nDiffs
760		-@ grid remove .wfiles.sb
761		-@ }
762		-@
763		-@ return $nDiffs
764		-@ }
765		-@
766		-@ proc viewDiff {idx} {
767		-@ .txtA yview $idx
768		-@ .txtA xview moveto 0
769		-@ }
770		-@
771		-@ proc cycleDiffs {{reverse 0}} {
772		-@ if {$reverse} {
773		-@ set range [.txtA tag prevrange fn @0,0 1.0]
774		-@ if {$range eq ""} {
775		-@ viewDiff {fn.last -1c}
776		-@ } else {
777		-@ viewDiff [lindex $range 0]
778		-@ }
779		-@ } else {
780		-@ set range [.txtA tag nextrange fn {@0,0 +1c} end]
781		-@ if {$range eq "" \|\| [lindex [.txtA yview] 1] == 1} {
782		-@ viewDiff fn.first
783		-@ } else {
784		-@ viewDiff [lindex $range 0]
785		-@ }
786		-@ }
787		-@ }
788		-@
789		-@ proc xvis {col} {
790		-@ set view [$col xview]
791		-@ return [expr {[lindex $view 1]-[lindex $view 0]}]
792		-@ }
793		-@
794		-@ proc scroll-x {args} {
795		-@ set c .txt[expr {[xvis .txtA] < [xvis .txtB] ? "A" : "B"}]
796		-@ eval $c xview $args
797		-@ }
798		-@
799		-@ interp alias {} scroll-y {} .txtA yview
800		-@
801		-@ proc noop {args} {}
802		-@
803		-@ proc enableSync {axis} {
804		-@ update idletasks
805		-@ interp alias {} sync-$axis {}
806		-@ rename _sync-$axis sync-$axis
807		-@ }
808		-@
809		-@ proc disableSync {axis} {
810		-@ rename sync-$axis _sync-$axis
811		-@ interp alias {} sync-$axis {} noop
812		-@ }
813		-@
814		-@ proc sync-x {col first last} {
815		-@ disableSync x
816		-@ $col xview moveto [expr {$first*[xvis $col]/($last-$first)}]
817		-@ foreach side {A B} {
818		-@ set sb .sbx$side
819		-@ set xview [.txt$side xview]
820		-@ if {[lindex $xview 0] > 0 \|\| [lindex $xview 1] < 1} {
821		-@ grid $sb
822		-@ eval $sb set $xview
823		-@ } else {
824		-@ grid remove $sb
825		-@ }
826		-@ }
827		-@ enableSync x
828		-@ }
829		-@
830		-@ proc sync-y {first last} {
831		-@ disableSync y
832		-@ foreach c [cols] {
833		-@ $c yview moveto $first
834		-@ }
835		-@ if {$first > 0 \|\| $last < 1} {
836		-@ grid .sby
837		-@ .sby set $first $last
838		-@ } else {
839		-@ grid remove .sby
840		-@ }
841		-@ enableSync y
842		-@ }
843		-@
844		-@ wm withdraw .
845		-@ wm title . $CFG(TITLE)
846		-@ wm iconname . $CFG(TITLE)
847		-@ bind . <q> exit
848		-@ bind . <Destroy> {after 0 exit}
849		-@ bind . <Tab> {cycleDiffs; break}
850		-@ bind . <<PrevWindow>> {cycleDiffs 1; break}
851		-@ bind . <Return> {
852		-@ event generate .bb.files <1>
853		-@ event generate .bb.files <ButtonRelease-1>
854		-@ break
855		-@ }
856		-@ foreach {key axis args} {
857		-@ Up y {scroll -5 units}
858		-@ Down y {scroll 5 units}
859		-@ Left x {scroll -5 units}
860		-@ Right x {scroll 5 units}
861		-@ Prior y {scroll -1 page}
862		-@ Next y {scroll 1 page}
863		-@ Home y {moveto 0}
864		-@ End y {moveto 1}
865		-@ } {
866		-@ bind . <$key> "scroll-$axis $args; break"
867		-@ bind . <Shift-$key> continue
868		-@ }
869		-@
870		-@ frame .bb
871		-@ ::ttk::menubutton .bb.files -text "Files"
872		-@ toplevel .wfiles
873		-@ wm withdraw .wfiles
874		-@ update idletasks
875		-@ wm transient .wfiles .
876		-@ wm overrideredirect .wfiles 1
877		-@ listbox .wfiles.lb -width 0 -height $CFG(LB_HEIGHT) -activestyle none \
878		-@ -yscroll {.wfiles.sb set}
879		-@ ::ttk::scrollbar .wfiles.sb -command {.wfiles.lb yview}
880		-@ grid .wfiles.lb .wfiles.sb -sticky ns
881		-@ bind .bb.files <1> {
882		-@ set x [winfo rootx %W]
883		-@ set y [expr {[winfo rooty %W]+[winfo height %W]}]
884		-@ wm geometry .wfiles +$x+$y
885		-@ wm deiconify .wfiles
886		-@ focus .wfiles.lb
887		-@ }
888		-@ bind .wfiles <FocusOut> {wm withdraw .wfiles}
889		-@ bind .wfiles <Escape> {focus .}
890		-@ foreach evt {1 Return} {
891		-@ bind .wfiles.lb <$evt> {
892		-@ catch {
893		-@ set idx [lindex [.txtA tag ranges fn] [expr {[%W curselection]*2}]]
894		-@ viewDiff $idx
895		-@ }
896		-@ focus .
897		-@ break
898		-@ }
899		-@ }
900		-@ bind .wfiles.lb <Motion> {
901		-@ %W selection clear 0 end
902		-@ %W selection set @%x,%y
903		-@ }
904		-@
905		-@ foreach {side syncCol} {A .txtB B .txtA} {
906		-@ set ln .ln$side
907		-@ text $ln
908		-@ $ln tag config - -justify right
909		-@
910		-@ set txt .txt$side
911		-@ text $txt -width $CFG(WIDTH) -height $CFG(HEIGHT) -wrap none \
912		-@ -xscroll "sync-x $syncCol"
913		-@ catch {$txt config -tabstyle wordprocessor} ;# Required for Tk>=8.5
914		-@ foreach tag {add rm chng} {
915		-@ $txt tag config $tag -background $CFG([string toupper $tag]_BG)
916		-@ $txt tag lower $tag
917		-@ }
918		-@ $txt tag config fn -background $CFG(FN_BG) -foreground $CFG(FN_FG) \
919		-@ -justify center
920		-@ $txt tag config err -foreground $CFG(ERR_FG)
921		-@ }
922		-@ text .mkr
923		-@
924		-@ foreach c [cols] {
925		-@ set keyPrefix [string toupper [colType $c]]_COL_
926		-@ if {[tk windowingsystem] eq "win32"} {$c config -font {courier 9}}
927		-@ $c config -bg $CFG(${keyPrefix}BG) -fg $CFG(${keyPrefix}FG) -borderwidth 0 \
928		-@ -padx $CFG(PADX) -yscroll sync-y
929		-@ $c tag config hr -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \
930		-@ -foreground $CFG(HR_FG)
931		-@ $c tag config fn -spacing1 $CFG(FN_PAD) -spacing3 $CFG(FN_PAD)
932		-@ bindtags $c ". $c Text all"
933		-@ bind $c <1> {focus %W}
934		-@ }
935		-@
936		-@ ::ttk::scrollbar .sby -command {.txtA yview} -orient vertical
937		-@ ::ttk::scrollbar .sbxA -command {.txtA xview} -orient horizontal
938		-@ ::ttk::scrollbar .sbxB -command {.txtB xview} -orient horizontal
939		-@ frame .spacer
940		-@
941		-@ if {[readDiffs $fossilcmd] == 0} {
942		-@ tk_messageBox -type ok -title $CFG(TITLE) -message "No changes"
943		-@ exit
944		-@ }
945		-@ update idletasks
946		-@
947		-@ proc saveDiff {} {
948		-@ set fn [tk_getSaveFile]
949		-@ if {$fn==""} return
950		-@ set out [open $fn wb]
951		-@ puts $out "#!/usr/bin/tclsh\n#\n# Run this script using 'tclsh' or 'wish'"
952		-@ puts $out "# to see the graphical diff.\n#"
953		-@ puts $out "set fossilcmd {}"
954		-@ puts $out "set prog [list $::prog]"
955		-@ puts $out "set difftxt \173"
956		-@ foreach e $::difftxt {puts $out [list $e]}
957		-@ puts $out "\175"
958		-@ puts $out "eval \$prog"
959		-@ close $out
960		-@ }
961		-@ proc invertDiff {} {
962		-@ global CFG
963		-@ array set x [grid info .txtA]
964		-@ if {$x(-column)==1} {
965		-@ grid config .lnB -column 0
966		-@ grid config .txtB -column 1
967		-@ .txtB tag config add -background $CFG(RM_BG)
968		-@ grid config .lnA -column 3
969		-@ grid config .txtA -column 4
970		-@ .txtA tag config rm -background $CFG(ADD_BG)
971		-@ } else {
972		-@ grid config .lnA -column 0
973		-@ grid config .txtA -column 1
974		-@ .txtA tag config rm -background $CFG(RM_BG)
975		-@ grid config .lnB -column 3
976		-@ grid config .txtB -column 4
977		-@ .txtB tag config add -background $CFG(ADD_BG)
978		-@ }
979		-@ .mkr config -state normal
980		-@ set clt [.mkr search -all < 1.0 end]
981		-@ set cgt [.mkr search -all > 1.0 end]
982		-@ foreach c $clt {.mkr replace $c "$c +1 chars" >}
983		-@ foreach c $cgt {.mkr replace $c "$c +1 chars" <}
984		-@ .mkr config -state disabled
985		-@ }
986		-@ ::ttk::button .bb.quit -text {Quit} -command exit
987		-@ ::ttk::button .bb.invert -text {Invert} -command invertDiff
988		-@ ::ttk::button .bb.save -text {Save As...} -command saveDiff
989		-@ pack .bb.quit .bb.invert -side left
990		-@ if {$fossilcmd!=""} {pack .bb.save -side left}
991		-@ pack .bb.files -side left
992		-@ grid rowconfigure . 1 -weight 1
993		-@ grid columnconfigure . 1 -weight 1
994		-@ grid columnconfigure . 4 -weight 1
995		-@ grid .bb -row 0 -columnspan 6
996		-@ eval grid [cols] -row 1 -sticky nsew
997		-@ grid .sby -row 1 -column 5 -sticky ns
998		-@ grid .sbxA -row 2 -columnspan 2 -sticky ew
999		-@ grid .spacer -row 2 -column 2
1000		-@ grid .sbxB -row 2 -column 3 -columnspan 2 -sticky ew
1001		-@
1002		-@ .spacer config -height [winfo height .sbxA]
1003		-@ wm deiconify .
1004		-@ }
1005		-@ eval $prog
1006		-;
1007		-
1008	622	/*
1009	623	** Show diff output in a Tcl/Tk window, in response to the --tk option
1010	624	** to the diff command.
1011	625	**
1012	626	** If fossil has direct access to a Tcl interpreter (either loaded
		@@ -1040,11 +654,11 @@
1040	654	int j;
1041	655	blob_append(&script, " ", 1);
1042	656	for(j=0; z[j]; j++) blob_appendf(&script, "\\%03o", (unsigned char)z[j]);
1043	657	}
1044	658	}
1045		- blob_appendf(&script, "}\n%s", zDiffScript);
	659	+ blob_appendf(&script, "}\n%s", builtin_file("diff.tcl", 0));
1046	660	if( zTempFile ){
1047	661	blob_write_to_file(&script, zTempFile);
1048	662	fossil_print("To see diff, run: tclsh \"%s\"\n", zTempFile);
1049	663	}else{
1050	664	#if defined(FOSSIL_ENABLE_TCL)
1051	665

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -617,396 +617,10 @@
617	zName = "diff-command";
618	}
619	return db_get(zName, zDefault);
620	}
621
622	/* A Tcl/Tk script used to render diff output.
623	*/
624	static const char zDiffScript[] =
625	@ set prog {
626	@ package require Tk
627	@
628	@ array set CFG {
629	@ TITLE {Fossil Diff}
630	@ LN_COL_BG #dddddd
631	@ LN_COL_FG #444444
632	@ TXT_COL_BG #ffffff
633	@ TXT_COL_FG #000000
634	@ MKR_COL_BG #444444
635	@ MKR_COL_FG #dddddd
636	@ CHNG_BG #d0d0ff
637	@ ADD_BG #c0ffc0
638	@ RM_BG #ffc0c0
639	@ HR_FG #888888
640	@ HR_PAD_TOP 4
641	@ HR_PAD_BTM 8
642	@ FN_BG #444444
643	@ FN_FG #ffffff
644	@ FN_PAD 5
645	@ ERR_FG #ee0000
646	@ PADX 5
647	@ WIDTH 80
648	@ HEIGHT 45
649	@ LB_HEIGHT 25
650	@ }
651	@
652	@ if {![namespace exists ttk]} {
653	@ interp alias {} ::ttk::scrollbar {} ::scrollbar
654	@ interp alias {} ::ttk::menubutton {} ::menubutton
655	@ }
656	@
657	@ proc dehtml {x} {
658	@ set x [regsub -all {<[^>]*>} $x {}]
659	@ return [string map {& & < < > > ' ' " \"} $x]
660	@ }
661	@
662	@ proc cols {} {
663	@ return [list .lnA .txtA .mkr .lnB .txtB]
664	@ }
665	@
666	@ proc colType {c} {
667	@ regexp {[a-z]+} $c type
668	@ return $type
669	@ }
670	@
671	@ proc getLine {difftxt N iivar} {
672	@ upvar $iivar ii
673	@ if {$ii>=$N} {return -1}
674	@ set x [lindex $difftxt $ii]
675	@ incr ii
676	@ return $x
677	@ }
678	@
679	@ proc readDiffs {fossilcmd} {
680	@ global difftxt
681	@ if {![info exists difftxt]} {
682	@ set in [open $fossilcmd r]
683	@ fconfigure $in -encoding utf-8
684	@ set difftxt [split [read $in] \n]
685	@ close $in
686	@ }
687	@ set N [llength $difftxt]
688	@ set ii 0
689	@ set nDiffs 0
690	@ array set widths {txt 0 ln 0 mkr 0}
691	@ while {[set line [getLine $difftxt $N ii]] != -1} {
692	@ set fn2 {}
693	@ if {![regexp {^=+ (.?) =+ versus =+ (.?) =+$} $line all fn fn2]
694	@ && ![regexp {^=+ (.*?) =+$} $line all fn]
695	@ } {
696	@ continue
697	@ }
698	@ set errMsg ""
699	@ set line [getLine $difftxt $N ii]
700	@ if {[string compare -length 6 $line "<table"]
701	@ && ![regexp {<p[^>]*>(.+)} $line - errMsg]} {
702	@ continue
703	@ }
704	@ incr nDiffs
705	@ set idx [expr {$nDiffs > 1 ? [.txtA index end] : "1.0"}]
706	@ .wfiles.lb insert end $fn
707	@
708	@ foreach c [cols] {
709	@ if {$nDiffs > 1} {
710	@ $c insert end \n -
711	@ }
712	@ if {[colType $c] eq "txt"} {
713	@ $c insert end $fn\n fn
714	@ if {$fn2!=""} {set fn $fn2}
715	@ } else {
716	@ $c insert end \n fn
717	@ }
718	@ $c insert end \n -
719	@
720	@ if {$errMsg ne ""} continue
721	@ while {[getLine $difftxt $N ii] ne "<pre>"} continue
722	@ set type [colType $c]
723	@ set str {}
724	@ while {[set line [getLine $difftxt $N ii]] ne "</pre>"} {
725	@ set len [string length [dehtml $line]]
726	@ if {$len > $widths($type)} {
727	@ set widths($type) $len
728	@ }
729	@ append str $line\n
730	@ }
731	@
732	@ set re {<span class="diff([a-z]+)">([^<]*)</span>}
733	@ # Use \r as separator since it can't appear in the diff output (it gets
734	@ # converted to a space).
735	@ set str [regsub -all $re $str "\r\\1\r\\2\r"]
736	@ foreach {pre class mid} [split $str \r] {
737	@ if {$class ne ""} {
738	@ $c insert end [dehtml $pre] - [dehtml $mid] [list $class -]
739	@ } else {
740	@ $c insert end [dehtml $pre] -
741	@ }
742	@ }
743	@ }
744	@
745	@ if {$errMsg ne ""} {
746	@ foreach c {.txtA .txtB} {$c insert end [string trim $errMsg] err}
747	@ foreach c [cols] {$c insert end \n -}
748	@ }
749	@ }
750	@
751	@ foreach c [cols] {
752	@ set type [colType $c]
753	@ if {$type ne "txt"} {
754	@ $c config -width $widths($type)
755	@ }
756	@ $c config -state disabled
757	@ }
758	@ if {$nDiffs <= [.wfiles.lb cget -height]} {
759	@ .wfiles.lb config -height $nDiffs
760	@ grid remove .wfiles.sb
761	@ }
762	@
763	@ return $nDiffs
764	@ }
765	@
766	@ proc viewDiff {idx} {
767	@ .txtA yview $idx
768	@ .txtA xview moveto 0
769	@ }
770	@
771	@ proc cycleDiffs {{reverse 0}} {
772	@ if {$reverse} {
773	@ set range [.txtA tag prevrange fn @0,0 1.0]
774	@ if {$range eq ""} {
775	@ viewDiff {fn.last -1c}
776	@ } else {
777	@ viewDiff [lindex $range 0]
778	@ }
779	@ } else {
780	@ set range [.txtA tag nextrange fn {@0,0 +1c} end]
781	@ if {$range eq "" \|\| [lindex [.txtA yview] 1] == 1} {
782	@ viewDiff fn.first
783	@ } else {
784	@ viewDiff [lindex $range 0]
785	@ }
786	@ }
787	@ }
788	@
789	@ proc xvis {col} {
790	@ set view [$col xview]
791	@ return [expr {[lindex $view 1]-[lindex $view 0]}]
792	@ }
793	@
794	@ proc scroll-x {args} {
795	@ set c .txt[expr {[xvis .txtA] < [xvis .txtB] ? "A" : "B"}]
796	@ eval $c xview $args
797	@ }
798	@
799	@ interp alias {} scroll-y {} .txtA yview
800	@
801	@ proc noop {args} {}
802	@
803	@ proc enableSync {axis} {
804	@ update idletasks
805	@ interp alias {} sync-$axis {}
806	@ rename _sync-$axis sync-$axis
807	@ }
808	@
809	@ proc disableSync {axis} {
810	@ rename sync-$axis _sync-$axis
811	@ interp alias {} sync-$axis {} noop
812	@ }
813	@
814	@ proc sync-x {col first last} {
815	@ disableSync x
816	@ $col xview moveto [expr {$first*[xvis $col]/($last-$first)}]
817	@ foreach side {A B} {
818	@ set sb .sbx$side
819	@ set xview [.txt$side xview]
820	@ if {[lindex $xview 0] > 0 \|\| [lindex $xview 1] < 1} {
821	@ grid $sb
822	@ eval $sb set $xview
823	@ } else {
824	@ grid remove $sb
825	@ }
826	@ }
827	@ enableSync x
828	@ }
829	@
830	@ proc sync-y {first last} {
831	@ disableSync y
832	@ foreach c [cols] {
833	@ $c yview moveto $first
834	@ }
835	@ if {$first > 0 \|\| $last < 1} {
836	@ grid .sby
837	@ .sby set $first $last
838	@ } else {
839	@ grid remove .sby
840	@ }
841	@ enableSync y
842	@ }
843	@
844	@ wm withdraw .
845	@ wm title . $CFG(TITLE)
846	@ wm iconname . $CFG(TITLE)
847	@ bind . <q> exit
848	@ bind . <Destroy> {after 0 exit}
849	@ bind . <Tab> {cycleDiffs; break}
850	@ bind . <<PrevWindow>> {cycleDiffs 1; break}
851	@ bind . <Return> {
852	@ event generate .bb.files <1>
853	@ event generate .bb.files <ButtonRelease-1>
854	@ break
855	@ }
856	@ foreach {key axis args} {
857	@ Up y {scroll -5 units}
858	@ Down y {scroll 5 units}
859	@ Left x {scroll -5 units}
860	@ Right x {scroll 5 units}
861	@ Prior y {scroll -1 page}
862	@ Next y {scroll 1 page}
863	@ Home y {moveto 0}
864	@ End y {moveto 1}
865	@ } {
866	@ bind . <$key> "scroll-$axis $args; break"
867	@ bind . <Shift-$key> continue
868	@ }
869	@
870	@ frame .bb
871	@ ::ttk::menubutton .bb.files -text "Files"
872	@ toplevel .wfiles
873	@ wm withdraw .wfiles
874	@ update idletasks
875	@ wm transient .wfiles .
876	@ wm overrideredirect .wfiles 1
877	@ listbox .wfiles.lb -width 0 -height $CFG(LB_HEIGHT) -activestyle none \
878	@ -yscroll {.wfiles.sb set}
879	@ ::ttk::scrollbar .wfiles.sb -command {.wfiles.lb yview}
880	@ grid .wfiles.lb .wfiles.sb -sticky ns
881	@ bind .bb.files <1> {
882	@ set x [winfo rootx %W]
883	@ set y [expr {[winfo rooty %W]+[winfo height %W]}]
884	@ wm geometry .wfiles +$x+$y
885	@ wm deiconify .wfiles
886	@ focus .wfiles.lb
887	@ }
888	@ bind .wfiles <FocusOut> {wm withdraw .wfiles}
889	@ bind .wfiles <Escape> {focus .}
890	@ foreach evt {1 Return} {
891	@ bind .wfiles.lb <$evt> {
892	@ catch {
893	@ set idx [lindex [.txtA tag ranges fn] [expr {[%W curselection]*2}]]
894	@ viewDiff $idx
895	@ }
896	@ focus .
897	@ break
898	@ }
899	@ }
900	@ bind .wfiles.lb <Motion> {
901	@ %W selection clear 0 end
902	@ %W selection set @%x,%y
903	@ }
904	@
905	@ foreach {side syncCol} {A .txtB B .txtA} {
906	@ set ln .ln$side
907	@ text $ln
908	@ $ln tag config - -justify right
909	@
910	@ set txt .txt$side
911	@ text $txt -width $CFG(WIDTH) -height $CFG(HEIGHT) -wrap none \
912	@ -xscroll "sync-x $syncCol"
913	@ catch {$txt config -tabstyle wordprocessor} ;# Required for Tk>=8.5
914	@ foreach tag {add rm chng} {
915	@ $txt tag config $tag -background $CFG([string toupper $tag]_BG)
916	@ $txt tag lower $tag
917	@ }
918	@ $txt tag config fn -background $CFG(FN_BG) -foreground $CFG(FN_FG) \
919	@ -justify center
920	@ $txt tag config err -foreground $CFG(ERR_FG)
921	@ }
922	@ text .mkr
923	@
924	@ foreach c [cols] {
925	@ set keyPrefix [string toupper [colType $c]]_COL_
926	@ if {[tk windowingsystem] eq "win32"} {$c config -font {courier 9}}
927	@ $c config -bg $CFG(${keyPrefix}BG) -fg $CFG(${keyPrefix}FG) -borderwidth 0 \
928	@ -padx $CFG(PADX) -yscroll sync-y
929	@ $c tag config hr -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \
930	@ -foreground $CFG(HR_FG)
931	@ $c tag config fn -spacing1 $CFG(FN_PAD) -spacing3 $CFG(FN_PAD)
932	@ bindtags $c ". $c Text all"
933	@ bind $c <1> {focus %W}
934	@ }
935	@
936	@ ::ttk::scrollbar .sby -command {.txtA yview} -orient vertical
937	@ ::ttk::scrollbar .sbxA -command {.txtA xview} -orient horizontal
938	@ ::ttk::scrollbar .sbxB -command {.txtB xview} -orient horizontal
939	@ frame .spacer
940	@
941	@ if {[readDiffs $fossilcmd] == 0} {
942	@ tk_messageBox -type ok -title $CFG(TITLE) -message "No changes"
943	@ exit
944	@ }
945	@ update idletasks
946	@
947	@ proc saveDiff {} {
948	@ set fn [tk_getSaveFile]
949	@ if {$fn==""} return
950	@ set out [open $fn wb]
951	@ puts $out "#!/usr/bin/tclsh\n#\n# Run this script using 'tclsh' or 'wish'"
952	@ puts $out "# to see the graphical diff.\n#"
953	@ puts $out "set fossilcmd {}"
954	@ puts $out "set prog [list $::prog]"
955	@ puts $out "set difftxt \173"
956	@ foreach e $::difftxt {puts $out [list $e]}
957	@ puts $out "\175"
958	@ puts $out "eval \$prog"
959	@ close $out
960	@ }
961	@ proc invertDiff {} {
962	@ global CFG
963	@ array set x [grid info .txtA]
964	@ if {$x(-column)==1} {
965	@ grid config .lnB -column 0
966	@ grid config .txtB -column 1
967	@ .txtB tag config add -background $CFG(RM_BG)
968	@ grid config .lnA -column 3
969	@ grid config .txtA -column 4
970	@ .txtA tag config rm -background $CFG(ADD_BG)
971	@ } else {
972	@ grid config .lnA -column 0
973	@ grid config .txtA -column 1
974	@ .txtA tag config rm -background $CFG(RM_BG)
975	@ grid config .lnB -column 3
976	@ grid config .txtB -column 4
977	@ .txtB tag config add -background $CFG(ADD_BG)
978	@ }
979	@ .mkr config -state normal
980	@ set clt [.mkr search -all < 1.0 end]
981	@ set cgt [.mkr search -all > 1.0 end]
982	@ foreach c $clt {.mkr replace $c "$c +1 chars" >}
983	@ foreach c $cgt {.mkr replace $c "$c +1 chars" <}
984	@ .mkr config -state disabled
985	@ }
986	@ ::ttk::button .bb.quit -text {Quit} -command exit
987	@ ::ttk::button .bb.invert -text {Invert} -command invertDiff
988	@ ::ttk::button .bb.save -text {Save As...} -command saveDiff
989	@ pack .bb.quit .bb.invert -side left
990	@ if {$fossilcmd!=""} {pack .bb.save -side left}
991	@ pack .bb.files -side left
992	@ grid rowconfigure . 1 -weight 1
993	@ grid columnconfigure . 1 -weight 1
994	@ grid columnconfigure . 4 -weight 1
995	@ grid .bb -row 0 -columnspan 6
996	@ eval grid [cols] -row 1 -sticky nsew
997	@ grid .sby -row 1 -column 5 -sticky ns
998	@ grid .sbxA -row 2 -columnspan 2 -sticky ew
999	@ grid .spacer -row 2 -column 2
1000	@ grid .sbxB -row 2 -column 3 -columnspan 2 -sticky ew
1001	@
1002	@ .spacer config -height [winfo height .sbxA]
1003	@ wm deiconify .
1004	@ }
1005	@ eval $prog
1006	;
1007
1008	/*
1009	** Show diff output in a Tcl/Tk window, in response to the --tk option
1010	** to the diff command.
1011	**
1012	** If fossil has direct access to a Tcl interpreter (either loaded
	@@ -1040,11 +654,11 @@
1040	int j;
1041	blob_append(&script, " ", 1);
1042	for(j=0; z[j]; j++) blob_appendf(&script, "\\%03o", (unsigned char)z[j]);
1043	}
1044	}
1045	blob_appendf(&script, "}\n%s", zDiffScript);
1046	if( zTempFile ){
1047	blob_write_to_file(&script, zTempFile);
1048	fossil_print("To see diff, run: tclsh \"%s\"\n", zTempFile);
1049	}else{
1050	#if defined(FOSSIL_ENABLE_TCL)
1051

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -617,396 +617,10 @@
617	zName = "diff-command";
618	}
619	return db_get(zName, zDefault);
620	}
621


































































































































































































































































































































































































622	/*
623	** Show diff output in a Tcl/Tk window, in response to the --tk option
624	** to the diff command.
625	**
626	** If fossil has direct access to a Tcl interpreter (either loaded
	@@ -1040,11 +654,11 @@
654	int j;
655	blob_append(&script, " ", 1);
656	for(j=0; z[j]; j++) blob_appendf(&script, "\\%03o", (unsigned char)z[j]);
657	}
658	}
659	blob_appendf(&script, "}\n%s", builtin_file("diff.tcl", 0));
660	if( zTempFile ){
661	blob_write_to_file(&script, zTempFile);
662	fossil_print("To see diff, run: tclsh \"%s\"\n", zTempFile);
663	}else{
664	#if defined(FOSSIL_ENABLE_TCL)
665

M src/main.mk

+22 -1

		--- src/main.mk
		+++ src/main.mk
		@@ -20,10 +20,11 @@
20	20	$(SRCDIR)/bag.c \
21	21	$(SRCDIR)/bisect.c \
22	22	$(SRCDIR)/blob.c \
23	23	$(SRCDIR)/branch.c \
24	24	$(SRCDIR)/browse.c \
	25	+ $(SRCDIR)/builtin.c \
25	26	$(SRCDIR)/cache.c \
26	27	$(SRCDIR)/captcha.c \
27	28	$(SRCDIR)/cgi.c \
28	29	$(SRCDIR)/checkin.c \
29	30	$(SRCDIR)/checkout.c \
		@@ -124,19 +125,23 @@
124	125	$(SRCDIR)/wysiwyg.c \
125	126	$(SRCDIR)/xfer.c \
126	127	$(SRCDIR)/xfersetup.c \
127	128	$(SRCDIR)/zip.c
128	129
	130	+EXTRA_FILES = \
	131	+ $(SRCDIR)/diff.tcl
	132	+
129	133	TRANS_SRC = \
130	134	$(OBJDIR)/add_.c \
131	135	$(OBJDIR)/allrepo_.c \
132	136	$(OBJDIR)/attach_.c \
133	137	$(OBJDIR)/bag_.c \
134	138	$(OBJDIR)/bisect_.c \
135	139	$(OBJDIR)/blob_.c \
136	140	$(OBJDIR)/branch_.c \
137	141	$(OBJDIR)/browse_.c \
	142	+ $(OBJDIR)/builtin_.c \
138	143	$(OBJDIR)/cache_.c \
139	144	$(OBJDIR)/captcha_.c \
140	145	$(OBJDIR)/cgi_.c \
141	146	$(OBJDIR)/checkin_.c \
142	147	$(OBJDIR)/checkout_.c \
		@@ -246,10 +251,11 @@
246	251	$(OBJDIR)/bag.o \
247	252	$(OBJDIR)/bisect.o \
248	253	$(OBJDIR)/blob.o \
249	254	$(OBJDIR)/branch.o \
250	255	$(OBJDIR)/browse.o \
	256	+ $(OBJDIR)/builtin.o \
251	257	$(OBJDIR)/cache.o \
252	258	$(OBJDIR)/captcha.o \
253	259	$(OBJDIR)/cgi.o \
254	260	$(OBJDIR)/checkin.o \
255	261	$(OBJDIR)/checkout.o \
		@@ -375,10 +381,13 @@
375	381	$(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
376	382
377	383	$(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
378	384	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
379	385
	386	+$(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c
	387	+ $(BCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
	388	+
380	389	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
381	390	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
382	391
383	392	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
384	393	$(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
		@@ -452,19 +461,24 @@
452	461	rm -rf $(OBJDIR)/* $(APPNAME)
453	462
454	463
455	464	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
456	465	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
457		-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
	466	+
	467	+$(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
	468	+ $(OBJDIR)/mkbuiltin $(EXTRA_FILES) >$@
	469	+
	470	+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
458	471	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
459	472	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
460	473	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
461	474	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
462	475	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
463	476	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
464	477	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
465	478	$(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
	479	+ $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
466	480	$(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
467	481	$(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
468	482	$(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
469	483	$(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
470	484	$(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
		@@ -627,10 +641,17 @@
627	641
628	642	$(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
629	643	$(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
630	644
631	645	$(OBJDIR)/browse.h: $(OBJDIR)/headers
	646	+$(OBJDIR)/builtin_.c: $(SRCDIR)/builtin.c $(OBJDIR)/translate
	647	+ $(OBJDIR)/translate $(SRCDIR)/builtin.c >$(OBJDIR)/builtin_.c
	648	+
	649	+$(OBJDIR)/builtin.o: $(OBJDIR)/builtin_.c $(OBJDIR)/builtin.h $(OBJDIR)/builtin_data.h $(SRCDIR)/config.h
	650	+ $(XTCC) -o $(OBJDIR)/builtin.o -c $(OBJDIR)/builtin_.c
	651	+
	652	+$(OBJDIR)/builtin.h: $(OBJDIR)/headers
632	653	$(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(OBJDIR)/translate
633	654	$(OBJDIR)/translate $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
634	655
635	656	$(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
636	657	$(XTCC) -o $(OBJDIR)/cache.o -c $(OBJDIR)/cache_.c
637	658

	--- src/main.mk
	+++ src/main.mk
	@@ -20,10 +20,11 @@
20	$(SRCDIR)/bag.c \
21	$(SRCDIR)/bisect.c \
22	$(SRCDIR)/blob.c \
23	$(SRCDIR)/branch.c \
24	$(SRCDIR)/browse.c \

25	$(SRCDIR)/cache.c \
26	$(SRCDIR)/captcha.c \
27	$(SRCDIR)/cgi.c \
28	$(SRCDIR)/checkin.c \
29	$(SRCDIR)/checkout.c \
	@@ -124,19 +125,23 @@
124	$(SRCDIR)/wysiwyg.c \
125	$(SRCDIR)/xfer.c \
126	$(SRCDIR)/xfersetup.c \
127	$(SRCDIR)/zip.c
128



129	TRANS_SRC = \
130	$(OBJDIR)/add_.c \
131	$(OBJDIR)/allrepo_.c \
132	$(OBJDIR)/attach_.c \
133	$(OBJDIR)/bag_.c \
134	$(OBJDIR)/bisect_.c \
135	$(OBJDIR)/blob_.c \
136	$(OBJDIR)/branch_.c \
137	$(OBJDIR)/browse_.c \

138	$(OBJDIR)/cache_.c \
139	$(OBJDIR)/captcha_.c \
140	$(OBJDIR)/cgi_.c \
141	$(OBJDIR)/checkin_.c \
142	$(OBJDIR)/checkout_.c \
	@@ -246,10 +251,11 @@
246	$(OBJDIR)/bag.o \
247	$(OBJDIR)/bisect.o \
248	$(OBJDIR)/blob.o \
249	$(OBJDIR)/branch.o \
250	$(OBJDIR)/browse.o \

251	$(OBJDIR)/cache.o \
252	$(OBJDIR)/captcha.o \
253	$(OBJDIR)/cgi.o \
254	$(OBJDIR)/checkin.o \
255	$(OBJDIR)/checkout.o \
	@@ -375,10 +381,13 @@
375	$(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
376
377	$(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
378	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
379



380	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
381	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
382
383	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
384	$(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
	@@ -452,19 +461,24 @@
452	rm -rf $(OBJDIR)/* $(APPNAME)
453
454
455	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
456	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
457	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h




458	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
459	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
460	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
461	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
462	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
463	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
464	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
465	$(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \

466	$(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
467	$(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
468	$(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
469	$(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
470	$(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
	@@ -627,10 +641,17 @@
627
628	$(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
629	$(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
630
631	$(OBJDIR)/browse.h: $(OBJDIR)/headers







632	$(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(OBJDIR)/translate
633	$(OBJDIR)/translate $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
634
635	$(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
636	$(XTCC) -o $(OBJDIR)/cache.o -c $(OBJDIR)/cache_.c
637

	--- src/main.mk
	+++ src/main.mk
	@@ -20,10 +20,11 @@
20	$(SRCDIR)/bag.c \
21	$(SRCDIR)/bisect.c \
22	$(SRCDIR)/blob.c \
23	$(SRCDIR)/branch.c \
24	$(SRCDIR)/browse.c \
25	$(SRCDIR)/builtin.c \
26	$(SRCDIR)/cache.c \
27	$(SRCDIR)/captcha.c \
28	$(SRCDIR)/cgi.c \
29	$(SRCDIR)/checkin.c \
30	$(SRCDIR)/checkout.c \
	@@ -124,19 +125,23 @@
125	$(SRCDIR)/wysiwyg.c \
126	$(SRCDIR)/xfer.c \
127	$(SRCDIR)/xfersetup.c \
128	$(SRCDIR)/zip.c
129
130	EXTRA_FILES = \
131	$(SRCDIR)/diff.tcl
132
133	TRANS_SRC = \
134	$(OBJDIR)/add_.c \
135	$(OBJDIR)/allrepo_.c \
136	$(OBJDIR)/attach_.c \
137	$(OBJDIR)/bag_.c \
138	$(OBJDIR)/bisect_.c \
139	$(OBJDIR)/blob_.c \
140	$(OBJDIR)/branch_.c \
141	$(OBJDIR)/browse_.c \
142	$(OBJDIR)/builtin_.c \
143	$(OBJDIR)/cache_.c \
144	$(OBJDIR)/captcha_.c \
145	$(OBJDIR)/cgi_.c \
146	$(OBJDIR)/checkin_.c \
147	$(OBJDIR)/checkout_.c \
	@@ -246,10 +251,11 @@
251	$(OBJDIR)/bag.o \
252	$(OBJDIR)/bisect.o \
253	$(OBJDIR)/blob.o \
254	$(OBJDIR)/branch.o \
255	$(OBJDIR)/browse.o \
256	$(OBJDIR)/builtin.o \
257	$(OBJDIR)/cache.o \
258	$(OBJDIR)/captcha.o \
259	$(OBJDIR)/cgi.o \
260	$(OBJDIR)/checkin.o \
261	$(OBJDIR)/checkout.o \
	@@ -375,10 +381,13 @@
381	$(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
382
383	$(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
384	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
385
386	$(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c
387	$(BCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
388
389	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
390	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
391
392	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
393	$(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
	@@ -452,19 +461,24 @@
461	rm -rf $(OBJDIR)/* $(APPNAME)
462
463
464	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
465	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
466
467	$(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
468	$(OBJDIR)/mkbuiltin $(EXTRA_FILES) >$@
469
470	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
471	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
472	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
473	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
474	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
475	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
476	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
477	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
478	$(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
479	$(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
480	$(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
481	$(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
482	$(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
483	$(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
484	$(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
	@@ -627,10 +641,17 @@
641
642	$(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
643	$(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
644
645	$(OBJDIR)/browse.h: $(OBJDIR)/headers
646	$(OBJDIR)/builtin_.c: $(SRCDIR)/builtin.c $(OBJDIR)/translate
647	$(OBJDIR)/translate $(SRCDIR)/builtin.c >$(OBJDIR)/builtin_.c
648
649	$(OBJDIR)/builtin.o: $(OBJDIR)/builtin_.c $(OBJDIR)/builtin.h $(OBJDIR)/builtin_data.h $(SRCDIR)/config.h
650	$(XTCC) -o $(OBJDIR)/builtin.o -c $(OBJDIR)/builtin_.c
651
652	$(OBJDIR)/builtin.h: $(OBJDIR)/headers
653	$(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(OBJDIR)/translate
654	$(OBJDIR)/translate $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
655
656	$(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
657	$(XTCC) -o $(OBJDIR)/cache.o -c $(OBJDIR)/cache_.c
658

M src/makemake.tcl

+64 -9

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -24,10 +24,11 @@
24	24	bag
25	25	bisect
26	26	blob
27	27	branch
28	28	browse
	29	+ builtin
29	30	cache
30	31	captcha
31	32	cgi
32	33	checkin
33	34	checkout
		@@ -128,10 +129,16 @@
128	129	xfer
129	130	xfersetup
130	131	zip
131	132	http_ssl
132	133	}
	134	+
	135	+# Additional resource files that get built into the executable.
	136	+#
	137	+set extra_files {
	138	+ diff.tcl
	139	+}
133	140
134	141	# Options used to compile the included SQLite library.
135	142	#
136	143	set SQLITE_OPTIONS {
137	144	-DNDEBUG=1
		@@ -217,10 +224,15 @@
217	224	}
218	225	writeln -nonewline "SRC ="
219	226	foreach s [lsort $src] {
220	227	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
221	228	}
	229	+writeln "\n"
	230	+writeln -nonewline "EXTRA_FILES ="
	231	+foreach s [lsort $extra_files] {
	232	+ writeln -nonewline " \\\n \$(SRCDIR)/$s"
	233	+}
222	234	writeln "\n"
223	235	writeln -nonewline "TRANS_SRC ="
224	236	foreach s [lsort $src] {
225	237	writeln -nonewline " \\\n \$(OBJDIR)/${s}_.c"
226	238	}
		@@ -256,10 +268,13 @@
256	268	$(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
257	269
258	270	$(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
259	271	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
260	272
	273	+$(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c
	274	+ $(BCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
	275	+
261	276	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
262	277	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
263	278
264	279	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
265	280	$(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
		@@ -336,18 +351,23 @@
336	351	append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
337	352	#append mhargs "\$(SRCDIR)/cson_amalgamation.h <<<NEXT_LINE>>>"
338	353	append mhargs "\$(OBJDIR)/VERSION.h"
339	354	set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
340	355	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
341		-writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@"
342		-writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
	356	+writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@\n"
	357	+
	358	+writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
	359	+writeln "\t\$(OBJDIR)/mkbuiltin \$(EXTRA_FILES) >$@\n"
	360	+
	361	+writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
343	362	writeln "\t\$(OBJDIR)/makeheaders $mhargs"
344	363	writeln "\ttouch \$(OBJDIR)/headers"
345	364	writeln "\$(OBJDIR)/headers: Makefile"
346	365	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
347	366	writeln "Makefile:"
348	367	set extra_h(main) " \$(OBJDIR)/page_index.h "
	368	+set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
349	369
350	370	foreach s [lsort $src] {
351	371	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
352	372	writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
353	373	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
		@@ -733,10 +753,15 @@
733	753	}
734	754	writeln -nonewline "SRC ="
735	755	foreach s [lsort $src] {
736	756	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
737	757	}
	758	+writeln "\n"
	759	+writeln -nonewline "EXTRA_FILES ="
	760	+foreach s [lsort $extra_files] {
	761	+ writeln -nonewline " \\\n \$(SRCDIR)/$s"
	762	+}
738	763	writeln "\n"
739	764	writeln -nonewline "TRANS_SRC ="
740	765	foreach s [lsort $src] {
741	766	writeln -nonewline " \\\n \$(OBJDIR)/${s}_.c"
742	767	}
		@@ -759,10 +784,11 @@
759	784	#
760	785	ifdef USE_WINDOWS
761	786	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
762	787	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
763	788	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
	789	+MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
764	790	VERSION = $(subst /,\,$(OBJDIR)/version.exe)
765	791	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
766	792	CAT = type
767	793	CP = copy
768	794	GREP = find
		@@ -772,10 +798,11 @@
772	798	RMDIR = rmdir /S /Q
773	799	else
774	800	TRANSLATE = $(OBJDIR)/translate.exe
775	801	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
776	802	MKINDEX = $(OBJDIR)/mkindex.exe
	803	+MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
777	804	VERSION = $(OBJDIR)/version.exe
778	805	CODECHECK1 = $(OBJDIR)/codecheck1.exe
779	806	CAT = cat
780	807	CP = cp
781	808	GREP = grep
		@@ -825,10 +852,13 @@
825	852	$(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
826	853
827	854	$(MKINDEX): $(SRCDIR)/mkindex.c
828	855	$(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
829	856
	857	+$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
	858	+ $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
	859	+
830	860	$(VERSION): $(SRCDIR)/mkversion.c
831	861	$(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
832	862
833	863	$(CODECHECK1): $(SRCDIR)/codecheck1.c
834	864	$(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
		@@ -935,16 +965,24 @@
935	965	append mhargs " \\\n\t\t\$(SRCDIR)/sqlite3.h"
936	966	append mhargs " \\\n\t\t\$(SRCDIR)/th.h"
937	967	append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
938	968	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
939	969	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >$@\n"
940		-writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
	970	+
	971	+writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
	972	+writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >$@\n"
	973	+
	974	+writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
941	975	writeln "\t\$(MAKEHEADERS) $mhargs"
942	976	writeln "\techo Done >\$(OBJDIR)/headers\n"
943	977	writeln "\$(OBJDIR)/headers: Makefile\n"
944	978	writeln "Makefile:\n"
945	979	set extra_h(main) " \$(OBJDIR)/page_index.h "
	980	+set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
	981	+
	982	+writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
	983	+writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >\$(OBJDIR)/builtin_data.h\n"
946	984
947	985	foreach s [lsort $src] {
948	986	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
949	987	writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
950	988	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
		@@ -1079,10 +1117,13 @@
1079	1117	makeheaders$E: $(SRCDIR)\makeheaders.c
1080	1118	$(BCC) -o$@ $**
1081	1119
1082	1120	mkindex$E: $(SRCDIR)\mkindex.c
1083	1121	$(BCC) -o$@ $**
	1122	+
	1123	+mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
	1124	+ $(BCC) -o$@ $**
1084	1125
1085	1126	mkversion$E: $(SRCDIR)\mkversion.c
1086	1127	$(BCC) -o$@ $**
1087	1128
1088	1129	codecheck1$E: $(SRCDIR)\codecheck1.c
		@@ -1107,16 +1148,19 @@
1107	1148	+$** > $@
1108	1149
1109	1150	page_index.h: mkindex$E $(SRC)
1110	1151	+$** > $@
1111	1152
	1153	+builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
	1154	+ +$** > $@
	1155	+
1112	1156	clean:
1113	1157	-del $(OBJDIR)\*.obj
1114	1158	-del .obj _.c .h .map
1115	1159
1116	1160	realclean:
1117		- -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E
	1161	+ -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
1118	1162
1119	1163	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1120	1164	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1121	1165	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1122	1166	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
		@@ -1139,11 +1183,11 @@
1139	1183	writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
1140	1184	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1141	1185	writeln "\t+translate\$E \$** > \$@\n"
1142	1186	}
1143	1187
1144		-writeln -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E "
	1188	+writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1145	1189	foreach s [lsort $src] {
1146	1190	writeln -nonewline "${s}_.c:$s.h "
1147	1191	}
1148	1192	writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
1149	1193	writeln "\t@copy /Y nul: headers"
		@@ -1443,10 +1487,13 @@
1443	1487	makeheaders$E: $(SRCDIR)\makeheaders.c
1444	1488	$(BCC) $**
1445	1489
1446	1490	mkindex$E: $(SRCDIR)\mkindex.c
1447	1491	$(BCC) $**
	1492	+
	1493	+mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
	1494	+ $(BCC) $**
1448	1495
1449	1496	mkversion$E: $(SRCDIR)\mkversion.c
1450	1497	$(BCC) $**
1451	1498
1452	1499	codecheck1$E: $(SRCDIR)\codecheck1.c
		@@ -1476,10 +1523,13 @@
1476	1523	$(TCC) /Fo$@ /c $**
1477	1524
1478	1525	page_index.h: mkindex$E $(SRC)
1479	1526	$** > $@
1480	1527
	1528	+builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
	1529	+ $** > $@
	1530	+
1481	1531	clean:
1482	1532	-del $(OX)\*.obj
1483	1533	-del *.obj
1484	1534	-del *_.c
1485	1535	-del *.h
		@@ -1501,10 +1551,12 @@
1501	1551	-del makeheaders$P
1502	1552	-del mkversion$E
1503	1553	-del mkversion$P
1504	1554	-del codecheck1$E
1505	1555	-del codecheck1$P
	1556	+ -del mkbuiltin$E
	1557	+ -del mkbuiltin$P
1506	1558
1507	1559	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1508	1560	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1509	1561	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1510	1562	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
		@@ -1528,11 +1580,11 @@
1528	1580	}
1529	1581
1530	1582	writeln "fossil.res : \$B\\win\\fossil.rc"
1531	1583	writeln "\t\$(RCC) /fo \$@ \$**\n"
1532	1584
1533		-writeln "headers: makeheaders\$E page_index.h VERSION.h"
	1585	+writeln "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h"
1534	1586	writeln -nonewline "\tmakeheaders\$E "
1535	1587	set i 0
1536	1588	foreach s [lsort $src] {
1537	1589	if {$i > 0} {
1538	1590	writeln " \\"
		@@ -1638,11 +1690,11 @@
1638	1690	RC=$(PellesCDir)\bin\porc.exe
1639	1691	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
1640	1692
1641	1693	# define the special utilities files, needed to generate
1642	1694	# the automatically generated source files
1643		-UTILS=translate.exe mkindex.exe makeheaders.exe
	1695	+UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
1644	1696	UTILS_OBJ=$(UTILS:.exe=.obj)
1645	1697	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
1646	1698
1647	1699	# define the SQLite files, which need special flags on compile
1648	1700	SQLITESRC=sqlite3.c
		@@ -1677,11 +1729,11 @@
1677	1729	# main target file is the application
1678	1730	APPLICATION=fossil.exe
1679	1731
1680	1732	# define the standard make target
1681	1733	.PHONY: default
1682		-default: page_index.h headers $(APPLICATION)
	1734	+default: page_index.h builtin_data.h headers $(APPLICATION)
1683	1735
1684	1736	# symbolic target to generate the source generate utils
1685	1737	.PHONY: utils
1686	1738	utils: $(UTILS)
1687	1739
		@@ -1702,17 +1754,20 @@
1702	1754	translate.exe $< >$@
1703	1755
1704	1756	# generate the index source, containing all web references,..
1705	1757	page_index.h: $(TRANSLATEDSRC) mkindex.exe
1706	1758	mkindex.exe $(TRANSLATEDSRC) >$@
	1759	+
	1760	+builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
	1761	+ mkbuiltin.exe $(EXTRA_FILES) >$@
1707	1762
1708	1763	# extracting version info from manifest
1709	1764	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
1710	1765	version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
1711	1766
1712	1767	# generate the simplified headers
1713		-headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
	1768	+headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
1714	1769	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
1715	1770	echo Done >$@
1716	1771
1717	1772	# compile C sources with relevant options
1718	1773
1719	1774
1720	1775	ADDED src/mkbuiltin.c

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -24,10 +24,11 @@
24	bag
25	bisect
26	blob
27	branch
28	browse

29	cache
30	captcha
31	cgi
32	checkin
33	checkout
	@@ -128,10 +129,16 @@
128	xfer
129	xfersetup
130	zip
131	http_ssl
132	}






133
134	# Options used to compile the included SQLite library.
135	#
136	set SQLITE_OPTIONS {
137	-DNDEBUG=1
	@@ -217,10 +224,15 @@
217	}
218	writeln -nonewline "SRC ="
219	foreach s [lsort $src] {
220	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
221	}





222	writeln "\n"
223	writeln -nonewline "TRANS_SRC ="
224	foreach s [lsort $src] {
225	writeln -nonewline " \\\n \$(OBJDIR)/${s}_.c"
226	}
	@@ -256,10 +268,13 @@
256	$(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
257
258	$(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
259	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
260



261	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
262	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
263
264	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
265	$(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
	@@ -336,18 +351,23 @@
336	append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
337	#append mhargs "\$(SRCDIR)/cson_amalgamation.h <<<NEXT_LINE>>>"
338	append mhargs "\$(OBJDIR)/VERSION.h"
339	set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
340	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
341	writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@"
342	writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"




343	writeln "\t\$(OBJDIR)/makeheaders $mhargs"
344	writeln "\ttouch \$(OBJDIR)/headers"
345	writeln "\$(OBJDIR)/headers: Makefile"
346	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
347	writeln "Makefile:"
348	set extra_h(main) " \$(OBJDIR)/page_index.h "

349
350	foreach s [lsort $src] {
351	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
352	writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
353	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
	@@ -733,10 +753,15 @@
733	}
734	writeln -nonewline "SRC ="
735	foreach s [lsort $src] {
736	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
737	}





738	writeln "\n"
739	writeln -nonewline "TRANS_SRC ="
740	foreach s [lsort $src] {
741	writeln -nonewline " \\\n \$(OBJDIR)/${s}_.c"
742	}
	@@ -759,10 +784,11 @@
759	#
760	ifdef USE_WINDOWS
761	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
762	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
763	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)

764	VERSION = $(subst /,\,$(OBJDIR)/version.exe)
765	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
766	CAT = type
767	CP = copy
768	GREP = find
	@@ -772,10 +798,11 @@
772	RMDIR = rmdir /S /Q
773	else
774	TRANSLATE = $(OBJDIR)/translate.exe
775	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
776	MKINDEX = $(OBJDIR)/mkindex.exe

777	VERSION = $(OBJDIR)/version.exe
778	CODECHECK1 = $(OBJDIR)/codecheck1.exe
779	CAT = cat
780	CP = cp
781	GREP = grep
	@@ -825,10 +852,13 @@
825	$(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
826
827	$(MKINDEX): $(SRCDIR)/mkindex.c
828	$(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
829



830	$(VERSION): $(SRCDIR)/mkversion.c
831	$(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
832
833	$(CODECHECK1): $(SRCDIR)/codecheck1.c
834	$(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
	@@ -935,16 +965,24 @@
935	append mhargs " \\\n\t\t\$(SRCDIR)/sqlite3.h"
936	append mhargs " \\\n\t\t\$(SRCDIR)/th.h"
937	append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
938	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
939	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >$@\n"
940	writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"




941	writeln "\t\$(MAKEHEADERS) $mhargs"
942	writeln "\techo Done >\$(OBJDIR)/headers\n"
943	writeln "\$(OBJDIR)/headers: Makefile\n"
944	writeln "Makefile:\n"
945	set extra_h(main) " \$(OBJDIR)/page_index.h "




946
947	foreach s [lsort $src] {
948	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
949	writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
950	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
	@@ -1079,10 +1117,13 @@
1079	makeheaders$E: $(SRCDIR)\makeheaders.c
1080	$(BCC) -o$@ $**
1081
1082	mkindex$E: $(SRCDIR)\mkindex.c
1083	$(BCC) -o$@ $**



1084
1085	mkversion$E: $(SRCDIR)\mkversion.c
1086	$(BCC) -o$@ $**
1087
1088	codecheck1$E: $(SRCDIR)\codecheck1.c
	@@ -1107,16 +1148,19 @@
1107	+$** > $@
1108
1109	page_index.h: mkindex$E $(SRC)
1110	+$** > $@
1111



1112	clean:
1113	-del $(OBJDIR)\*.obj
1114	-del .obj _.c .h .map
1115
1116	realclean:
1117	-del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E
1118
1119	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1120	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1121	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1122	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -1139,11 +1183,11 @@
1139	writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
1140	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1141	writeln "\t+translate\$E \$** > \$@\n"
1142	}
1143
1144	writeln -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E "
1145	foreach s [lsort $src] {
1146	writeln -nonewline "${s}_.c:$s.h "
1147	}
1148	writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
1149	writeln "\t@copy /Y nul: headers"
	@@ -1443,10 +1487,13 @@
1443	makeheaders$E: $(SRCDIR)\makeheaders.c
1444	$(BCC) $**
1445
1446	mkindex$E: $(SRCDIR)\mkindex.c
1447	$(BCC) $**



1448
1449	mkversion$E: $(SRCDIR)\mkversion.c
1450	$(BCC) $**
1451
1452	codecheck1$E: $(SRCDIR)\codecheck1.c
	@@ -1476,10 +1523,13 @@
1476	$(TCC) /Fo$@ /c $**
1477
1478	page_index.h: mkindex$E $(SRC)
1479	$** > $@
1480



1481	clean:
1482	-del $(OX)\*.obj
1483	-del *.obj
1484	-del *_.c
1485	-del *.h
	@@ -1501,10 +1551,12 @@
1501	-del makeheaders$P
1502	-del mkversion$E
1503	-del mkversion$P
1504	-del codecheck1$E
1505	-del codecheck1$P


1506
1507	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1508	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1509	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1510	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -1528,11 +1580,11 @@
1528	}
1529
1530	writeln "fossil.res : \$B\\win\\fossil.rc"
1531	writeln "\t\$(RCC) /fo \$@ \$**\n"
1532
1533	writeln "headers: makeheaders\$E page_index.h VERSION.h"
1534	writeln -nonewline "\tmakeheaders\$E "
1535	set i 0
1536	foreach s [lsort $src] {
1537	if {$i > 0} {
1538	writeln " \\"
	@@ -1638,11 +1690,11 @@
1638	RC=$(PellesCDir)\bin\porc.exe
1639	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
1640
1641	# define the special utilities files, needed to generate
1642	# the automatically generated source files
1643	UTILS=translate.exe mkindex.exe makeheaders.exe
1644	UTILS_OBJ=$(UTILS:.exe=.obj)
1645	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
1646
1647	# define the SQLite files, which need special flags on compile
1648	SQLITESRC=sqlite3.c
	@@ -1677,11 +1729,11 @@
1677	# main target file is the application
1678	APPLICATION=fossil.exe
1679
1680	# define the standard make target
1681	.PHONY: default
1682	default: page_index.h headers $(APPLICATION)
1683
1684	# symbolic target to generate the source generate utils
1685	.PHONY: utils
1686	utils: $(UTILS)
1687
	@@ -1702,17 +1754,20 @@
1702	translate.exe $< >$@
1703
1704	# generate the index source, containing all web references,..
1705	page_index.h: $(TRANSLATEDSRC) mkindex.exe
1706	mkindex.exe $(TRANSLATEDSRC) >$@



1707
1708	# extracting version info from manifest
1709	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
1710	version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
1711
1712	# generate the simplified headers
1713	headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
1714	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
1715	echo Done >$@
1716
1717	# compile C sources with relevant options
1718
1719
1720	DDED src/mkbuiltin.c

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -24,10 +24,11 @@
24	bag
25	bisect
26	blob
27	branch
28	browse
29	builtin
30	cache
31	captcha
32	cgi
33	checkin
34	checkout
	@@ -128,10 +129,16 @@
129	xfer
130	xfersetup
131	zip
132	http_ssl
133	}
134
135	# Additional resource files that get built into the executable.
136	#
137	set extra_files {
138	diff.tcl
139	}
140
141	# Options used to compile the included SQLite library.
142	#
143	set SQLITE_OPTIONS {
144	-DNDEBUG=1
	@@ -217,10 +224,15 @@
224	}
225	writeln -nonewline "SRC ="
226	foreach s [lsort $src] {
227	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
228	}
229	writeln "\n"
230	writeln -nonewline "EXTRA_FILES ="
231	foreach s [lsort $extra_files] {
232	writeln -nonewline " \\\n \$(SRCDIR)/$s"
233	}
234	writeln "\n"
235	writeln -nonewline "TRANS_SRC ="
236	foreach s [lsort $src] {
237	writeln -nonewline " \\\n \$(OBJDIR)/${s}_.c"
238	}
	@@ -256,10 +268,13 @@
268	$(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
269
270	$(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
271	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
272
273	$(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c
274	$(BCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c
275
276	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
277	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
278
279	$(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c
280	$(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c
	@@ -336,18 +351,23 @@
351	append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
352	#append mhargs "\$(SRCDIR)/cson_amalgamation.h <<<NEXT_LINE>>>"
353	append mhargs "\$(OBJDIR)/VERSION.h"
354	set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
355	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
356	writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@\n"
357
358	writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
359	writeln "\t\$(OBJDIR)/mkbuiltin \$(EXTRA_FILES) >$@\n"
360
361	writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
362	writeln "\t\$(OBJDIR)/makeheaders $mhargs"
363	writeln "\ttouch \$(OBJDIR)/headers"
364	writeln "\$(OBJDIR)/headers: Makefile"
365	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
366	writeln "Makefile:"
367	set extra_h(main) " \$(OBJDIR)/page_index.h "
368	set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
369
370	foreach s [lsort $src] {
371	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
372	writeln "\t\$(OBJDIR)/translate \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
373	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
	@@ -733,10 +753,15 @@
753	}
754	writeln -nonewline "SRC ="
755	foreach s [lsort $src] {
756	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
757	}
758	writeln "\n"
759	writeln -nonewline "EXTRA_FILES ="
760	foreach s [lsort $extra_files] {
761	writeln -nonewline " \\\n \$(SRCDIR)/$s"
762	}
763	writeln "\n"
764	writeln -nonewline "TRANS_SRC ="
765	foreach s [lsort $src] {
766	writeln -nonewline " \\\n \$(OBJDIR)/${s}_.c"
767	}
	@@ -759,10 +784,11 @@
784	#
785	ifdef USE_WINDOWS
786	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
787	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
788	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
789	MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
790	VERSION = $(subst /,\,$(OBJDIR)/version.exe)
791	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
792	CAT = type
793	CP = copy
794	GREP = find
	@@ -772,10 +798,11 @@
798	RMDIR = rmdir /S /Q
799	else
800	TRANSLATE = $(OBJDIR)/translate.exe
801	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
802	MKINDEX = $(OBJDIR)/mkindex.exe
803	MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
804	VERSION = $(OBJDIR)/version.exe
805	CODECHECK1 = $(OBJDIR)/codecheck1.exe
806	CAT = cat
807	CP = cp
808	GREP = grep
	@@ -825,10 +852,13 @@
852	$(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
853
854	$(MKINDEX): $(SRCDIR)/mkindex.c
855	$(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
856
857	$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
858	$(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
859
860	$(VERSION): $(SRCDIR)/mkversion.c
861	$(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
862
863	$(CODECHECK1): $(SRCDIR)/codecheck1.c
864	$(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
	@@ -935,16 +965,24 @@
965	append mhargs " \\\n\t\t\$(SRCDIR)/sqlite3.h"
966	append mhargs " \\\n\t\t\$(SRCDIR)/th.h"
967	append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
968	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
969	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >$@\n"
970
971	writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
972	writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >$@\n"
973
974	writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
975	writeln "\t\$(MAKEHEADERS) $mhargs"
976	writeln "\techo Done >\$(OBJDIR)/headers\n"
977	writeln "\$(OBJDIR)/headers: Makefile\n"
978	writeln "Makefile:\n"
979	set extra_h(main) " \$(OBJDIR)/page_index.h "
980	set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
981
982	writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
983	writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >\$(OBJDIR)/builtin_data.h\n"
984
985	foreach s [lsort $src] {
986	writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
987	writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
988	writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
	@@ -1079,10 +1117,13 @@
1117	makeheaders$E: $(SRCDIR)\makeheaders.c
1118	$(BCC) -o$@ $**
1119
1120	mkindex$E: $(SRCDIR)\mkindex.c
1121	$(BCC) -o$@ $**
1122
1123	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1124	$(BCC) -o$@ $**
1125
1126	mkversion$E: $(SRCDIR)\mkversion.c
1127	$(BCC) -o$@ $**
1128
1129	codecheck1$E: $(SRCDIR)\codecheck1.c
	@@ -1107,16 +1148,19 @@
1148	+$** > $@
1149
1150	page_index.h: mkindex$E $(SRC)
1151	+$** > $@
1152
1153	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1154	+$** > $@
1155
1156	clean:
1157	-del $(OBJDIR)\*.obj
1158	-del .obj _.c .h .map
1159
1160	realclean:
1161	-del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
1162
1163	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1164	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1165	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1166	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -1139,11 +1183,11 @@
1183	writeln "\t\$(TCC) -o\$@ -c ${s}_.c\n"
1184	writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1185	writeln "\t+translate\$E \$** > \$@\n"
1186	}
1187
1188	writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1189	foreach s [lsort $src] {
1190	writeln -nonewline "${s}_.c:$s.h "
1191	}
1192	writeln "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR)\\cson_amalgamation.h"
1193	writeln "\t@copy /Y nul: headers"
	@@ -1443,10 +1487,13 @@
1487	makeheaders$E: $(SRCDIR)\makeheaders.c
1488	$(BCC) $**
1489
1490	mkindex$E: $(SRCDIR)\mkindex.c
1491	$(BCC) $**
1492
1493	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1494	$(BCC) $**
1495
1496	mkversion$E: $(SRCDIR)\mkversion.c
1497	$(BCC) $**
1498
1499	codecheck1$E: $(SRCDIR)\codecheck1.c
	@@ -1476,10 +1523,13 @@
1523	$(TCC) /Fo$@ /c $**
1524
1525	page_index.h: mkindex$E $(SRC)
1526	$** > $@
1527
1528	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1529	$** > $@
1530
1531	clean:
1532	-del $(OX)\*.obj
1533	-del *.obj
1534	-del *_.c
1535	-del *.h
	@@ -1501,10 +1551,12 @@
1551	-del makeheaders$P
1552	-del mkversion$E
1553	-del mkversion$P
1554	-del codecheck1$E
1555	-del codecheck1$P
1556	-del mkbuiltin$E
1557	-del mkbuiltin$P
1558
1559	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1560	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1561	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1562	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -1528,11 +1580,11 @@
1580	}
1581
1582	writeln "fossil.res : \$B\\win\\fossil.rc"
1583	writeln "\t\$(RCC) /fo \$@ \$**\n"
1584
1585	writeln "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h"
1586	writeln -nonewline "\tmakeheaders\$E "
1587	set i 0
1588	foreach s [lsort $src] {
1589	if {$i > 0} {
1590	writeln " \\"
	@@ -1638,11 +1690,11 @@
1690	RC=$(PellesCDir)\bin\porc.exe
1691	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
1692
1693	# define the special utilities files, needed to generate
1694	# the automatically generated source files
1695	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
1696	UTILS_OBJ=$(UTILS:.exe=.obj)
1697	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
1698
1699	# define the SQLite files, which need special flags on compile
1700	SQLITESRC=sqlite3.c
	@@ -1677,11 +1729,11 @@
1729	# main target file is the application
1730	APPLICATION=fossil.exe
1731
1732	# define the standard make target
1733	.PHONY: default
1734	default: page_index.h builtin_data.h headers $(APPLICATION)
1735
1736	# symbolic target to generate the source generate utils
1737	.PHONY: utils
1738	utils: $(UTILS)
1739
	@@ -1702,17 +1754,20 @@
1754	translate.exe $< >$@
1755
1756	# generate the index source, containing all web references,..
1757	page_index.h: $(TRANSLATEDSRC) mkindex.exe
1758	mkindex.exe $(TRANSLATEDSRC) >$@
1759
1760	builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
1761	mkbuiltin.exe $(EXTRA_FILES) >$@
1762
1763	# extracting version info from manifest
1764	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
1765	version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
1766
1767	# generate the simplified headers
1768	headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
1769	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
1770	echo Done >$@
1771
1772	# compile C sources with relevant options
1773
1774
1775	DDED src/mkbuiltin.c

A src/mkbuiltin.c

+61

		--- a/src/mkbuiltin.c
		+++ b/src/mkbuiltin.c
		@@ -0,0 +1,61 @@
	1	+/*
	2	+** Con = argc-1/*
	3	+ /*
	4	+** Con = argc-1/*
	5	+** Const/*
	6	+** Copyright (st/*
	7	+** Copyright (c) 2014 D. Richard Hipp
	8	+**
	9	+** This program is free software; you can redistribute it and/or
	10	+** modify it under the terms of the Simplif Copvoid a, const v)a;
	11	+ Resource pB = esource)b;
	12	+ return strcmp(pA->zName, pB->zName) nRes = argc - 1;
	13	+ aRes = malloc( nRes*sizeof(aRes[0]) );
	14	+ if( aRes==0t (c) 2014 D. Richard Hip/return 1;
	15	+ }
	16	+aRes[ireturn nErr;
	17	+}
	18	+const char *zTail;
	19	+ int nSlash = 0;
	20	+ zTail = z;
	21	+ while( z && z[0] ){
	22	+ if( z[0]=='/' \|\| z[0]=='\\' ){
	23	+ nSlash++;
	24	+ if( nSlash<=2 \|\| z[-1]=='.' ) zTail = &z[1];
	25	+ }
	26	+ z++;
	27	+ }zTail);
	28	+ for(j=Tail;/*
	29	+** Con = argc-1/*
	30	+** Const/*
	31	+** Copyright (st/*
	32	+** Copyright (c) 20gc-1/*
	33	+ Const Const/*
	34	+** Copyright (st/*
	35	+** Copyright (c) 2014 D. Richard Hipp
	36	+**
	37	+** This program is free software; you can redistribute it and/or
	38	+** modify it under the terms of the Simplif Copvoid a, const v)a;
	39	+ Resource pB = esource)b;
	40	+ return strcmp(pA->zName, pB->zName) nRes = argc - 1;
	41	+ aRes = malloc( nRes*sizeof(aRes[0]) );
	42	+ if( aRes==0t (c) 2014 D. Richard Hip/return 1;
	43	+ }
	44	+aRes[ireturn nErr;
	45	+}
	46	+const char *zTail;
	47	+ int nSlash = 0;
	48	+ zTail = z;
	49	+ while( z && z[0] ){
	50	+ if( z[0]=='/' \|\| z[0]=='\\' ){
	51	+ nSlash++;
	52	+ if( nSlash<=2 \|\| z[-1]=='.' ) zTail = &z[1];
	53	+ }
	54	+ z++;
	55	+ }zTail);
	56	+ for(j=Tail;/*
	57	+** Con = argc-1/*
	58	+** Const/*
	59	+** Copyright (st/*
	60	+** Copyright (c) 20gc-1/*
	61	+** Const

	--- a/src/mkbuiltin.c
	+++ b/src/mkbuiltin.c
	@@ -0,0 +1,61 @@

	--- a/src/mkbuiltin.c
	+++ b/src/mkbuiltin.c
	@@ -0,0 +1,61 @@
1	/*
2	** Con = argc-1/*
3	/*
4	** Con = argc-1/*
5	** Const/*
6	** Copyright (st/*
7	** Copyright (c) 2014 D. Richard Hipp
8	**
9	** This program is free software; you can redistribute it and/or
10	** modify it under the terms of the Simplif Copvoid a, const v)a;
11	Resource pB = esource)b;
12	return strcmp(pA->zName, pB->zName) nRes = argc - 1;
13	aRes = malloc( nRes*sizeof(aRes[0]) );
14	if( aRes==0t (c) 2014 D. Richard Hip/return 1;
15	}
16	aRes[ireturn nErr;
17	}
18	const char *zTail;
19	int nSlash = 0;
20	zTail = z;
21	while( z && z[0] ){
22	if( z[0]=='/' \|\| z[0]=='\\' ){
23	nSlash++;
24	if( nSlash<=2 \|\| z[-1]=='.' ) zTail = &z[1];
25	}
26	z++;
27	}zTail);
28	for(j=Tail;/*
29	** Con = argc-1/*
30	** Const/*
31	** Copyright (st/*
32	** Copyright (c) 20gc-1/*
33	Const Const/*
34	** Copyright (st/*
35	** Copyright (c) 2014 D. Richard Hipp
36	**
37	** This program is free software; you can redistribute it and/or
38	** modify it under the terms of the Simplif Copvoid a, const v)a;
39	Resource pB = esource)b;
40	return strcmp(pA->zName, pB->zName) nRes = argc - 1;
41	aRes = malloc( nRes*sizeof(aRes[0]) );
42	if( aRes==0t (c) 2014 D. Richard Hip/return 1;
43	}
44	aRes[ireturn nErr;
45	}
46	const char *zTail;
47	int nSlash = 0;
48	zTail = z;
49	while( z && z[0] ){
50	if( z[0]=='/' \|\| z[0]=='\\' ){
51	nSlash++;
52	if( nSlash<=2 \|\| z[-1]=='.' ) zTail = &z[1];
53	}
54	z++;
55	}zTail);
56	for(j=Tail;/*
57	** Con = argc-1/*
58	** Const/*
59	** Copyright (st/*
60	** Copyright (c) 20gc-1/*
61	** Const

M win/Makefile.PellesCGMake

+6 -3

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -75,11 +75,11 @@
75	75	RC=$(PellesCDir)\bin\porc.exe
76	76	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
77	77
78	78	# define the special utilities files, needed to generate
79	79	# the automatically generated source files
80		-UTILS=translate.exe mkindex.exe makeheaders.exe
	80	+UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
81	81	UTILS_OBJ=$(UTILS:.exe=.obj)
82	82	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
83	83
84	84	# define the SQLite files, which need special flags on compile
85	85	SQLITESRC=sqlite3.c
		@@ -114,11 +114,11 @@
114	114	# main target file is the application
115	115	APPLICATION=fossil.exe
116	116
117	117	# define the standard make target
118	118	.PHONY: default
119		-default: page_index.h headers $(APPLICATION)
	119	+default: page_index.h builtin_data.h headers $(APPLICATION)
120	120
121	121	# symbolic target to generate the source generate utils
122	122	.PHONY: utils
123	123	utils: $(UTILS)
124	124
		@@ -139,17 +139,20 @@
139	139	translate.exe $< >$@
140	140
141	141	# generate the index source, containing all web references,..
142	142	page_index.h: $(TRANSLATEDSRC) mkindex.exe
143	143	mkindex.exe $(TRANSLATEDSRC) >$@
	144	+
	145	+builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
	146	+ mkbuiltin.exe $(EXTRA_FILES) >$@
144	147
145	148	# extracting version info from manifest
146	149	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
147	150	version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
148	151
149	152	# generate the simplified headers
150		-headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
	153	+headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
151	154	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
152	155	echo Done >$@
153	156
154	157	# compile C sources with relevant options
155	158
156	159

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -75,11 +75,11 @@
75	RC=$(PellesCDir)\bin\porc.exe
76	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
77
78	# define the special utilities files, needed to generate
79	# the automatically generated source files
80	UTILS=translate.exe mkindex.exe makeheaders.exe
81	UTILS_OBJ=$(UTILS:.exe=.obj)
82	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
83
84	# define the SQLite files, which need special flags on compile
85	SQLITESRC=sqlite3.c
	@@ -114,11 +114,11 @@
114	# main target file is the application
115	APPLICATION=fossil.exe
116
117	# define the standard make target
118	.PHONY: default
119	default: page_index.h headers $(APPLICATION)
120
121	# symbolic target to generate the source generate utils
122	.PHONY: utils
123	utils: $(UTILS)
124
	@@ -139,17 +139,20 @@
139	translate.exe $< >$@
140
141	# generate the index source, containing all web references,..
142	page_index.h: $(TRANSLATEDSRC) mkindex.exe
143	mkindex.exe $(TRANSLATEDSRC) >$@



144
145	# extracting version info from manifest
146	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
147	version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
148
149	# generate the simplified headers
150	headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
151	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
152	echo Done >$@
153
154	# compile C sources with relevant options
155
156

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -75,11 +75,11 @@
75	RC=$(PellesCDir)\bin\porc.exe
76	RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
77
78	# define the special utilities files, needed to generate
79	# the automatically generated source files
80	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
81	UTILS_OBJ=$(UTILS:.exe=.obj)
82	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
83
84	# define the SQLite files, which need special flags on compile
85	SQLITESRC=sqlite3.c
	@@ -114,11 +114,11 @@
114	# main target file is the application
115	APPLICATION=fossil.exe
116
117	# define the standard make target
118	.PHONY: default
119	default: page_index.h builtin_data.h headers $(APPLICATION)
120
121	# symbolic target to generate the source generate utils
122	.PHONY: utils
123	utils: $(UTILS)
124
	@@ -139,17 +139,20 @@
139	translate.exe $< >$@
140
141	# generate the index source, containing all web references,..
142	page_index.h: $(TRANSLATEDSRC) mkindex.exe
143	mkindex.exe $(TRANSLATEDSRC) >$@
144
145	builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
146	mkbuiltin.exe $(EXTRA_FILES) >$@
147
148	# extracting version info from manifest
149	VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150	version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
151
152	# generate the simplified headers
153	headers: makeheaders.exe page_index.h builtin_data.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
154	makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
155	echo Done >$@
156
157	# compile C sources with relevant options
158
159

M win/Makefile.dmc

+18 -6

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -28,13 +28,13 @@
28	28
29	29	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30	30
31	31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32	32
33		-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c cache_.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 fusefs_.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_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.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 unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
	33	+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c cache_.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 fusefs_.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_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.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 unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34	34
35		-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\cache$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
	35	+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\cache$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36	36
37	37
38	38	RC=$(DMDIR)\bin\rcc
39	39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40	40
		@@ -49,11 +49,11 @@
49	49
50	50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	51	$(RC) $(RCFLAGS) -o$@ $**
52	52
53	53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54		- +echo add allrepo attach bag bisect blob branch browse cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild regexp report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
	54	+ +echo add allrepo attach bag bisect blob branch browse builtin cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild regexp report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
55	55	+echo fossil >> $@
56	56	+echo fossil >> $@
57	57	+echo $(LIBS) >> $@
58	58	+echo. >> $@
59	59	+echo fossil >> $@
		@@ -64,10 +64,13 @@
64	64	makeheaders$E: $(SRCDIR)\makeheaders.c
65	65	$(BCC) -o$@ $**
66	66
67	67	mkindex$E: $(SRCDIR)\mkindex.c
68	68	$(BCC) -o$@ $**
	69	+
	70	+mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
	71	+ $(BCC) -o$@ $**
69	72
70	73	mkversion$E: $(SRCDIR)\mkversion.c
71	74	$(BCC) -o$@ $**
72	75
73	76	codecheck1$E: $(SRCDIR)\codecheck1.c
		@@ -92,16 +95,19 @@
92	95	+$** > $@
93	96
94	97	page_index.h: mkindex$E $(SRC)
95	98	+$** > $@
96	99
	100	+builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
	101	+ +$** > $@
	102	+
97	103	clean:
98	104	-del $(OBJDIR)\*.obj
99	105	-del .obj _.c .h .map
100	106
101	107	realclean:
102		- -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E
	108	+ -del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
103	109
104	110	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
105	111	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
106	112	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
107	113	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
		@@ -164,10 +170,16 @@
164	170	$(OBJDIR)\browse$O : browse_.c browse.h
165	171	$(TCC) -o$@ -c browse_.c
166	172
167	173	browse_.c : $(SRCDIR)\browse.c
168	174	+translate$E $** > $@
	175	+
	176	+$(OBJDIR)\builtin$O : builtin_.c builtin.h
	177	+ $(TCC) -o$@ -c builtin_.c
	178	+
	179	+builtin_.c : $(SRCDIR)\builtin.c
	180	+ +translate$E $** > $@
169	181
170	182	$(OBJDIR)\cache$O : cache_.c cache.h
171	183	$(TCC) -o$@ -c cache_.c
172	184
173	185	cache_.c : $(SRCDIR)\cache.c
		@@ -783,8 +795,8 @@
783	795	$(TCC) -o$@ -c zip_.c
784	796
785	797	zip_.c : $(SRCDIR)\zip.c
786	798	+translate$E $** > $@
787	799
788		-headers: makeheaders$E page_index.h VERSION.h
789		- +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 cache_.c:cache.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 fusefs_.c:fusefs.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_status_.c:json_status.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 loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.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 regexp_.c:regexp.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 unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.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
	800	+headers: makeheaders$E page_index.h builtin_data.h VERSION.h
	801	+ +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 builtin_.c:builtin.h cache_.c:cache.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 fusefs_.c:fusefs.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_status_.c:json_status.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 loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.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 regexp_.c:regexp.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 unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.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
790	802	@copy /Y nul: headers
791	803

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -28,13 +28,13 @@
28
29	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30
31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c cache_.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 fusefs_.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_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.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 unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\cache$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37
38	RC=$(DMDIR)\bin\rcc
39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40
	@@ -49,11 +49,11 @@
49
50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	$(RC) $(RCFLAGS) -o$@ $**
52
53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54	+echo add allrepo attach bag bisect blob branch browse cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild regexp report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
55	+echo fossil >> $@
56	+echo fossil >> $@
57	+echo $(LIBS) >> $@
58	+echo. >> $@
59	+echo fossil >> $@
	@@ -64,10 +64,13 @@
64	makeheaders$E: $(SRCDIR)\makeheaders.c
65	$(BCC) -o$@ $**
66
67	mkindex$E: $(SRCDIR)\mkindex.c
68	$(BCC) -o$@ $**



69
70	mkversion$E: $(SRCDIR)\mkversion.c
71	$(BCC) -o$@ $**
72
73	codecheck1$E: $(SRCDIR)\codecheck1.c
	@@ -92,16 +95,19 @@
92	+$** > $@
93
94	page_index.h: mkindex$E $(SRC)
95	+$** > $@
96



97	clean:
98	-del $(OBJDIR)\*.obj
99	-del .obj _.c .h .map
100
101	realclean:
102	-del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E
103
104	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
105	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
106	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
107	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -164,10 +170,16 @@
164	$(OBJDIR)\browse$O : browse_.c browse.h
165	$(TCC) -o$@ -c browse_.c
166
167	browse_.c : $(SRCDIR)\browse.c
168	+translate$E $** > $@






169
170	$(OBJDIR)\cache$O : cache_.c cache.h
171	$(TCC) -o$@ -c cache_.c
172
173	cache_.c : $(SRCDIR)\cache.c
	@@ -783,8 +795,8 @@
783	$(TCC) -o$@ -c zip_.c
784
785	zip_.c : $(SRCDIR)\zip.c
786	+translate$E $** > $@
787
788	headers: makeheaders$E page_index.h VERSION.h
789	+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 cache_.c:cache.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 fusefs_.c:fusefs.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_status_.c:json_status.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 loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.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 regexp_.c:regexp.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 unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.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
790	@copy /Y nul: headers
791

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -28,13 +28,13 @@
28
29	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30
31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c cache_.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 fusefs_.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_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.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 unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\cache$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37
38	RC=$(DMDIR)\bin\rcc
39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40
	@@ -49,11 +49,11 @@
49
50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	$(RC) $(RCFLAGS) -o$@ $**
52
53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54	+echo add allrepo attach bag bisect blob branch browse builtin cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild regexp report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
55	+echo fossil >> $@
56	+echo fossil >> $@
57	+echo $(LIBS) >> $@
58	+echo. >> $@
59	+echo fossil >> $@
	@@ -64,10 +64,13 @@
64	makeheaders$E: $(SRCDIR)\makeheaders.c
65	$(BCC) -o$@ $**
66
67	mkindex$E: $(SRCDIR)\mkindex.c
68	$(BCC) -o$@ $**
69
70	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
71	$(BCC) -o$@ $**
72
73	mkversion$E: $(SRCDIR)\mkversion.c
74	$(BCC) -o$@ $**
75
76	codecheck1$E: $(SRCDIR)\codecheck1.c
	@@ -92,16 +95,19 @@
95	+$** > $@
96
97	page_index.h: mkindex$E $(SRC)
98	+$** > $@
99
100	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
101	+$** > $@
102
103	clean:
104	-del $(OBJDIR)\*.obj
105	-del .obj _.c .h .map
106
107	realclean:
108	-del $(APPNAME) translate$E mkindex$E makeheaders$E mkversion$E codecheck1$E mkbuiltin$E
109
110	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
111	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
112	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
113	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -164,10 +170,16 @@
170	$(OBJDIR)\browse$O : browse_.c browse.h
171	$(TCC) -o$@ -c browse_.c
172
173	browse_.c : $(SRCDIR)\browse.c
174	+translate$E $** > $@
175
176	$(OBJDIR)\builtin$O : builtin_.c builtin.h
177	$(TCC) -o$@ -c builtin_.c
178
179	builtin_.c : $(SRCDIR)\builtin.c
180	+translate$E $** > $@
181
182	$(OBJDIR)\cache$O : cache_.c cache.h
183	$(TCC) -o$@ -c cache_.c
184
185	cache_.c : $(SRCDIR)\cache.c
	@@ -783,8 +795,8 @@
795	$(TCC) -o$@ -c zip_.c
796
797	zip_.c : $(SRCDIR)\zip.c
798	+translate$E $** > $@
799
800	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
801	+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 builtin_.c:builtin.h cache_.c:cache.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 fusefs_.c:fusefs.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_status_.c:json_status.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 loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.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 regexp_.c:regexp.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 unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.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
802	@copy /Y nul: headers
803

M win/Makefile.mingw

+28 -2

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -339,10 +339,11 @@
339	339	$(SRCDIR)/bag.c \
340	340	$(SRCDIR)/bisect.c \
341	341	$(SRCDIR)/blob.c \
342	342	$(SRCDIR)/branch.c \
343	343	$(SRCDIR)/browse.c \
	344	+ $(SRCDIR)/builtin.c \
344	345	$(SRCDIR)/cache.c \
345	346	$(SRCDIR)/captcha.c \
346	347	$(SRCDIR)/cgi.c \
347	348	$(SRCDIR)/checkin.c \
348	349	$(SRCDIR)/checkout.c \
		@@ -443,19 +444,23 @@
443	444	$(SRCDIR)/wysiwyg.c \
444	445	$(SRCDIR)/xfer.c \
445	446	$(SRCDIR)/xfersetup.c \
446	447	$(SRCDIR)/zip.c
447	448
	449	+EXTRA_FILES = \
	450	+ $(SRCDIR)/diff.tcl
	451	+
448	452	TRANS_SRC = \
449	453	$(OBJDIR)/add_.c \
450	454	$(OBJDIR)/allrepo_.c \
451	455	$(OBJDIR)/attach_.c \
452	456	$(OBJDIR)/bag_.c \
453	457	$(OBJDIR)/bisect_.c \
454	458	$(OBJDIR)/blob_.c \
455	459	$(OBJDIR)/branch_.c \
456	460	$(OBJDIR)/browse_.c \
	461	+ $(OBJDIR)/builtin_.c \
457	462	$(OBJDIR)/cache_.c \
458	463	$(OBJDIR)/captcha_.c \
459	464	$(OBJDIR)/cgi_.c \
460	465	$(OBJDIR)/checkin_.c \
461	466	$(OBJDIR)/checkout_.c \
		@@ -565,10 +570,11 @@
565	570	$(OBJDIR)/bag.o \
566	571	$(OBJDIR)/bisect.o \
567	572	$(OBJDIR)/blob.o \
568	573	$(OBJDIR)/branch.o \
569	574	$(OBJDIR)/browse.o \
	575	+ $(OBJDIR)/builtin.o \
570	576	$(OBJDIR)/cache.o \
571	577	$(OBJDIR)/captcha.o \
572	578	$(OBJDIR)/cgi.o \
573	579	$(OBJDIR)/checkin.o \
574	580	$(OBJDIR)/checkout.o \
		@@ -684,10 +690,11 @@
684	690	#
685	691	ifdef USE_WINDOWS
686	692	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687	693	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688	694	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
	695	+MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
689	696	VERSION = $(subst /,\,$(OBJDIR)/version.exe)
690	697	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
691	698	CAT = type
692	699	CP = copy
693	700	GREP = find
		@@ -697,10 +704,11 @@
697	704	RMDIR = rmdir /S /Q
698	705	else
699	706	TRANSLATE = $(OBJDIR)/translate.exe
700	707	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
701	708	MKINDEX = $(OBJDIR)/mkindex.exe
	709	+MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
702	710	VERSION = $(OBJDIR)/version.exe
703	711	CODECHECK1 = $(OBJDIR)/codecheck1.exe
704	712	CAT = cat
705	713	CP = cp
706	714	GREP = grep
		@@ -749,10 +757,13 @@
749	757	$(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
750	758
751	759	$(MKINDEX): $(SRCDIR)/mkindex.c
752	760	$(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
753	761
	762	+$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
	763	+ $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
	764	+
754	765	$(VERSION): $(SRCDIR)/mkversion.c
755	766	$(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
756	767
757	768	$(CODECHECK1): $(SRCDIR)/codecheck1.c
758	769	$(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
		@@ -820,11 +831,11 @@
820	831
821	832	ifdef FOSSIL_BUILD_SSL
822	833	APPTARGETS += openssl
823	834	endif
824	835
825		-$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
	836	+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826	837	$(CODECHECK1) $(TRANS_SRC)
827	838	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828	839
829	840	# This rule prevents make from using its default rules to try build
830	841	# an executable named "manifest" out of the file named "manifest.c"
		@@ -848,19 +859,23 @@
848	859	$(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
849	860
850	861	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
851	862	$(MKINDEX) $(TRANS_SRC) >$@
852	863
853		-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
	864	+$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
	865	+ $(MKBUILTIN) $(EXTRA_FILES) >$@
	866	+
	867	+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
854	868	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
855	869	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
856	870	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
857	871	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
858	872	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
859	873	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
860	874	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
861	875	$(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
	876	+ $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
862	877	$(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
863	878	$(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
864	879	$(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
865	880	$(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
866	881	$(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
		@@ -969,10 +984,13 @@
969	984
970	985	$(OBJDIR)/headers: Makefile
971	986
972	987	Makefile:
973	988
	989	+$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
	990	+ $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h
	991	+
974	992	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
975	993	$(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
976	994
977	995	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
978	996	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
		@@ -1032,10 +1050,18 @@
1032	1050
1033	1051	$(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
1034	1052	$(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
1035	1053
1036	1054	$(OBJDIR)/browse.h: $(OBJDIR)/headers
	1055	+
	1056	+$(OBJDIR)/builtin_.c: $(SRCDIR)/builtin.c $(TRANSLATE)
	1057	+ $(TRANSLATE) $(SRCDIR)/builtin.c >$(OBJDIR)/builtin_.c
	1058	+
	1059	+$(OBJDIR)/builtin.o: $(OBJDIR)/builtin_.c $(OBJDIR)/builtin.h $(OBJDIR)/builtin_data.h $(SRCDIR)/config.h
	1060	+ $(XTCC) -o $(OBJDIR)/builtin.o -c $(OBJDIR)/builtin_.c
	1061	+
	1062	+$(OBJDIR)/builtin.h: $(OBJDIR)/headers
1037	1063
1038	1064	$(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(TRANSLATE)
1039	1065	$(TRANSLATE) $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
1040	1066
1041	1067	$(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
1042	1068

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -339,10 +339,11 @@
339	$(SRCDIR)/bag.c \
340	$(SRCDIR)/bisect.c \
341	$(SRCDIR)/blob.c \
342	$(SRCDIR)/branch.c \
343	$(SRCDIR)/browse.c \

344	$(SRCDIR)/cache.c \
345	$(SRCDIR)/captcha.c \
346	$(SRCDIR)/cgi.c \
347	$(SRCDIR)/checkin.c \
348	$(SRCDIR)/checkout.c \
	@@ -443,19 +444,23 @@
443	$(SRCDIR)/wysiwyg.c \
444	$(SRCDIR)/xfer.c \
445	$(SRCDIR)/xfersetup.c \
446	$(SRCDIR)/zip.c
447



448	TRANS_SRC = \
449	$(OBJDIR)/add_.c \
450	$(OBJDIR)/allrepo_.c \
451	$(OBJDIR)/attach_.c \
452	$(OBJDIR)/bag_.c \
453	$(OBJDIR)/bisect_.c \
454	$(OBJDIR)/blob_.c \
455	$(OBJDIR)/branch_.c \
456	$(OBJDIR)/browse_.c \

457	$(OBJDIR)/cache_.c \
458	$(OBJDIR)/captcha_.c \
459	$(OBJDIR)/cgi_.c \
460	$(OBJDIR)/checkin_.c \
461	$(OBJDIR)/checkout_.c \
	@@ -565,10 +570,11 @@
565	$(OBJDIR)/bag.o \
566	$(OBJDIR)/bisect.o \
567	$(OBJDIR)/blob.o \
568	$(OBJDIR)/branch.o \
569	$(OBJDIR)/browse.o \

570	$(OBJDIR)/cache.o \
571	$(OBJDIR)/captcha.o \
572	$(OBJDIR)/cgi.o \
573	$(OBJDIR)/checkin.o \
574	$(OBJDIR)/checkout.o \
	@@ -684,10 +690,11 @@
684	#
685	ifdef USE_WINDOWS
686	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)

689	VERSION = $(subst /,\,$(OBJDIR)/version.exe)
690	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
691	CAT = type
692	CP = copy
693	GREP = find
	@@ -697,10 +704,11 @@
697	RMDIR = rmdir /S /Q
698	else
699	TRANSLATE = $(OBJDIR)/translate.exe
700	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
701	MKINDEX = $(OBJDIR)/mkindex.exe

702	VERSION = $(OBJDIR)/version.exe
703	CODECHECK1 = $(OBJDIR)/codecheck1.exe
704	CAT = cat
705	CP = cp
706	GREP = grep
	@@ -749,10 +757,13 @@
749	$(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
750
751	$(MKINDEX): $(SRCDIR)/mkindex.c
752	$(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
753



754	$(VERSION): $(SRCDIR)/mkversion.c
755	$(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
756
757	$(CODECHECK1): $(SRCDIR)/codecheck1.c
758	$(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
	@@ -820,11 +831,11 @@
820
821	ifdef FOSSIL_BUILD_SSL
822	APPTARGETS += openssl
823	endif
824
825	$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826	$(CODECHECK1) $(TRANS_SRC)
827	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828
829	# This rule prevents make from using its default rules to try build
830	# an executable named "manifest" out of the file named "manifest.c"
	@@ -848,19 +859,23 @@
848	$(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
849
850	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
851	$(MKINDEX) $(TRANS_SRC) >$@
852
853	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h



854	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
855	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
856	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
857	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
858	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
859	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
860	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
861	$(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \

862	$(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
863	$(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
864	$(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
865	$(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
866	$(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
	@@ -969,10 +984,13 @@
969
970	$(OBJDIR)/headers: Makefile
971
972	Makefile:
973



974	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
975	$(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
976
977	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
978	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
	@@ -1032,10 +1050,18 @@
1032
1033	$(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
1034	$(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
1035
1036	$(OBJDIR)/browse.h: $(OBJDIR)/headers








1037
1038	$(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(TRANSLATE)
1039	$(TRANSLATE) $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
1040
1041	$(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
1042

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -339,10 +339,11 @@
339	$(SRCDIR)/bag.c \
340	$(SRCDIR)/bisect.c \
341	$(SRCDIR)/blob.c \
342	$(SRCDIR)/branch.c \
343	$(SRCDIR)/browse.c \
344	$(SRCDIR)/builtin.c \
345	$(SRCDIR)/cache.c \
346	$(SRCDIR)/captcha.c \
347	$(SRCDIR)/cgi.c \
348	$(SRCDIR)/checkin.c \
349	$(SRCDIR)/checkout.c \
	@@ -443,19 +444,23 @@
444	$(SRCDIR)/wysiwyg.c \
445	$(SRCDIR)/xfer.c \
446	$(SRCDIR)/xfersetup.c \
447	$(SRCDIR)/zip.c
448
449	EXTRA_FILES = \
450	$(SRCDIR)/diff.tcl
451
452	TRANS_SRC = \
453	$(OBJDIR)/add_.c \
454	$(OBJDIR)/allrepo_.c \
455	$(OBJDIR)/attach_.c \
456	$(OBJDIR)/bag_.c \
457	$(OBJDIR)/bisect_.c \
458	$(OBJDIR)/blob_.c \
459	$(OBJDIR)/branch_.c \
460	$(OBJDIR)/browse_.c \
461	$(OBJDIR)/builtin_.c \
462	$(OBJDIR)/cache_.c \
463	$(OBJDIR)/captcha_.c \
464	$(OBJDIR)/cgi_.c \
465	$(OBJDIR)/checkin_.c \
466	$(OBJDIR)/checkout_.c \
	@@ -565,10 +570,11 @@
570	$(OBJDIR)/bag.o \
571	$(OBJDIR)/bisect.o \
572	$(OBJDIR)/blob.o \
573	$(OBJDIR)/branch.o \
574	$(OBJDIR)/browse.o \
575	$(OBJDIR)/builtin.o \
576	$(OBJDIR)/cache.o \
577	$(OBJDIR)/captcha.o \
578	$(OBJDIR)/cgi.o \
579	$(OBJDIR)/checkin.o \
580	$(OBJDIR)/checkout.o \
	@@ -684,10 +690,11 @@
690	#
691	ifdef USE_WINDOWS
692	TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
693	MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
694	MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
695	MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
696	VERSION = $(subst /,\,$(OBJDIR)/version.exe)
697	CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
698	CAT = type
699	CP = copy
700	GREP = find
	@@ -697,10 +704,11 @@
704	RMDIR = rmdir /S /Q
705	else
706	TRANSLATE = $(OBJDIR)/translate.exe
707	MAKEHEADERS = $(OBJDIR)/makeheaders.exe
708	MKINDEX = $(OBJDIR)/mkindex.exe
709	MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
710	VERSION = $(OBJDIR)/version.exe
711	CODECHECK1 = $(OBJDIR)/codecheck1.exe
712	CAT = cat
713	CP = cp
714	GREP = grep
	@@ -749,10 +757,13 @@
757	$(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
758
759	$(MKINDEX): $(SRCDIR)/mkindex.c
760	$(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
761
762	$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
763	$(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
764
765	$(VERSION): $(SRCDIR)/mkversion.c
766	$(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
767
768	$(CODECHECK1): $(SRCDIR)/codecheck1.c
769	$(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
	@@ -820,11 +831,11 @@
831
832	ifdef FOSSIL_BUILD_SSL
833	APPTARGETS += openssl
834	endif
835
836	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
837	$(CODECHECK1) $(TRANS_SRC)
838	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
839
840	# This rule prevents make from using its default rules to try build
841	# an executable named "manifest" out of the file named "manifest.c"
	@@ -848,19 +859,23 @@
859	$(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
860
861	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
862	$(MKINDEX) $(TRANS_SRC) >$@
863
864	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
865	$(MKBUILTIN) $(EXTRA_FILES) >$@
866
867	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
868	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
869	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
870	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
871	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
872	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
873	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
874	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
875	$(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
876	$(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
877	$(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
878	$(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
879	$(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
880	$(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
881	$(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
	@@ -969,10 +984,13 @@
984
985	$(OBJDIR)/headers: Makefile
986
987	Makefile:
988
989	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
990	$(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h
991
992	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
993	$(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
994
995	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
996	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
	@@ -1032,10 +1050,18 @@
1050
1051	$(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
1052	$(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
1053
1054	$(OBJDIR)/browse.h: $(OBJDIR)/headers
1055
1056	$(OBJDIR)/builtin_.c: $(SRCDIR)/builtin.c $(TRANSLATE)
1057	$(TRANSLATE) $(SRCDIR)/builtin.c >$(OBJDIR)/builtin_.c
1058
1059	$(OBJDIR)/builtin.o: $(OBJDIR)/builtin_.c $(OBJDIR)/builtin.h $(OBJDIR)/builtin_data.h $(SRCDIR)/config.h
1060	$(XTCC) -o $(OBJDIR)/builtin.o -c $(OBJDIR)/builtin_.c
1061
1062	$(OBJDIR)/builtin.h: $(OBJDIR)/headers
1063
1064	$(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(TRANSLATE)
1065	$(TRANSLATE) $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
1066
1067	$(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
1068

M win/Makefile.msc

+19 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -203,10 +203,11 @@
203	203	bag_.c \
204	204	bisect_.c \
205	205	blob_.c \
206	206	branch_.c \
207	207	browse_.c \
	208	+ builtin_.c \
208	209	cache_.c \
209	210	captcha_.c \
210	211	cgi_.c \
211	212	checkin_.c \
212	213	checkout_.c \
		@@ -315,10 +316,11 @@
315	316	$(OX)\bag$O \
316	317	$(OX)\bisect$O \
317	318	$(OX)\blob$O \
318	319	$(OX)\branch$O \
319	320	$(OX)\browse$O \
	321	+ $(OX)\builtin$O \
320	322	$(OX)\cache$O \
321	323	$(OX)\captcha$O \
322	324	$(OX)\cgi$O \
323	325	$(OX)\checkin$O \
324	326	$(OX)\checkout$O \
		@@ -483,10 +485,11 @@
483	485	echo $(OX)\bag.obj >> $@
484	486	echo $(OX)\bisect.obj >> $@
485	487	echo $(OX)\blob.obj >> $@
486	488	echo $(OX)\branch.obj >> $@
487	489	echo $(OX)\browse.obj >> $@
	490	+ echo $(OX)\builtin.obj >> $@
488	491	echo $(OX)\cache.obj >> $@
489	492	echo $(OX)\captcha.obj >> $@
490	493	echo $(OX)\cgi.obj >> $@
491	494	echo $(OX)\checkin.obj >> $@
492	495	echo $(OX)\checkout.obj >> $@
		@@ -608,10 +611,13 @@
608	611	makeheaders$E: $(SRCDIR)\makeheaders.c
609	612	$(BCC) $**
610	613
611	614	mkindex$E: $(SRCDIR)\mkindex.c
612	615	$(BCC) $**
	616	+
	617	+mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
	618	+ $(BCC) $**
613	619
614	620	mkversion$E: $(SRCDIR)\mkversion.c
615	621	$(BCC) $**
616	622
617	623	codecheck1$E: $(SRCDIR)\codecheck1.c
		@@ -641,10 +647,13 @@
641	647	$(TCC) /Fo$@ /c $**
642	648
643	649	page_index.h: mkindex$E $(SRC)
644	650	$** > $@
645	651
	652	+builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
	653	+ $** > $@
	654	+
646	655	clean:
647	656	-del $(OX)\*.obj
648	657	-del *.obj
649	658	-del *_.c
650	659	-del *.h
		@@ -666,10 +675,12 @@
666	675	-del makeheaders$P
667	676	-del mkversion$E
668	677	-del mkversion$P
669	678	-del codecheck1$E
670	679	-del codecheck1$P
	680	+ -del mkbuiltin$E
	681	+ -del mkbuiltin$P
671	682
672	683	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
673	684	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
674	685	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
675	686	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
		@@ -730,10 +741,16 @@
730	741	$(OX)\browse$O : browse_.c browse.h
731	742	$(TCC) /Fo$@ -c browse_.c
732	743
733	744	browse_.c : $(SRCDIR)\browse.c
734	745	translate$E $** > $@
	746	+
	747	+$(OX)\builtin$O : builtin_.c builtin.h
	748	+ $(TCC) /Fo$@ -c builtin_.c
	749	+
	750	+builtin_.c : $(SRCDIR)\builtin.c
	751	+ translate$E $** > $@
735	752
736	753	$(OX)\cache$O : cache_.c cache.h
737	754	$(TCC) /Fo$@ -c cache_.c
738	755
739	756	cache_.c : $(SRCDIR)\cache.c
		@@ -1352,19 +1369,20 @@
1352	1369	translate$E $** > $@
1353	1370
1354	1371	fossil.res : $B\win\fossil.rc
1355	1372	$(RCC) /fo $@ $**
1356	1373
1357		-headers: makeheaders$E page_index.h VERSION.h
	1374	+headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1358	1375	makeheaders$E add_.c:add.h \
1359	1376	allrepo_.c:allrepo.h \
1360	1377	attach_.c:attach.h \
1361	1378	bag_.c:bag.h \
1362	1379	bisect_.c:bisect.h \
1363	1380	blob_.c:blob.h \
1364	1381	branch_.c:branch.h \
1365	1382	browse_.c:browse.h \
	1383	+ builtin_.c:builtin.h \
1366	1384	cache_.c:cache.h \
1367	1385	captcha_.c:captcha.h \
1368	1386	cgi_.c:cgi.h \
1369	1387	checkin_.c:checkin.h \
1370	1388	checkout_.c:checkout.h \
1371	1389

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -203,10 +203,11 @@
203	bag_.c \
204	bisect_.c \
205	blob_.c \
206	branch_.c \
207	browse_.c \

208	cache_.c \
209	captcha_.c \
210	cgi_.c \
211	checkin_.c \
212	checkout_.c \
	@@ -315,10 +316,11 @@
315	$(OX)\bag$O \
316	$(OX)\bisect$O \
317	$(OX)\blob$O \
318	$(OX)\branch$O \
319	$(OX)\browse$O \

320	$(OX)\cache$O \
321	$(OX)\captcha$O \
322	$(OX)\cgi$O \
323	$(OX)\checkin$O \
324	$(OX)\checkout$O \
	@@ -483,10 +485,11 @@
483	echo $(OX)\bag.obj >> $@
484	echo $(OX)\bisect.obj >> $@
485	echo $(OX)\blob.obj >> $@
486	echo $(OX)\branch.obj >> $@
487	echo $(OX)\browse.obj >> $@

488	echo $(OX)\cache.obj >> $@
489	echo $(OX)\captcha.obj >> $@
490	echo $(OX)\cgi.obj >> $@
491	echo $(OX)\checkin.obj >> $@
492	echo $(OX)\checkout.obj >> $@
	@@ -608,10 +611,13 @@
608	makeheaders$E: $(SRCDIR)\makeheaders.c
609	$(BCC) $**
610
611	mkindex$E: $(SRCDIR)\mkindex.c
612	$(BCC) $**



613
614	mkversion$E: $(SRCDIR)\mkversion.c
615	$(BCC) $**
616
617	codecheck1$E: $(SRCDIR)\codecheck1.c
	@@ -641,10 +647,13 @@
641	$(TCC) /Fo$@ /c $**
642
643	page_index.h: mkindex$E $(SRC)
644	$** > $@
645



646	clean:
647	-del $(OX)\*.obj
648	-del *.obj
649	-del *_.c
650	-del *.h
	@@ -666,10 +675,12 @@
666	-del makeheaders$P
667	-del mkversion$E
668	-del mkversion$P
669	-del codecheck1$E
670	-del codecheck1$P


671
672	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
673	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
674	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
675	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -730,10 +741,16 @@
730	$(OX)\browse$O : browse_.c browse.h
731	$(TCC) /Fo$@ -c browse_.c
732
733	browse_.c : $(SRCDIR)\browse.c
734	translate$E $** > $@






735
736	$(OX)\cache$O : cache_.c cache.h
737	$(TCC) /Fo$@ -c cache_.c
738
739	cache_.c : $(SRCDIR)\cache.c
	@@ -1352,19 +1369,20 @@
1352	translate$E $** > $@
1353
1354	fossil.res : $B\win\fossil.rc
1355	$(RCC) /fo $@ $**
1356
1357	headers: makeheaders$E page_index.h VERSION.h
1358	makeheaders$E add_.c:add.h \
1359	allrepo_.c:allrepo.h \
1360	attach_.c:attach.h \
1361	bag_.c:bag.h \
1362	bisect_.c:bisect.h \
1363	blob_.c:blob.h \
1364	branch_.c:branch.h \
1365	browse_.c:browse.h \

1366	cache_.c:cache.h \
1367	captcha_.c:captcha.h \
1368	cgi_.c:cgi.h \
1369	checkin_.c:checkin.h \
1370	checkout_.c:checkout.h \
1371

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -203,10 +203,11 @@
203	bag_.c \
204	bisect_.c \
205	blob_.c \
206	branch_.c \
207	browse_.c \
208	builtin_.c \
209	cache_.c \
210	captcha_.c \
211	cgi_.c \
212	checkin_.c \
213	checkout_.c \
	@@ -315,10 +316,11 @@
316	$(OX)\bag$O \
317	$(OX)\bisect$O \
318	$(OX)\blob$O \
319	$(OX)\branch$O \
320	$(OX)\browse$O \
321	$(OX)\builtin$O \
322	$(OX)\cache$O \
323	$(OX)\captcha$O \
324	$(OX)\cgi$O \
325	$(OX)\checkin$O \
326	$(OX)\checkout$O \
	@@ -483,10 +485,11 @@
485	echo $(OX)\bag.obj >> $@
486	echo $(OX)\bisect.obj >> $@
487	echo $(OX)\blob.obj >> $@
488	echo $(OX)\branch.obj >> $@
489	echo $(OX)\browse.obj >> $@
490	echo $(OX)\builtin.obj >> $@
491	echo $(OX)\cache.obj >> $@
492	echo $(OX)\captcha.obj >> $@
493	echo $(OX)\cgi.obj >> $@
494	echo $(OX)\checkin.obj >> $@
495	echo $(OX)\checkout.obj >> $@
	@@ -608,10 +611,13 @@
611	makeheaders$E: $(SRCDIR)\makeheaders.c
612	$(BCC) $**
613
614	mkindex$E: $(SRCDIR)\mkindex.c
615	$(BCC) $**
616
617	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
618	$(BCC) $**
619
620	mkversion$E: $(SRCDIR)\mkversion.c
621	$(BCC) $**
622
623	codecheck1$E: $(SRCDIR)\codecheck1.c
	@@ -641,10 +647,13 @@
647	$(TCC) /Fo$@ /c $**
648
649	page_index.h: mkindex$E $(SRC)
650	$** > $@
651
652	builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
653	$** > $@
654
655	clean:
656	-del $(OX)\*.obj
657	-del *.obj
658	-del *_.c
659	-del *.h
	@@ -666,10 +675,12 @@
675	-del makeheaders$P
676	-del mkversion$E
677	-del mkversion$P
678	-del codecheck1$E
679	-del codecheck1$P
680	-del mkbuiltin$E
681	-del mkbuiltin$P
682
683	$(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
684	$(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
685	$(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
686	$(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
	@@ -730,10 +741,16 @@
741	$(OX)\browse$O : browse_.c browse.h
742	$(TCC) /Fo$@ -c browse_.c
743
744	browse_.c : $(SRCDIR)\browse.c
745	translate$E $** > $@
746
747	$(OX)\builtin$O : builtin_.c builtin.h
748	$(TCC) /Fo$@ -c builtin_.c
749
750	builtin_.c : $(SRCDIR)\builtin.c
751	translate$E $** > $@
752
753	$(OX)\cache$O : cache_.c cache.h
754	$(TCC) /Fo$@ -c cache_.c
755
756	cache_.c : $(SRCDIR)\cache.c
	@@ -1352,19 +1369,20 @@
1369	translate$E $** > $@
1370
1371	fossil.res : $B\win\fossil.rc
1372	$(RCC) /fo $@ $**
1373
1374	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1375	makeheaders$E add_.c:add.h \
1376	allrepo_.c:allrepo.h \
1377	attach_.c:attach.h \
1378	bag_.c:bag.h \
1379	bisect_.c:bisect.h \
1380	blob_.c:blob.h \
1381	branch_.c:branch.h \
1382	browse_.c:browse.h \
1383	builtin_.c:builtin.h \
1384	cache_.c:cache.h \
1385	captcha_.c:captcha.h \
1386	cgi_.c:cgi.h \
1387	checkin_.c:checkin.h \
1388	checkout_.c:checkout.h \
1389

Fossil SCM

Keyboard Shortcuts