Fossil SCM

Update makemake.tcl. So next time Makefile.mingw is re-generated, lasted makefile improvements will not be lost. Remove some unnecessary eol-spacing in other tcl files.

jan.nijtmans 2014-12-10 08:23 trunk
Commit 34820b4345ce17fc79ec6b425799cc56e4895dd4
Parent 0a037dd7f423ff0…
7 files changed +6 -1 +2 -2 +4 -4 +2 -2 +2 -2 +8 -8 +1 -1
~ src/makemake.tcl ~ test/valgrind-www.tcl ~ tools/fossil_chat.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ www/faq.tcl ~ www/mkindex.tcl
M src/makemake.tcl
+6 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -534,15 +534,20 @@
534534
 endif
535535
 endif
536536
537537
 ifndef X64
538538
 SSLCONFIG = mingw
539
+ifndef FOSSIL_ENABLE_MINIZ
539540
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
540541
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
542
+else
543
+ZLIBCONFIG =
544
+LIBTARGETS =
545
+endif
541546
 else
542547
 SSLCONFIG = mingw64
543
-ZLIBCONFIG =
548
+ZLIBCONFIG =
544549
 LIBTARGETS =
545550
 endif
546551
547552
 ifndef FOSSIL_ENABLE_MINIZ
548553
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
549554
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -534,15 +534,20 @@
534 endif
535 endif
536
537 ifndef X64
538 SSLCONFIG = mingw
 
539 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
540 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
 
 
 
 
541 else
542 SSLCONFIG = mingw64
543 ZLIBCONFIG =
544 LIBTARGETS =
545 endif
546
547 ifndef FOSSIL_ENABLE_MINIZ
548 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
549
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -534,15 +534,20 @@
534 endif
535 endif
536
537 ifndef X64
538 SSLCONFIG = mingw
539 ifndef FOSSIL_ENABLE_MINIZ
540 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
541 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
542 else
543 ZLIBCONFIG =
544 LIBTARGETS =
545 endif
546 else
547 SSLCONFIG = mingw64
548 ZLIBCONFIG =
549 LIBTARGETS =
550 endif
551
552 ifndef FOSSIL_ENABLE_MINIZ
553 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
554
M test/valgrind-www.tcl
+2 -2
--- test/valgrind-www.tcl
+++ test/valgrind-www.tcl
@@ -1,10 +1,10 @@
11
 #!/usr/bin/tclsh
22
 #
3
-# Run this script in an open Fossil checkout at the top-level with a
3
+# Run this script in an open Fossil checkout at the top-level with a
44
 # fresh build of Fossil itself. This script will run fossil on hundreds
5
-# of different web-pages looking for memory allocation problems using
5
+# of different web-pages looking for memory allocation problems using
66
 # valgrind. Valgrind output appears on stderr. Suggested test scenario:
77
 #
88
 # make
99
 # tclsh valgrind-www.tcl 2>&1 | tee valgrind-out.txt
1010
 #
1111
--- test/valgrind-www.tcl
+++ test/valgrind-www.tcl
@@ -1,10 +1,10 @@
1 #!/usr/bin/tclsh
2 #
3 # Run this script in an open Fossil checkout at the top-level with a
4 # fresh build of Fossil itself. This script will run fossil on hundreds
5 # of different web-pages looking for memory allocation problems using
6 # valgrind. Valgrind output appears on stderr. Suggested test scenario:
7 #
8 # make
9 # tclsh valgrind-www.tcl 2>&1 | tee valgrind-out.txt
10 #
11
--- test/valgrind-www.tcl
+++ test/valgrind-www.tcl
@@ -1,10 +1,10 @@
1 #!/usr/bin/tclsh
2 #
3 # Run this script in an open Fossil checkout at the top-level with a
4 # fresh build of Fossil itself. This script will run fossil on hundreds
5 # of different web-pages looking for memory allocation problems using
6 # valgrind. Valgrind output appears on stderr. Suggested test scenario:
7 #
8 # make
9 # tclsh valgrind-www.tcl 2>&1 | tee valgrind-out.txt
10 #
11
M tools/fossil_chat.tcl
+4 -4
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -84,11 +84,11 @@
8484
 catch {close $SOCKET}
