Fossil SCM

If 'newbranch' field only contains spaces, consider it empty. Add missing MSVC linker option to the makemake.tcl script. Cherrypick of [5ceef9bcdd] and [c6f255607b].

mistachkin 2013-12-17 21:24 trunk
Commit afbc49cd2728a0e40bf70c778a573870010616e0
Parent b7ff13a0aa6317f…
4 files changed +3 -3 +1 -1 +1 -1 +1 -1
~ src/info.c ~ src/makemake.tcl ~ src/makemake.tcl ~ src/makemake.tcl
M src/info.c
+3 -3
--- src/info.c
+++ src/info.c
@@ -2204,12 +2204,12 @@
22042204
 ** chgcbn/chgbn: Handle change of (checkbox for) branch name in
22052205
 ** remaining of form.
22062206
 */
22072207
 @ <script>
22082208
 @ function chgcbn(checked, branch){
2209
- @ val = gebi('brname').value;
2210
- @ if( !val || !checked) val = branch;
2209
+ @ val = gebi('brname').value.trim();
2210
+ @ if( !val || !checked ) val = branch;
22112211
 @ cidbrid = document.getElementById('cbranch');
22122212
 @ if( cidbrid ) cidbrid.textContent = val;
22132213
 @ }
22142214
 @ function chgbn(val, branch){
22152215
 @ if( !val ) val = branch;
@@ -2348,11 +2348,11 @@
23482348
 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
23492349
 @ onchange="chgcbn(this.checked,'%h(zBranchName)')" />
23502350
 @ Make this check-in the start of a new branch named:</label>
23512351
 @ <input id="brname" type="text" style="width:15;" name="brname"
23522352
 @ value="%h(zNewBranch)"
2353
- @ onkeyup="chgbn(this.value,'%h(zBranchName)')" /></td></tr>
2353
+ @ onkeyup="chgbn(this.value.trim(),'%h(zBranchName)')" /></td></tr>
23542354
 if( !fHasClosed ){
23552355
 if( is_a_leaf(rid) ){
23562356
 @ <tr><th align="right" valign="top">Leaf Closure:</th>
23572357
 @ <td valign="top">
23582358
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
23592359
--- src/info.c
+++ src/info.c
@@ -2204,12 +2204,12 @@
2204 ** chgcbn/chgbn: Handle change of (checkbox for) branch name in
2205 ** remaining of form.
2206 */
2207 @ <script>
2208 @ function chgcbn(checked, branch){
2209 @ val = gebi('brname').value;
2210 @ if( !val || !checked) val = branch;
2211 @ cidbrid = document.getElementById('cbranch');
2212 @ if( cidbrid ) cidbrid.textContent = val;
2213 @ }
2214 @ function chgbn(val, branch){
2215 @ if( !val ) val = branch;
@@ -2348,11 +2348,11 @@
2348 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2349 @ onchange="chgcbn(this.checked,'%h(zBranchName)')" />
2350 @ Make this check-in the start of a new branch named:</label>
2351 @ <input id="brname" type="text" style="width:15;" name="brname"
2352 @ value="%h(zNewBranch)"
2353 @ onkeyup="chgbn(this.value,'%h(zBranchName)')" /></td></tr>
2354 if( !fHasClosed ){
2355 if( is_a_leaf(rid) ){
2356 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2357 @ <td valign="top">
2358 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2359
--- src/info.c
+++ src/info.c
@@ -2204,12 +2204,12 @@
2204 ** chgcbn/chgbn: Handle change of (checkbox for) branch name in
2205 ** remaining of form.
2206 */
2207 @ <script>
2208 @ function chgcbn(checked, branch){
2209 @ val = gebi('brname').value.trim();
2210 @ if( !val || !checked ) val = branch;
2211 @ cidbrid = document.getElementById('cbranch');
2212 @ if( cidbrid ) cidbrid.textContent = val;
2213 @ }
2214 @ function chgbn(val, branch){
2215 @ if( !val ) val = branch;
@@ -2348,11 +2348,11 @@
2348 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2349 @ onchange="chgcbn(this.checked,'%h(zBranchName)')" />
2350 @ Make this check-in the start of a new branch named:</label>
2351 @ <input id="brname" type="text" style="width:15;" name="brname"
2352 @ value="%h(zNewBranch)"
2353 @ onkeyup="chgbn(this.value.trim(),'%h(zBranchName)')" /></td></tr>
2354 if( !fHasClosed ){
2355 if( is_a_leaf(rid) ){
2356 @ <tr><th align="right" valign="top">Leaf Closure:</th>
2357 @ <td valign="top">
2358 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2359
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
10351035
 !ifdef FOSSIL_ENABLE_SSL
10361036
 INCL = $(INCL) -I$(SSLINCDIR)
10371037
 !endif
10381038
10391039
 CFLAGS = -nologo -MT -O2
1040
-LDFLAGS = /NODEFAULTLIB:msvcrt
1040
+LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
10411041
10421042
 !ifdef DEBUG
10431043
 CFLAGS = $(CFLAGS) -Zi
10441044
 LDFLAGS = $(LDFLAGS) /DEBUG
10451045
 !endif
10461046
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
1035 !ifdef FOSSIL_ENABLE_SSL
1036 INCL = $(INCL) -I$(SSLINCDIR)
1037 !endif
1038
1039 CFLAGS = -nologo -MT -O2
1040 LDFLAGS = /NODEFAULTLIB:msvcrt
1041
1042 !ifdef DEBUG
1043 CFLAGS = $(CFLAGS) -Zi
1044 LDFLAGS = $(LDFLAGS) /DEBUG
1045 !endif
1046
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
1035 !ifdef FOSSIL_ENABLE_SSL
1036 INCL = $(INCL) -I$(SSLINCDIR)
1037 !endif
1038
1039 CFLAGS = -nologo -MT -O2
1040 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1041
1042 !ifdef DEBUG
1043 CFLAGS = $(CFLAGS) -Zi
1044 LDFLAGS = $(LDFLAGS) /DEBUG
1045 !endif
1046
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
10351035
 !ifdef FOSSIL_ENABLE_SSL
10361036
 INCL = $(INCL) -I$(SSLINCDIR)
10371037
 !endif
10381038
10391039
 CFLAGS = -nologo -MT -O2
1040
-LDFLAGS = /NODEFAULTLIB:msvcrt
1040
+LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
10411041
10421042
 !ifdef DEBUG
10431043
 CFLAGS = $(CFLAGS) -Zi
10441044
 LDFLAGS = $(LDFLAGS) /DEBUG
10451045
 !endif
10461046
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
1035 !ifdef FOSSIL_ENABLE_SSL
1036 INCL = $(INCL) -I$(SSLINCDIR)
1037 !endif
1038
1039 CFLAGS = -nologo -MT -O2
1040 LDFLAGS = /NODEFAULTLIB:msvcrt
1041
1042 !ifdef DEBUG
1043 CFLAGS = $(CFLAGS) -Zi
1044 LDFLAGS = $(LDFLAGS) /DEBUG
1045 !endif
1046
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
1035 !ifdef FOSSIL_ENABLE_SSL
1036 INCL = $(INCL) -I$(SSLINCDIR)
1037 !endif
1038
1039 CFLAGS = -nologo -MT -O2
1040 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1041
1042 !ifdef DEBUG
1043 CFLAGS = $(CFLAGS) -Zi
1044 LDFLAGS = $(LDFLAGS) /DEBUG
1045 !endif
1046
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
10351035
 !ifdef FOSSIL_ENABLE_SSL
10361036
 INCL = $(INCL) -I$(SSLINCDIR)
10371037
 !endif
10381038
10391039
 CFLAGS = -nologo -MT -O2
1040
-LDFLAGS = /NODEFAULTLIB:msvcrt
1040
+LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
10411041
10421042
 !ifdef DEBUG
10431043
 CFLAGS = $(CFLAGS) -Zi
10441044
 LDFLAGS = $(LDFLAGS) /DEBUG
10451045
 !endif
10461046
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
1035 !ifdef FOSSIL_ENABLE_SSL
1036 INCL = $(INCL) -I$(SSLINCDIR)
1037 !endif
1038
1039 CFLAGS = -nologo -MT -O2
1040 LDFLAGS = /NODEFAULTLIB:msvcrt
1041
1042 !ifdef DEBUG
1043 CFLAGS = $(CFLAGS) -Zi
1044 LDFLAGS = $(LDFLAGS) /DEBUG
1045 !endif
1046
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1035,11 +1035,11 @@
1035 !ifdef FOSSIL_ENABLE_SSL
1036 INCL = $(INCL) -I$(SSLINCDIR)
1037 !endif
1038
1039 CFLAGS = -nologo -MT -O2
1040 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1041
1042 !ifdef DEBUG
1043 CFLAGS = $(CFLAGS) -Zi
1044 LDFLAGS = $(LDFLAGS) /DEBUG
1045 !endif
1046

Keyboard Shortcuts

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