Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | If 'newbranch' field only contains spaces, consider it empty. Add missing MSVC linker option to the makemake.tcl script. Cherrypick of [5ceef9bcdd] and [c6f255607b]. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
afbc49cd2728a0e40bf70c778a573870 |
| User & Date: | mistachkin 2013-12-17 21:24:05.220 |
Context
|
2013-12-17
| ||
| 21:28 | Better align the SQLite compilation options used by the makemake.tcl script with those listed on the makefile wiki page. ... (check-in: 00d6eea822 user: mistachkin tags: trunk) | |
| 21:24 | If 'newbranch' field only contains spaces, consider it empty. Add missing MSVC linker option to the makemake.tcl script. Cherrypick of [5ceef9bcdd] and [c6f255607b]. ... (check-in: afbc49cd27 user: mistachkin tags: trunk) | |
| 12:03 | It appears that in [4f0413381d], Makefile.msc was edited without corresponding change in makemake.tcl. Correct that, so this change will not be accidently reverted again (as I did in the previous commit) ... (check-in: c6f255607b user: jan.nijtmans tags: win32-longpath) | |
| 10:51 | If 'newbranch' field only contains spaces, consider it empty. ... (check-in: 5ceef9bcdd user: jan.nijtmans tags: win32-longpath) | |
| 06:04 | Change the minimum length for wiki page names from 3 to 1. ... (check-in: b7ff13a0aa user: joel tags: trunk) | |
Changes
Changes to src/info.c.
| ︙ | ︙ | |||
2202 2203 2204 2205 2206 2207 2208 |
style_header("Edit Check-in [%s]", zUuid);
/*
** chgcbn/chgbn: Handle change of (checkbox for) branch name in
** remaining of form.
*/
@ <script>
@ function chgcbn(checked, branch){
| | | | 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 |
style_header("Edit Check-in [%s]", zUuid);
/*
** chgcbn/chgbn: Handle change of (checkbox for) branch name in
** remaining of form.
*/
@ <script>
@ function chgcbn(checked, branch){
@ val = gebi('brname').value.trim();
@ if( !val || !checked ) val = branch;
@ cidbrid = document.getElementById('cbranch');
@ if( cidbrid ) cidbrid.textContent = val;
@ }
@ function chgbn(val, branch){
@ if( !val ) val = branch;
@ gebi('newbr').checked = (val!=branch);
@ cidbrid = document.getElementById('cbranch');
|
| ︙ | ︙ | |||
2346 2347 2348 2349 2350 2351 2352 | @ <tr><th align="right" valign="top">Branching:</th> @ <td valign="top"> @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) @ onchange="chgcbn(this.checked,'%h(zBranchName)')" /> @ Make this check-in the start of a new branch named:</label> @ <input id="brname" type="text" style="width:15;" name="brname" @ value="%h(zNewBranch)" | | | 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 |
@ <tr><th align="right" valign="top">Branching:</th>
@ <td valign="top">
@ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
@ onchange="chgcbn(this.checked,'%h(zBranchName)')" />
@ Make this check-in the start of a new branch named:</label>
@ <input id="brname" type="text" style="width:15;" name="brname"
@ value="%h(zNewBranch)"
@ onkeyup="chgbn(this.value.trim(),'%h(zBranchName)')" /></td></tr>
if( !fHasClosed ){
if( is_a_leaf(rid) ){
@ <tr><th align="right" valign="top">Leaf Closure:</th>
@ <td valign="top">
@ <label><input type="checkbox" name="close"%s(zCloseFlag) />
@ Mark this leaf as "closed" so that it no longer appears on the
@ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
|
| ︙ | ︙ |
Changes to src/makemake.tcl.
| ︙ | ︙ | |||
1033 1034 1035 1036 1037 1038 1039 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) !ifdef FOSSIL_ENABLE_SSL INCL = $(INCL) -I$(SSLINCDIR) !endif CFLAGS = -nologo -MT -O2 | | | 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) !ifdef FOSSIL_ENABLE_SSL INCL = $(INCL) -I$(SSLINCDIR) !endif CFLAGS = -nologo -MT -O2 LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO !ifdef DEBUG CFLAGS = $(CFLAGS) -Zi LDFLAGS = $(LDFLAGS) /DEBUG !endif BCC = $(CC) $(CFLAGS) |
| ︙ | ︙ |