8585
 if {[catch {
8686
 if {$::PROXYHOST ne {}} {
8787
 set SOCKET [socket $::PROXYHOST $::PROXYPORT]
8888
 puts $SOCKET "CONNECT $::SERVERHOST:$::SERVERPORT HTTP/1.1"
89
- puts $SOCKET "Host: $::SERVERHOST:$::SERVERPORT"
89
+ puts $SOCKET "Host: $::SERVERHOST:$::SERVERPORT"
9090
 puts $SOCKET ""
9191
 } else {
9292
 set SOCKET [socket $::SERVERHOST $::SERVERPORT]
9393
 }
9494
 fconfigure $SOCKET -translation binary -blocking 0
@@ -142,11 +142,11 @@
142142
 #
143143
 proc delete_files {} {
144144
 global FILES
145145
 .mb.files delete 3 end
146146
 array unset FILES
147
- .mb.files entryconfigure 1 -state disabled
147
+ .mb.files entryconfigure 1 -state disabled
148148
 }
149149
150150
 # Prompt the user to select a file from the disk. Then send that
151151
 # file to all chat participants.
152152
 #
@@ -188,11 +188,11 @@
188188
 if {![info exists prior] || $filename!=$prior} {
189189
 .mb.files add command -label "Save \"$filename\"" \
190190
 -command [list save_file $filename]
191191
 }
192192
 set FILES($filename) $data
193
- .mb.files entryconfigure 1 -state active
193
+ .mb.files entryconfigure 1 -state active
194194
 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
195195
 .msg.t insert end "\[$time $from\] " meta "File: \"$filename\"\n" norm
196196
 .msg.t see end
197197
 }
198198
@@ -232,11 +232,11 @@
232232
 } elseif {$cmd=="file"} {
233233
 if {[info commands handle_file]=="handle_file"} {
234234
 handle_file [lindex $line 1] [lindex $line 2] [lindex $line 3]
235235
 }
236236
 }
237
-}
237
+}
238238
239239
 # Handle a broken socket connection
240240
 #
241241
 proc disconnect {} {
242242
 global SOCKET
243243
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -84,11 +84,11 @@
84 catch {close $SOCKET}
85 if {[catch {
86 if {$::PROXYHOST ne {}} {
87 set SOCKET [socket $::PROXYHOST $::PROXYPORT]
88 puts $SOCKET "CONNECT $::SERVERHOST:$::SERVERPORT HTTP/1.1"
89 puts $SOCKET "Host: $::SERVERHOST:$::SERVERPORT"
90 puts $SOCKET ""
91 } else {
92 set SOCKET [socket $::SERVERHOST $::SERVERPORT]
93 }
94 fconfigure $SOCKET -translation binary -blocking 0
@@ -142,11 +142,11 @@
142 #
143 proc delete_files {} {
144 global FILES
145 .mb.files delete 3 end
146 array unset FILES
147 .mb.files entryconfigure 1 -state disabled
148 }
149
150 # Prompt the user to select a file from the disk. Then send that
151 # file to all chat participants.
152 #
@@ -188,11 +188,11 @@
188 if {![info exists prior] || $filename!=$prior} {
189 .mb.files add command -label "Save \"$filename\"" \
190 -command [list save_file $filename]
191 }
192 set FILES($filename) $data
193 .mb.files entryconfigure 1 -state active
194 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
195 .msg.t insert end "\[$time $from\] " meta "File: \"$filename\"\n" norm
196 .msg.t see end
197 }
198
@@ -232,11 +232,11 @@
232 } elseif {$cmd=="file"} {
233 if {[info commands handle_file]=="handle_file"} {
234 handle_file [lindex $line 1] [lindex $line 2] [lindex $line 3]
235 }
236 }
237 }
238
239 # Handle a broken socket connection
240 #
241 proc disconnect {} {
242 global SOCKET
243
--- tools/fossil_chat.tcl
+++ tools/fossil_chat.tcl
@@ -84,11 +84,11 @@
84 catch {close $SOCKET}
85 if {[catch {
86 if {$::PROXYHOST ne {}} {
87 set SOCKET [socket $::PROXYHOST $::PROXYPORT]
88 puts $SOCKET "CONNECT $::SERVERHOST:$::SERVERPORT HTTP/1.1"
89 puts $SOCKET "Host: $::SERVERHOST:$::SERVERPORT"
90 puts $SOCKET ""
91 } else {
92 set SOCKET [socket $::SERVERHOST $::SERVERPORT]
93 }
94 fconfigure $SOCKET -translation binary -blocking 0
@@ -142,11 +142,11 @@
142 #
143 proc delete_files {} {
144 global FILES
145 .mb.files delete 3 end
146 array unset FILES
147 .mb.files entryconfigure 1 -state disabled
148 }
149
150 # Prompt the user to select a file from the disk. Then send that
151 # file to all chat participants.
152 #
@@ -188,11 +188,11 @@
188 if {![info exists prior] || $filename!=$prior} {
189 .mb.files add command -label "Save \"$filename\"" \
190 -command [list save_file $filename]
191 }
192 set FILES($filename) $data
193 .mb.files entryconfigure 1 -state active
194 set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
195 .msg.t insert end "\[$time $from\] " meta "File: \"$filename\"\n" norm
196 .msg.t see end
197 }
198
@@ -232,11 +232,11 @@
232 } elseif {$cmd=="file"} {
233 if {[info commands handle_file]=="handle_file"} {
234 handle_file [lindex $line 1] [lindex $line 2] [lindex $line 3]
235 }
236 }
237 }
238
239 # Handle a broken socket connection
240 #
241 proc disconnect {} {
242 global SOCKET
243
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -112,16 +112,16 @@
112112
 SSLCONFIG = mingw
113113
 ifndef FOSSIL_ENABLE_MINIZ
114114
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115115
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
116116
 else
117
-ZLIBCONFIG =
117
+ZLIBCONFIG =
118118
 LIBTARGETS =
119119
 endif
120120
 else
121121
 SSLCONFIG = mingw64
122
-ZLIBCONFIG =
122
+ZLIBCONFIG =
123123
 LIBTARGETS =
124124
 endif
125125
126126
 ifndef FOSSIL_ENABLE_MINIZ
127127
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128128
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -112,16 +112,16 @@
112 SSLCONFIG = mingw
113 ifndef FOSSIL_ENABLE_MINIZ
114 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
116 else
117 ZLIBCONFIG =
118 LIBTARGETS =
119 endif
120 else
121 SSLCONFIG = mingw64
122 ZLIBCONFIG =
123 LIBTARGETS =
124 endif
125
126 ifndef FOSSIL_ENABLE_MINIZ
127 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -112,16 +112,16 @@
112 SSLCONFIG = mingw
113 ifndef FOSSIL_ENABLE_MINIZ
114 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
116 else
117 ZLIBCONFIG =
118 LIBTARGETS =
119 endif
120 else
121 SSLCONFIG = mingw64
122 ZLIBCONFIG =
123 LIBTARGETS =
124 endif
125
126 ifndef FOSSIL_ENABLE_MINIZ
127 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -112,16 +112,16 @@
112112
 SSLCONFIG = mingw
113113
 ifndef FOSSIL_ENABLE_MINIZ
114114
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115115
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
116116
 else
117
-ZLIBCONFIG =
117
+ZLIBCONFIG =
118118
 LIBTARGETS =
119119
 endif
120120
 else
121121
 SSLCONFIG = mingw64
122
-ZLIBCONFIG =
122
+ZLIBCONFIG =
123123
 LIBTARGETS =
124124
 endif
125125
126126
 ifndef FOSSIL_ENABLE_MINIZ
127127
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128128
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -112,16 +112,16 @@
112 SSLCONFIG = mingw
113 ifndef FOSSIL_ENABLE_MINIZ
114 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
116 else
117 ZLIBCONFIG =
118 LIBTARGETS =
119 endif
120 else
121 SSLCONFIG = mingw64
122 ZLIBCONFIG =
123 LIBTARGETS =
124 endif
125
126 ifndef FOSSIL_ENABLE_MINIZ
127 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -112,16 +112,16 @@
112 SSLCONFIG = mingw
113 ifndef FOSSIL_ENABLE_MINIZ
114 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
116 else
117 ZLIBCONFIG =
118 LIBTARGETS =
119 endif
120 else
121 SSLCONFIG = mingw64
122 ZLIBCONFIG =
123 LIBTARGETS =
124 endif
125
126 ifndef FOSSIL_ENABLE_MINIZ
127 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128
M www/faq.tcl
+8 -8
--- www/faq.tcl
+++ www/faq.tcl
@@ -55,12 +55,12 @@
5555
 If you already have a fork in your check-in tree and you want to convert
5656
 that fork to a branch, you can do this from the web interface.
5757
 First locate the check-in that you want to be
5858
 the initial check-in of your branch on the timeline and click on its
5959
 link so that you are on the <b>ci</b> page. Then find the "<b>edit</b>"
60
- link (near the "Commands:" label) and click on that. On the
61
- "Edit Check-in" page, check the box beside "Branching:" and fill in
60
+ link (near the "Commands:" label) and click on that. On the
61
+ "Edit Check-in" page, check the box beside "Branching:" and fill in
6262
 the name of your new branch to the right and press the "Apply Changes"
6363
 button.
6464
 }
6565
6666
 faq {
@@ -83,31 +83,31 @@
8383
8484
 The CHECK-IN in the previous line can be any
8585
 [./checkin_names.wiki | valid check-in name format].
8686
8787
 You can also add (and remove) tags from a check-in using the
88
- [./webui.wiki | web interface]. First locate the check-in that you
88
+ [./webui.wiki | web interface]. First locate the check-in that you
8989
 what to tag on the tmline, then click on the link to go the detailed
9090
 information page for that check-in. Then find the "<b>edit</b>"
9191
 link (near the "Commands:" label) and click on that. There are
9292
 controls on the edit page that allow new tags to be added and existing
9393
 tags to be removed.
94
-}
94
+}
9595
9696
 faq {
9797
 How do I create a private branch that won't get pushed back to the
9898
 main repository.
9999
 } {
100
- Use the <b>--private</b> command-line option on the
100
+ Use the <b>--private</b> command-line option on the
101101
 <b>commit</b> command. The result will be a check-in which exists on
102
- your local repository only and is never pushed to other repositories.
102
+ your local repository only and is never pushed to other repositories.
103103
 All descendents of a private check-in are also private.
104
-
104
+
105105
 Unless you specify something different using the <b>--branch</b> and/or
106106
 <b>--bgcolor</b> options, the new private check-in will be put on a branch
107107
 named "private" with an orange background color.
108
-
108
+
109109
 You can merge from the trunk into your private branch in order to keep
110110
 your private branch in sync with the latest changes on the trunk. Once
111111
 you have everything in your private branch the way you want it, you can
112112
 then merge your private branch back into the trunk and push. Only the
113113
 final merge operation will appear in other repositories. It will seem
114114
--- www/faq.tcl
+++ www/faq.tcl
@@ -55,12 +55,12 @@
55 If you already have a fork in your check-in tree and you want to convert
56 that fork to a branch, you can do this from the web interface.
57 First locate the check-in that you want to be
58 the initial check-in of your branch on the timeline and click on its
59 link so that you are on the <b>ci</b> page. Then find the "<b>edit</b>"
60 link (near the "Commands:" label) and click on that. On the
61 "Edit Check-in" page, check the box beside "Branching:" and fill in
62 the name of your new branch to the right and press the "Apply Changes"
63 button.
64 }
65
66 faq {
@@ -83,31 +83,31 @@
83
84 The CHECK-IN in the previous line can be any
85 [./checkin_names.wiki | valid check-in name format].
86
87 You can also add (and remove) tags from a check-in using the
88 [./webui.wiki | web interface]. First locate the check-in that you
89 what to tag on the tmline, then click on the link to go the detailed
90 information page for that check-in. Then find the "<b>edit</b>"
91 link (near the "Commands:" label) and click on that. There are
92 controls on the edit page that allow new tags to be added and existing
93 tags to be removed.
94 }
95
96 faq {
97 How do I create a private branch that won't get pushed back to the
98 main repository.
99 } {
100 Use the <b>--private</b> command-line option on the
101 <b>commit</b> command. The result will be a check-in which exists on
102 your local repository only and is never pushed to other repositories.
103 All descendents of a private check-in are also private.
104
105 Unless you specify something different using the <b>--branch</b> and/or
106 <b>--bgcolor</b> options, the new private check-in will be put on a branch
107 named "private" with an orange background color.
108
109 You can merge from the trunk into your private branch in order to keep
110 your private branch in sync with the latest changes on the trunk. Once
111 you have everything in your private branch the way you want it, you can
112 then merge your private branch back into the trunk and push. Only the
113 final merge operation will appear in other repositories. It will seem
114
--- www/faq.tcl
+++ www/faq.tcl
@@ -55,12 +55,12 @@
55 If you already have a fork in your check-in tree and you want to convert
56 that fork to a branch, you can do this from the web interface.
57 First locate the check-in that you want to be
58 the initial check-in of your branch on the timeline and click on its
59 link so that you are on the <b>ci</b> page. Then find the "<b>edit</b>"
60 link (near the "Commands:" label) and click on that. On the
61 "Edit Check-in" page, check the box beside "Branching:" and fill in
62 the name of your new branch to the right and press the "Apply Changes"
63 button.
64 }
65
66 faq {
@@ -83,31 +83,31 @@
83
84 The CHECK-IN in the previous line can be any
85 [./checkin_names.wiki | valid check-in name format].
86
87 You can also add (and remove) tags from a check-in using the
88 [./webui.wiki | web interface]. First locate the check-in that you
89 what to tag on the tmline, then click on the link to go the detailed
90 information page for that check-in. Then find the "<b>edit</b>"
91 link (near the "Commands:" label) and click on that. There are
92 controls on the edit page that allow new tags to be added and existing
93 tags to be removed.
94 }
95
96 faq {
97 How do I create a private branch that won't get pushed back to the
98 main repository.
99 } {
100 Use the <b>--private</b> command-line option on the
101 <b>commit</b> command. The result will be a check-in which exists on
102 your local repository only and is never pushed to other repositories.
103 All descendents of a private check-in are also private.
104
105 Unless you specify something different using the <b>--branch</b> and/or
106 <b>--bgcolor</b> options, the new private check-in will be put on a branch
107 named "private" with an orange background color.
108
109 You can merge from the trunk into your private branch in order to keep
110 your private branch in sync with the latest changes on the trunk. Once
111 you have everything in your private branch the way you want it, you can
112 then merge your private branch back into the trunk and push. Only the
113 final merge operation will appear in other repositories. It will seem
114
M www/mkindex.tcl
+1 -1
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -1,8 +1,8 @@
11
 #!/bin/sh
22
 #
3
-# Run this TCL script to generate a WIKI page that contains a
3
+# Run this TCL script to generate a WIKI page that contains a
44
 # permuted index of the various documentation files.
55
 #
66
 # tclsh mkindex.tcl >permutedindex.wiki
77
 #
88
99
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -1,8 +1,8 @@
1 #!/bin/sh
2 #
3 # Run this TCL script to generate a WIKI page that contains a
4 # permuted index of the various documentation files.
5 #
6 # tclsh mkindex.tcl >permutedindex.wiki
7 #
8
9
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -1,8 +1,8 @@
1 #!/bin/sh
2 #
3 # Run this TCL script to generate a WIKI page that contains a
4 # permuted index of the various documentation files.
5 #
6 # tclsh mkindex.tcl >permutedindex.wiki
7 #
8
9

Keyboard Shortcuts

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