Fossil SCM

merge trunk <p>enable UNICODE mode (experimental)

jan.nijtmans 2012-09-06 09:10 UTC eclipse-project merge
Commit 2017d2f83269bf49b08440f8b612cdc8b090b8e7
Parent c05ba6b0d71380f…
22 files changed +10 -8 +25 +25 +4 -3 -13 +2 +2 +6 -5 +6 -5 +3 -3 +18 -1 +2 +5 -1 +5 -1 +6 -6 +6 -6 +5 -4 +5 -4 +5 -4 +5 -4 +1 -1 +1 -1
~ src/checkin.c ~ src/file.c ~ src/file.c ~ src/finfo.c ~ src/info.c ~ src/main.c ~ src/main.c ~ src/makemake.tcl ~ src/makemake.tcl ~ src/name.c ~ src/setup.c ~ src/sqlcmd.c ~ src/timeline.c ~ src/timeline.c ~ src/winhttp.c ~ src/winhttp.c ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/Makefile.msc
M src/checkin.c
+10 -8
--- src/checkin.c
+++ src/checkin.c
@@ -701,24 +701,26 @@
701701
 int isExe = db_column_int(&q, 4);
702702
 int isLink = db_column_int(&q, 5);
703703
 int isSelected = db_column_int(&q, 6);
704704
 const char *zPerm;
705705
 int cmp;
706
-#if !defined(_WIN32)
707
- int mPerm;
706
+
707
+ blob_resize(&filename, nBasename);
708
+ blob_append(&filename, zName, -1);
708709
710
+#if !defined(_WIN32)
709711
 /* For unix, extract the "executable" and "symlink" permissions
710712
 ** directly from the filesystem. On windows, permissions are
711713
 ** unchanged from the original.
712714
 */
713
-
714
- blob_resize(&filename, nBasename);
715
- blob_append(&filename, zName, -1);
715
+ {
716
+ int mPerm;
716717
717
- mPerm = file_wd_perm(blob_str(&filename));
718
- isExe = ( mPerm==PERM_EXE );
719
- isLink = ( mPerm==PERM_LNK );
718
+ mPerm = file_wd_perm(blob_str(&filename));
719
+ isExe = ( mPerm==PERM_EXE );
720
+ isLink = ( mPerm==PERM_LNK );
721
+ }
720722
 #endif
721723
 if( isExe ){
722724
 zPerm = " x";
723725
 }else if( isLink ){
724726
 zPerm = " l"; /* note: symlinks don't have executable bit on unix */
725727
--- src/checkin.c
+++ src/checkin.c
@@ -701,24 +701,26 @@
701 int isExe = db_column_int(&q, 4);
702 int isLink = db_column_int(&q, 5);
703 int isSelected = db_column_int(&q, 6);
704 const char *zPerm;
705 int cmp;
706 #if !defined(_WIN32)
707 int mPerm;
 
708
 
709 /* For unix, extract the "executable" and "symlink" permissions
710 ** directly from the filesystem. On windows, permissions are
711 ** unchanged from the original.
712 */
713
714 blob_resize(&filename, nBasename);
715 blob_append(&filename, zName, -1);
716
717 mPerm = file_wd_perm(blob_str(&filename));
718 isExe = ( mPerm==PERM_EXE );
719 isLink = ( mPerm==PERM_LNK );
 
720 #endif
721 if( isExe ){
722 zPerm = " x";
723 }else if( isLink ){
724 zPerm = " l"; /* note: symlinks don't have executable bit on unix */
725
--- src/checkin.c
+++ src/checkin.c
@@ -701,24 +701,26 @@
701 int isExe = db_column_int(&q, 4);
702 int isLink = db_column_int(&q, 5);
703 int isSelected = db_column_int(&q, 6);
704 const char *zPerm;
705 int cmp;
706
707 blob_resize(&filename, nBasename);
708 blob_append(&filename, zName, -1);
709
710 #if !defined(_WIN32)
711 /* For unix, extract the "executable" and "symlink" permissions
712 ** directly from the filesystem. On windows, permissions are
713 ** unchanged from the original.
714 */
715 {
716 int mPerm;
 
717
718 mPerm = file_wd_perm(blob_str(&filename));
719 isExe = ( mPerm==PERM_EXE );
720 isLink = ( mPerm==PERM_LNK );
721 }
722 #endif
723 if( isExe ){
724 zPerm = " x";
725 }else if( isLink ){
726 zPerm = " l"; /* note: symlinks don't have executable bit on unix */
727
M src/file.c
+25
--- src/file.c
+++ src/file.c
@@ -1125,11 +1125,16 @@
11251125
 */
11261126
 int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
11271127
 #ifdef _WIN32
11281128
 int nChar;
11291129
 wchar_t *zUnicode; /* Unicode version of zUtf8 */
1130
+#ifdef UNICODE
11301131
 DWORD dummy;
1132
+#else
1133
+ char *zConsole; /* Console version of zUtf8 */
1134
+ int codepage; /* Console code page */
1135
+#endif
11311136
11321137
 static int istty[2] = { -1, -1 };
11331138
 if( istty[toStdErr] == -1 ){
11341139
 istty[toStdErr] = _isatty(toStdErr + 1) != 0;
11351140
 }
@@ -1147,11 +1152,31 @@
11471152
 if( nChar==0 ){
11481153
 free(zUnicode);
11491154
 return 0;
11501155
 }
11511156
 zUnicode[nChar] = '\0';
1157
+#ifdef UNICODE
11521158
 WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
1159
+#else /* !UNICODE */
1160
+ codepage = GetConsoleCP();
1161
+ nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, 0, 0, 0, 0);
1162
+ zConsole = malloc( nByte + 1);
1163
+ if( zConsole==0 ){
1164
+ free(zUnicode);
1165
+ return 0;
1166
+ }
1167
+ nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, zConsole, nByte, 0, 0);
1168
+ zConsole[nByte] = '\0';
1169
+ free(zUnicode);
1170
+ if( nByte == 0 ){
1171
+ free(zConsole);
1172
+ zConsole = 0;
1173
+ return 0;
1174
+ }
1175
+ fwrite(zConsole, 1, nByte, toStdErr ? stderr : stdout);
1176
+ fflush(toStdErr ? stderr : stdout);
1177
+#endif /* UNICODE */
11531178
 return nChar;
11541179
 #else
11551180
 return -1; /* No-op on unix */
11561181
 #endif
11571182
 }
11581183
--- src/file.c
+++ src/file.c
@@ -1125,11 +1125,16 @@
1125 */
1126 int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
1127 #ifdef _WIN32
1128 int nChar;
1129 wchar_t *zUnicode; /* Unicode version of zUtf8 */
 
1130 DWORD dummy;
 
 
 
 
1131
1132 static int istty[2] = { -1, -1 };
1133 if( istty[toStdErr] == -1 ){
1134 istty[toStdErr] = _isatty(toStdErr + 1) != 0;
1135 }
@@ -1147,11 +1152,31 @@
1147 if( nChar==0 ){
1148 free(zUnicode);
1149 return 0;
1150 }
1151 zUnicode[nChar] = '\0';
 
1152 WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1153 return nChar;
1154 #else
1155 return -1; /* No-op on unix */
1156 #endif
1157 }
1158
--- src/file.c
+++ src/file.c
@@ -1125,11 +1125,16 @@
1125 */
1126 int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
1127 #ifdef _WIN32
1128 int nChar;
1129 wchar_t *zUnicode; /* Unicode version of zUtf8 */
1130 #ifdef UNICODE
1131 DWORD dummy;
1132 #else
1133 char *zConsole; /* Console version of zUtf8 */
1134 int codepage; /* Console code page */
1135 #endif
1136
1137 static int istty[2] = { -1, -1 };
1138 if( istty[toStdErr] == -1 ){
1139 istty[toStdErr] = _isatty(toStdErr + 1) != 0;
1140 }
@@ -1147,11 +1152,31 @@
1152 if( nChar==0 ){
1153 free(zUnicode);
1154 return 0;
1155 }
1156 zUnicode[nChar] = '\0';
1157 #ifdef UNICODE
1158 WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
1159 #else /* !UNICODE */
1160 codepage = GetConsoleCP();
1161 nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, 0, 0, 0, 0);
1162 zConsole = malloc( nByte + 1);
1163 if( zConsole==0 ){
1164 free(zUnicode);
1165 return 0;
1166 }
1167 nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, zConsole, nByte, 0, 0);
1168 zConsole[nByte] = '\0';
1169 free(zUnicode);
1170 if( nByte == 0 ){
1171 free(zConsole);
1172 zConsole = 0;
1173 return 0;
1174 }
1175 fwrite(zConsole, 1, nByte, toStdErr ? stderr : stdout);
1176 fflush(toStdErr ? stderr : stdout);
1177 #endif /* UNICODE */
1178 return nChar;
1179 #else
1180 return -1; /* No-op on unix */
1181 #endif
1182 }
1183
M src/file.c
+25
--- src/file.c
+++ src/file.c
@@ -1125,11 +1125,16 @@
11251125
 */
11261126
 int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
11271127
 #ifdef _WIN32
11281128
 int nChar;
11291129
 wchar_t *zUnicode; /* Unicode version of zUtf8 */
1130
+#ifdef UNICODE
11301131
 DWORD dummy;
1132
+#else
1133
+ char *zConsole; /* Console version of zUtf8 */
1134
+ int codepage; /* Console code page */
1135
+#endif
11311136
11321137
 static int istty[2] = { -1, -1 };
11331138
 if( istty[toStdErr] == -1 ){
11341139
 istty[toStdErr] = _isatty(toStdErr + 1) != 0;
11351140
 }
@@ -1147,11 +1152,31 @@
11471152
 if( nChar==0 ){
11481153
 free(zUnicode);
11491154
 return 0;
11501155
 }
11511156
 zUnicode[nChar] = '\0';
1157
+#ifdef UNICODE
11521158
 WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
1159
+#else /* !UNICODE */
1160
+ codepage = GetConsoleCP();
1161
+ nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, 0, 0, 0, 0);
1162
+ zConsole = malloc( nByte + 1);
1163
+ if( zConsole==0 ){
1164
+ free(zUnicode);
1165
+ return 0;
1166
+ }
1167
+ nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, zConsole, nByte, 0, 0);
1168
+ zConsole[nByte] = '\0';
1169
+ free(zUnicode);
1170
+ if( nByte == 0 ){
1171
+ free(zConsole);
1172
+ zConsole = 0;
1173
+ return 0;
1174
+ }
1175
+ fwrite(zConsole, 1, nByte, toStdErr ? stderr : stdout);
1176
+ fflush(toStdErr ? stderr : stdout);
1177
+#endif /* UNICODE */
11531178
 return nChar;
11541179
 #else
11551180
 return -1; /* No-op on unix */
11561181
 #endif
11571182
 }
11581183
--- src/file.c
+++ src/file.c
@@ -1125,11 +1125,16 @@
1125 */
1126 int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
1127 #ifdef _WIN32
1128 int nChar;
1129 wchar_t *zUnicode; /* Unicode version of zUtf8 */
 
1130 DWORD dummy;
 
 
 
 
1131
1132 static int istty[2] = { -1, -1 };
1133 if( istty[toStdErr] == -1 ){
1134 istty[toStdErr] = _isatty(toStdErr + 1) != 0;
1135 }
@@ -1147,11 +1152,31 @@
1147 if( nChar==0 ){
1148 free(zUnicode);
1149 return 0;
1150 }
1151 zUnicode[nChar] = '\0';
 
1152 WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1153 return nChar;
1154 #else
1155 return -1; /* No-op on unix */
1156 #endif
1157 }
1158
--- src/file.c
+++ src/file.c
@@ -1125,11 +1125,16 @@
1125 */
1126 int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
1127 #ifdef _WIN32
1128 int nChar;
1129 wchar_t *zUnicode; /* Unicode version of zUtf8 */
1130 #ifdef UNICODE
1131 DWORD dummy;
1132 #else
1133 char *zConsole; /* Console version of zUtf8 */
1134 int codepage; /* Console code page */
1135 #endif
1136
1137 static int istty[2] = { -1, -1 };
1138 if( istty[toStdErr] == -1 ){
1139 istty[toStdErr] = _isatty(toStdErr + 1) != 0;
1140 }
@@ -1147,11 +1152,31 @@
1152 if( nChar==0 ){
1153 free(zUnicode);
1154 return 0;
1155 }
1156 zUnicode[nChar] = '\0';
1157 #ifdef UNICODE
1158 WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
1159 #else /* !UNICODE */
1160 codepage = GetConsoleCP();
1161 nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, 0, 0, 0, 0);
1162 zConsole = malloc( nByte + 1);
1163 if( zConsole==0 ){
1164 free(zUnicode);
1165 return 0;
1166 }
1167 nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, zConsole, nByte, 0, 0);
1168 zConsole[nByte] = '\0';
1169 free(zUnicode);
1170 if( nByte == 0 ){
1171 free(zConsole);
1172 zConsole = 0;
1173 return 0;
1174 }
1175 fwrite(zConsole, 1, nByte, toStdErr ? stderr : stdout);
1176 fflush(toStdErr ? stderr : stdout);
1177 #endif /* UNICODE */
1178 return nChar;
1179 #else
1180 return -1; /* No-op on unix */
1181 #endif
1182 }
1183
M src/finfo.c
+4 -3
--- src/finfo.c
+++ src/finfo.c
@@ -218,10 +218,11 @@
218218
 ** a=DATE Only show changes after DATE
219219
 ** b=DATE Only show changes before DATE
220220
 ** n=NUM Show the first NUM changes only
221221
 ** brbg Background color by branch name
222222
 ** ubg Background color by user name
223
+** fco=BOOL Show only first occurrence of each version if true (default)
223224
 */
224225
 void finfo_page(void){
225226
 Stmt q;
226227
 const char *zFilename;
227228
 char zPrevDate[20];
@@ -232,20 +233,20 @@
232233
 Blob sql;
233234
 HQuery url;
234235
 GraphContext *pGraph;
235236
 int brBg = P("brbg")!=0;
236237
 int uBg = P("ubg")!=0;
237
- int firstChngOnly = P("fco")!=0;
238
+ int firstChngOnly = atoi(PD("fco","1"))!=0;
238239
239240
 login_check_credentials();
240241
 if( !g.perm.Read ){ login_needed(); return; }
241242
 style_header("File History");
242243
 login_anonymous_available();
243244
 url_initialize(&url, "finfo");
244245
 if( brBg ) url_add_parameter(&url, "brbg", 0);
245246
 if( uBg ) url_add_parameter(&url, "ubg", 0);
246
- if( firstChngOnly ) url_add_parameter(&url, "fco", 0);
247
+ if( firstChngOnly ) url_add_parameter(&url, "fco", "0");
247248
248249
 zPrevDate[0] = 0;
249250
 zFilename = PD("name","");
250251
 url_add_parameter(&url, "name", zFilename);
251252
 blob_zero(&sql);
@@ -289,11 +290,11 @@
289290
 blob_appendf(&sql, " LIMIT %d", n);
290291
 url_add_parameter(&url, "n", P("n"));
291292
 }
292293
 if( firstChngOnly ){
293294
 style_submenu_element("Full", "Show all changes",
294
- url_render(&url, "fco", 0, 0, 0));
295
+ url_render(&url, "fco", "0", 0, 0));
295296
 }else{
296297
 style_submenu_element("Simplified", "Show only first use of a change",
297298
 url_render(&url, "fco", "1", 0, 0));
298299
 }
299300
 db_prepare(&q, blob_str(&sql));
300301
--- src/finfo.c
+++ src/finfo.c
@@ -218,10 +218,11 @@
218 ** a=DATE Only show changes after DATE
219 ** b=DATE Only show changes before DATE
220 ** n=NUM Show the first NUM changes only
221 ** brbg Background color by branch name
222 ** ubg Background color by user name
 
223 */
224 void finfo_page(void){
225 Stmt q;
226 const char *zFilename;
227 char zPrevDate[20];
@@ -232,20 +233,20 @@
232 Blob sql;
233 HQuery url;
234 GraphContext *pGraph;
235 int brBg = P("brbg")!=0;
236 int uBg = P("ubg")!=0;
237 int firstChngOnly = P("fco")!=0;
238
239 login_check_credentials();
240 if( !g.perm.Read ){ login_needed(); return; }
241 style_header("File History");
242 login_anonymous_available();
243 url_initialize(&url, "finfo");
244 if( brBg ) url_add_parameter(&url, "brbg", 0);
245 if( uBg ) url_add_parameter(&url, "ubg", 0);
246 if( firstChngOnly ) url_add_parameter(&url, "fco", 0);
247
248 zPrevDate[0] = 0;
249 zFilename = PD("name","");
250 url_add_parameter(&url, "name", zFilename);
251 blob_zero(&sql);
@@ -289,11 +290,11 @@
289 blob_appendf(&sql, " LIMIT %d", n);
290 url_add_parameter(&url, "n", P("n"));
291 }
292 if( firstChngOnly ){
293 style_submenu_element("Full", "Show all changes",
294 url_render(&url, "fco", 0, 0, 0));
295 }else{
296 style_submenu_element("Simplified", "Show only first use of a change",
297 url_render(&url, "fco", "1", 0, 0));
298 }
299 db_prepare(&q, blob_str(&sql));
300
--- src/finfo.c
+++ src/finfo.c
@@ -218,10 +218,11 @@
218 ** a=DATE Only show changes after DATE
219 ** b=DATE Only show changes before DATE
220 ** n=NUM Show the first NUM changes only
221 ** brbg Background color by branch name
222 ** ubg Background color by user name
223 ** fco=BOOL Show only first occurrence of each version if true (default)
224 */
225 void finfo_page(void){
226 Stmt q;
227 const char *zFilename;
228 char zPrevDate[20];
@@ -232,20 +233,20 @@
233 Blob sql;
234 HQuery url;
235 GraphContext *pGraph;
236 int brBg = P("brbg")!=0;
237 int uBg = P("ubg")!=0;
238 int firstChngOnly = atoi(PD("fco","1"))!=0;
239
240 login_check_credentials();
241 if( !g.perm.Read ){ login_needed(); return; }
242 style_header("File History");
243 login_anonymous_available();
244 url_initialize(&url, "finfo");
245 if( brBg ) url_add_parameter(&url, "brbg", 0);
246 if( uBg ) url_add_parameter(&url, "ubg", 0);
247 if( firstChngOnly ) url_add_parameter(&url, "fco", "0");
248
249 zPrevDate[0] = 0;
250 zFilename = PD("name","");
251 url_add_parameter(&url, "name", zFilename);
252 blob_zero(&sql);
@@ -289,11 +290,11 @@
290 blob_appendf(&sql, " LIMIT %d", n);
291 url_add_parameter(&url, "n", P("n"));
292 }
293 if( firstChngOnly ){
294 style_submenu_element("Full", "Show all changes",
295 url_render(&url, "fco", "0", 0, 0));
296 }else{
297 style_submenu_element("Simplified", "Show only first use of a change",
298 url_render(&url, "fco", "1", 0, 0));
299 }
300 db_prepare(&q, blob_str(&sql));
301
M src/info.c
-13
--- src/info.c
+++ src/info.c
@@ -479,23 +479,19 @@
479479
 char *zEUser, *zEComment;
480480
 const char *zUser;
481481
 const char *zComment;
482482
 const char *zDate;
483483
 const char *zOrigDate;
484
- const char *zBranch;
485484
 style_header(zTitle);
486485
 login_anonymous_available();
487486
 free(zTitle);
488487
 zEUser = db_text(0,
489488
 "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
490489
 TAG_USER, rid);
491490
 zEComment = db_text(0,
492491
 "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
493492
 TAG_COMMENT, rid);
494
- zBranch = db_text("trunk",
495
- "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
496
- TAG_BRANCH, rid);
497493
 zUser = db_column_text(&q, 2);
498494
 zComment = db_column_text(&q, 3);
499495
 zDate = db_column_text(&q,1);
500496
 zOrigDate = db_column_text(&q, 4);
501497
 @ <div class="section">Overview</div>
@@ -573,19 +569,10 @@
573569
 @ %z(href("%s",zUrl))Tarball</a>
574570
 @ | %z(href("%R/zip/%s-%S.zip?uuid=%s",zProjName,zUuid,zUuid))
575571
 @ ZIP archive</a>
576572
 fossil_free(zUrl);
577573
 }
578
-#if 0
579
- if( isLeaf && fossil_strcmp(zBranch,"trunk")!=0 ){
580
- @ </td></tr>
581
- @ <tr><th>Diffs:</th><td>
582
- @ %z(href("%R/vdiff?branch=%t",zBranch))Changes in %h(zBranch)</a>
583
- @ | %z(href("%R/vdiff?from=trunk&to=%t",zBranch))Changes
584
- @ from trunk</a>
585
- }
586
-#endif
587574
 @ </td></tr>
588575
 @ <tr><th>Other&nbsp;Links:</th>
589576
 @ <td>
590577
 @ %z(href("%R/dir?ci=%S",zUuid))files</a>
591578
 @ | %z(href("%R/artifact/%S",zUuid))manifest</a>
592579
--- src/info.c
+++ src/info.c
@@ -479,23 +479,19 @@
479 char *zEUser, *zEComment;
480 const char *zUser;
481 const char *zComment;
482 const char *zDate;
483 const char *zOrigDate;
484 const char *zBranch;
485 style_header(zTitle);
486 login_anonymous_available();
487 free(zTitle);
488 zEUser = db_text(0,
489 "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
490 TAG_USER, rid);
491 zEComment = db_text(0,
492 "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
493 TAG_COMMENT, rid);
494 zBranch = db_text("trunk",
495 "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
496 TAG_BRANCH, rid);
497 zUser = db_column_text(&q, 2);
498 zComment = db_column_text(&q, 3);
499 zDate = db_column_text(&q,1);
500 zOrigDate = db_column_text(&q, 4);
501 @ <div class="section">Overview</div>
@@ -573,19 +569,10 @@
573 @ %z(href("%s",zUrl))Tarball</a>
574 @ | %z(href("%R/zip/%s-%S.zip?uuid=%s",zProjName,zUuid,zUuid))
575 @ ZIP archive</a>
576 fossil_free(zUrl);
577 }
578 #if 0
579 if( isLeaf && fossil_strcmp(zBranch,"trunk")!=0 ){
580 @ </td></tr>
581 @ <tr><th>Diffs:</th><td>
582 @ %z(href("%R/vdiff?branch=%t",zBranch))Changes in %h(zBranch)</a>
583 @ | %z(href("%R/vdiff?from=trunk&to=%t",zBranch))Changes
584 @ from trunk</a>
585 }
586 #endif
587 @ </td></tr>
588 @ <tr><th>Other&nbsp;Links:</th>
589 @ <td>
590 @ %z(href("%R/dir?ci=%S",zUuid))files</a>
591 @ | %z(href("%R/artifact/%S",zUuid))manifest</a>
592
--- src/info.c
+++ src/info.c
@@ -479,23 +479,19 @@
479 char *zEUser, *zEComment;
480 const char *zUser;
481 const char *zComment;
482 const char *zDate;
483 const char *zOrigDate;
 
484 style_header(zTitle);
485 login_anonymous_available();
486 free(zTitle);
487 zEUser = db_text(0,
488 "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
489 TAG_USER, rid);
490 zEComment = db_text(0,
491 "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
492 TAG_COMMENT, rid);
 
 
 
493 zUser = db_column_text(&q, 2);
494 zComment = db_column_text(&q, 3);
495 zDate = db_column_text(&q,1);
496 zOrigDate = db_column_text(&q, 4);
497 @ <div class="section">Overview</div>
@@ -573,19 +569,10 @@
569 @ %z(href("%s",zUrl))Tarball</a>
570 @ | %z(href("%R/zip/%s-%S.zip?uuid=%s",zProjName,zUuid,zUuid))
571 @ ZIP archive</a>
572 fossil_free(zUrl);
573 }
 
 
 
 
 
 
 
 
 
574 @ </td></tr>
575 @ <tr><th>Other&nbsp;Links:</th>
576 @ <td>
577 @ %z(href("%R/dir?ci=%S",zUuid))files</a>
578 @ | %z(href("%R/artifact/%S",zUuid))manifest</a>
579
M src/main.c
+2
--- src/main.c
+++ src/main.c
@@ -488,10 +488,12 @@
488488
 if( g.fSqlTrace ) g.fSqlStats = 1;
489489
 g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
490490
 g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
491491
 g.zLogin = find_option("user", "U", 1);
492492
 g.zSSLIdentity = find_option("ssl-identity", 0, 1);
493
+ if( find_option("utc",0,0) ) g.fTimeFormat = 1;
494
+ if( find_option("localtime",0,0) ) g.fTimeFormat = 2;
493495
 if( zChdir && chdir(zChdir) ){
494496
 fossil_fatal("unable to change directories to %s", zChdir);
495497
 }
496498
 if( find_option("help",0,0)!=0 ){
497499
 /* --help anywhere on the command line is translated into
498500
--- src/main.c
+++ src/main.c
@@ -488,10 +488,12 @@
488 if( g.fSqlTrace ) g.fSqlStats = 1;
489 g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
490 g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
491 g.zLogin = find_option("user", "U", 1);
492 g.zSSLIdentity = find_option("ssl-identity", 0, 1);
 
 
493 if( zChdir && chdir(zChdir) ){
494 fossil_fatal("unable to change directories to %s", zChdir);
495 }
496 if( find_option("help",0,0)!=0 ){
497 /* --help anywhere on the command line is translated into
498
--- src/main.c
+++ src/main.c
@@ -488,10 +488,12 @@
488 if( g.fSqlTrace ) g.fSqlStats = 1;
489 g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
490 g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
491 g.zLogin = find_option("user", "U", 1);
492 g.zSSLIdentity = find_option("ssl-identity", 0, 1);
493 if( find_option("utc",0,0) ) g.fTimeFormat = 1;
494 if( find_option("localtime",0,0) ) g.fTimeFormat = 2;
495 if( zChdir && chdir(zChdir) ){
496 fossil_fatal("unable to change directories to %s", zChdir);
497 }
498 if( find_option("help",0,0)!=0 ){
499 /* --help anywhere on the command line is translated into
500
M src/main.c
+2
--- src/main.c
+++ src/main.c
@@ -488,10 +488,12 @@
488488
 if( g.fSqlTrace ) g.fSqlStats = 1;
489489
 g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
490490
 g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
491491
 g.zLogin = find_option("user", "U", 1);
492492
 g.zSSLIdentity = find_option("ssl-identity", 0, 1);
493
+ if( find_option("utc",0,0) ) g.fTimeFormat = 1;
494
+ if( find_option("localtime",0,0) ) g.fTimeFormat = 2;
493495
 if( zChdir && chdir(zChdir) ){
494496
 fossil_fatal("unable to change directories to %s", zChdir);
495497
 }
496498
 if( find_option("help",0,0)!=0 ){
497499
 /* --help anywhere on the command line is translated into
498500
--- src/main.c
+++ src/main.c
@@ -488,10 +488,12 @@
488 if( g.fSqlTrace ) g.fSqlStats = 1;
489 g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
490 g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
491 g.zLogin = find_option("user", "U", 1);
492 g.zSSLIdentity = find_option("ssl-identity", 0, 1);
 
 
493 if( zChdir && chdir(zChdir) ){
494 fossil_fatal("unable to change directories to %s", zChdir);
495 }
496 if( find_option("help",0,0)!=0 ){
497 /* --help anywhere on the command line is translated into
498
--- src/main.c
+++ src/main.c
@@ -488,10 +488,12 @@
488 if( g.fSqlTrace ) g.fSqlStats = 1;
489 g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
490 g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
491 g.zLogin = find_option("user", "U", 1);
492 g.zSSLIdentity = find_option("ssl-identity", 0, 1);
493 if( find_option("utc",0,0) ) g.fTimeFormat = 1;
494 if( find_option("localtime",0,0) ) g.fTimeFormat = 2;
495 if( zChdir && chdir(zChdir) ){
496 fossil_fatal("unable to change directories to %s", zChdir);
497 }
498 if( find_option("help",0,0)!=0 ){
499 /* --help anywhere on the command line is translated into
500
M src/makemake.tcl
+6 -5
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -334,14 +334,13 @@
334334
 #
335335
336336
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337337
 # By default, this is an empty string (i.e. use the native compiler).
338338
 #
339
-PREFIX =
340339
 # PREFIX = mingw32-
341340
 # PREFIX = i686-pc-mingw32-
342
-# PREFIX = i686-w64-mingw32-
341
+PREFIX = i686-w64-mingw32-
343342
 # PREFIX = x86_64-w64-mingw32-
344343
345344
 #### The toplevel directory of the source tree. Fossil can be built
346345
 # in a directory that is separate from the source tree. Just change
347346
 # the following to point from the build directory to the src/ folder.
@@ -425,11 +424,11 @@
425424
 # will run on the target platform. This is usually the same
426425
 # as BCC, unless you are cross-compiling. This C compiler builds
427426
 # the finished binary for fossil. The BCC compiler above is used
428427
 # for building intermediate code-generator tools.
429428
 #
430
-TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
429
+TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
431430
432431
 #### Compile resources for use in building executables that will run
433432
 # on the target platform.
434433
 #
435434
 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -496,15 +495,17 @@
496495
 ifdef FOSSIL_ENABLE_TCL
497496
 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
498497
 else
499498
 LIB += -lkernel32 -lws2_32
500499
 endif
500
+
501
+LIB += -municode
501502
502503
 #### Tcl shell for use in running the fossil test suite. This is only
503504
 # used for testing.
504505
 #
505
-TCLSH = tclsh
506
+TCLSH = tclsh86
506507
507508
 #### Nullsoft installer MakeNSIS location
508509
 #
509510
 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
510511
@@ -894,11 +895,11 @@
894895
 ZLIBDIR = $(MSCDIR)\extra\lib
895896
 ZLIB = zlib.lib
896897
897898
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
898899
899
-CFLAGS = -nologo -MT -O2
900
+CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
900901
 BCC = $(CC) $(CFLAGS)
901902
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
902903
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
903904
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
904905
 }
905906
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -334,14 +334,13 @@
334 #
335
336 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337 # By default, this is an empty string (i.e. use the native compiler).
338 #
339 PREFIX =
340 # PREFIX = mingw32-
341 # PREFIX = i686-pc-mingw32-
342 # PREFIX = i686-w64-mingw32-
343 # PREFIX = x86_64-w64-mingw32-
344
345 #### The toplevel directory of the source tree. Fossil can be built
346 # in a directory that is separate from the source tree. Just change
347 # the following to point from the build directory to the src/ folder.
@@ -425,11 +424,11 @@
425 # will run on the target platform. This is usually the same
426 # as BCC, unless you are cross-compiling. This C compiler builds
427 # the finished binary for fossil. The BCC compiler above is used
428 # for building intermediate code-generator tools.
429 #
430 TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
431
432 #### Compile resources for use in building executables that will run
433 # on the target platform.
434 #
435 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -496,15 +495,17 @@
496 ifdef FOSSIL_ENABLE_TCL
497 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
498 else
499 LIB += -lkernel32 -lws2_32
500 endif
 
 
501
502 #### Tcl shell for use in running the fossil test suite. This is only
503 # used for testing.
504 #
505 TCLSH = tclsh
506
507 #### Nullsoft installer MakeNSIS location
508 #
509 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
510
@@ -894,11 +895,11 @@
894 ZLIBDIR = $(MSCDIR)\extra\lib
895 ZLIB = zlib.lib
896
897 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
898
899 CFLAGS = -nologo -MT -O2
900 BCC = $(CC) $(CFLAGS)
901 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
902 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
903 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
904 }
905
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -334,14 +334,13 @@
334 #
335
336 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337 # By default, this is an empty string (i.e. use the native compiler).
338 #
 
339 # PREFIX = mingw32-
340 # PREFIX = i686-pc-mingw32-
341 PREFIX = i686-w64-mingw32-
342 # PREFIX = x86_64-w64-mingw32-
343
344 #### The toplevel directory of the source tree. Fossil can be built
345 # in a directory that is separate from the source tree. Just change
346 # the following to point from the build directory to the src/ folder.
@@ -425,11 +424,11 @@
424 # will run on the target platform. This is usually the same
425 # as BCC, unless you are cross-compiling. This C compiler builds
426 # the finished binary for fossil. The BCC compiler above is used
427 # for building intermediate code-generator tools.
428 #
429 TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
430
431 #### Compile resources for use in building executables that will run
432 # on the target platform.
433 #
434 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -496,15 +495,17 @@
495 ifdef FOSSIL_ENABLE_TCL
496 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
497 else
498 LIB += -lkernel32 -lws2_32
499 endif
500
501 LIB += -municode
502
503 #### Tcl shell for use in running the fossil test suite. This is only
504 # used for testing.
505 #
506 TCLSH = tclsh86
507
508 #### Nullsoft installer MakeNSIS location
509 #
510 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
511
@@ -894,11 +895,11 @@
895 ZLIBDIR = $(MSCDIR)\extra\lib
896 ZLIB = zlib.lib
897
898 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
899
900 CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
901 BCC = $(CC) $(CFLAGS)
902 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
903 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
904 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
905 }
906
M src/makemake.tcl
+6 -5
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -334,14 +334,13 @@
334334
 #
335335
336336
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337337
 # By default, this is an empty string (i.e. use the native compiler).
338338
 #
339
-PREFIX =
340339
 # PREFIX = mingw32-
341340
 # PREFIX = i686-pc-mingw32-
342
-# PREFIX = i686-w64-mingw32-
341
+PREFIX = i686-w64-mingw32-
343342
 # PREFIX = x86_64-w64-mingw32-
344343
345344
 #### The toplevel directory of the source tree. Fossil can be built
346345
 # in a directory that is separate from the source tree. Just change
347346
 # the following to point from the build directory to the src/ folder.
@@ -425,11 +424,11 @@
425424
 # will run on the target platform. This is usually the same
426425
 # as BCC, unless you are cross-compiling. This C compiler builds
427426
 # the finished binary for fossil. The BCC compiler above is used
428427
 # for building intermediate code-generator tools.
429428
 #
430
-TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
429
+TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
431430
432431
 #### Compile resources for use in building executables that will run
433432
 # on the target platform.
434433
 #
435434
 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -496,15 +495,17 @@
496495
 ifdef FOSSIL_ENABLE_TCL
497496
 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
498497
 else
499498
 LIB += -lkernel32 -lws2_32
500499
 endif
500
+
501
+LIB += -municode
501502
502503
 #### Tcl shell for use in running the fossil test suite. This is only
503504
 # used for testing.
504505
 #
505
-TCLSH = tclsh
506
+TCLSH = tclsh86
506507
507508
 #### Nullsoft installer MakeNSIS location
508509
 #
509510
 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
510511
@@ -894,11 +895,11 @@
894895
 ZLIBDIR = $(MSCDIR)\extra\lib
895896
 ZLIB = zlib.lib
896897
897898
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
898899
899
-CFLAGS = -nologo -MT -O2
900
+CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
900901
 BCC = $(CC) $(CFLAGS)
901902
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
902903
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
903904
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
904905
 }
905906
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -334,14 +334,13 @@
334 #
335
336 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337 # By default, this is an empty string (i.e. use the native compiler).
338 #
339 PREFIX =
340 # PREFIX = mingw32-
341 # PREFIX = i686-pc-mingw32-
342 # PREFIX = i686-w64-mingw32-
343 # PREFIX = x86_64-w64-mingw32-
344
345 #### The toplevel directory of the source tree. Fossil can be built
346 # in a directory that is separate from the source tree. Just change
347 # the following to point from the build directory to the src/ folder.
@@ -425,11 +424,11 @@
425 # will run on the target platform. This is usually the same
426 # as BCC, unless you are cross-compiling. This C compiler builds
427 # the finished binary for fossil. The BCC compiler above is used
428 # for building intermediate code-generator tools.
429 #
430 TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
431
432 #### Compile resources for use in building executables that will run
433 # on the target platform.
434 #
435 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -496,15 +495,17 @@
496 ifdef FOSSIL_ENABLE_TCL
497 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
498 else
499 LIB += -lkernel32 -lws2_32
500 endif
 
 
501
502 #### Tcl shell for use in running the fossil test suite. This is only
503 # used for testing.
504 #
505 TCLSH = tclsh
506
507 #### Nullsoft installer MakeNSIS location
508 #
509 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
510
@@ -894,11 +895,11 @@
894 ZLIBDIR = $(MSCDIR)\extra\lib
895 ZLIB = zlib.lib
896
897 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
898
899 CFLAGS = -nologo -MT -O2
900 BCC = $(CC) $(CFLAGS)
901 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
902 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
903 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
904 }
905
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -334,14 +334,13 @@
334 #
335
336 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337 # By default, this is an empty string (i.e. use the native compiler).
338 #
 
339 # PREFIX = mingw32-
340 # PREFIX = i686-pc-mingw32-
341 PREFIX = i686-w64-mingw32-
342 # PREFIX = x86_64-w64-mingw32-
343
344 #### The toplevel directory of the source tree. Fossil can be built
345 # in a directory that is separate from the source tree. Just change
346 # the following to point from the build directory to the src/ folder.
@@ -425,11 +424,11 @@
424 # will run on the target platform. This is usually the same
425 # as BCC, unless you are cross-compiling. This C compiler builds
426 # the finished binary for fossil. The BCC compiler above is used
427 # for building intermediate code-generator tools.
428 #
429 TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
430
431 #### Compile resources for use in building executables that will run
432 # on the target platform.
433 #
434 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -496,15 +495,17 @@
495 ifdef FOSSIL_ENABLE_TCL
496 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
497 else
498 LIB += -lkernel32 -lws2_32
499 endif
500
501 LIB += -municode
502
503 #### Tcl shell for use in running the fossil test suite. This is only
504 # used for testing.
505 #
506 TCLSH = tclsh86
507
508 #### Nullsoft installer MakeNSIS location
509 #
510 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
511
@@ -894,11 +895,11 @@
895 ZLIBDIR = $(MSCDIR)\extra\lib
896 ZLIB = zlib.lib
897
898 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
899
900 CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
901 BCC = $(CC) $(CFLAGS)
902 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
903 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
904 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
905 }
906
M src/name.c
+3 -3
--- src/name.c
+++ src/name.c
@@ -29,11 +29,11 @@
2929
 ** Return TRUE if the string begins with something that looks roughly
3030
 ** like an ISO date/time string. The SQLite date/time functions will
3131
 ** have the final say-so about whether or not the date/time string is
3232
 ** well-formed.
3333
 */
34
-static int is_date(const char *z){
34
+int fossil_isdate(const char *z){
3535
 if( !fossil_isdigit(z[0]) ) return 0;
3636
 if( !fossil_isdigit(z[1]) ) return 0;
3737
 if( !fossil_isdigit(z[2]) ) return 0;
3838
 if( !fossil_isdigit(z[3]) ) return 0;
3939
 if( z[4]!='-') return 0;
@@ -112,11 +112,11 @@
112112
 " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'"
113113
 " ORDER BY mtime DESC LIMIT 1",
114114
 &zTag[5], zType);
115115
 return rid;
116116
 }
117
- if( is_date(zTag) ){
117
+ if( fossil_isdate(zTag) ){
118118
 rid = db_int(0,
119119
 "SELECT objid FROM event"
120120
 " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'"
121121
 " ORDER BY mtime DESC LIMIT 1",
122122
 zTag, zType);
@@ -181,11 +181,11 @@
181181
 }
182182
183183
 /* symbolic-name ":" date-time */
184184
 nTag = strlen(zTag);
185185
 for(i=0; i<nTag-10 && zTag[i]!=':'; i++){}
186
- if( zTag[i]==':' && is_date(&zTag[i+1]) ){
186
+ if( zTag[i]==':' && fossil_isdate(&zTag[i+1]) ){
187187
 char *zDate = mprintf("%s", &zTag[i+1]);
188188
 char *zTagBase = mprintf("%.*s", i, zTag);
189189
 int nDate = strlen(zDate);
190190
 if( sqlite3_strnicmp(&zDate[nDate-3],"utc",3)==0 ){
191191
 zDate[nDate-3] = 'z';
192192
--- src/name.c
+++ src/name.c
@@ -29,11 +29,11 @@
29 ** Return TRUE if the string begins with something that looks roughly
30 ** like an ISO date/time string. The SQLite date/time functions will
31 ** have the final say-so about whether or not the date/time string is
32 ** well-formed.
33 */
34 static int is_date(const char *z){
35 if( !fossil_isdigit(z[0]) ) return 0;
36 if( !fossil_isdigit(z[1]) ) return 0;
37 if( !fossil_isdigit(z[2]) ) return 0;
38 if( !fossil_isdigit(z[3]) ) return 0;
39 if( z[4]!='-') return 0;
@@ -112,11 +112,11 @@
112 " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'"
113 " ORDER BY mtime DESC LIMIT 1",
114 &zTag[5], zType);
115 return rid;
116 }
117 if( is_date(zTag) ){
118 rid = db_int(0,
119 "SELECT objid FROM event"
120 " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'"
121 " ORDER BY mtime DESC LIMIT 1",
122 zTag, zType);
@@ -181,11 +181,11 @@
181 }
182
183 /* symbolic-name ":" date-time */
184 nTag = strlen(zTag);
185 for(i=0; i<nTag-10 && zTag[i]!=':'; i++){}
186 if( zTag[i]==':' && is_date(&zTag[i+1]) ){
187 char *zDate = mprintf("%s", &zTag[i+1]);
188 char *zTagBase = mprintf("%.*s", i, zTag);
189 int nDate = strlen(zDate);
190 if( sqlite3_strnicmp(&zDate[nDate-3],"utc",3)==0 ){
191 zDate[nDate-3] = 'z';
192
--- src/name.c
+++ src/name.c
@@ -29,11 +29,11 @@
29 ** Return TRUE if the string begins with something that looks roughly
30 ** like an ISO date/time string. The SQLite date/time functions will
31 ** have the final say-so about whether or not the date/time string is
32 ** well-formed.
33 */
34 int fossil_isdate(const char *z){
35 if( !fossil_isdigit(z[0]) ) return 0;
36 if( !fossil_isdigit(z[1]) ) return 0;
37 if( !fossil_isdigit(z[2]) ) return 0;
38 if( !fossil_isdigit(z[3]) ) return 0;
39 if( z[4]!='-') return 0;
@@ -112,11 +112,11 @@
112 " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'"
113 " ORDER BY mtime DESC LIMIT 1",
114 &zTag[5], zType);
115 return rid;
116 }
117 if( fossil_isdate(zTag) ){
118 rid = db_int(0,
119 "SELECT objid FROM event"
120 " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'"
121 " ORDER BY mtime DESC LIMIT 1",
122 zTag, zType);
@@ -181,11 +181,11 @@
181 }
182
183 /* symbolic-name ":" date-time */
184 nTag = strlen(zTag);
185 for(i=0; i<nTag-10 && zTag[i]!=':'; i++){}
186 if( zTag[i]==':' && fossil_isdate(&zTag[i+1]) ){
187 char *zDate = mprintf("%s", &zTag[i+1]);
188 char *zTagBase = mprintf("%.*s", i, zTag);
189 int nDate = strlen(zDate);
190 if( sqlite3_strnicmp(&zDate[nDate-3],"utc",3)==0 ){
191 zDate[nDate-3] = 'z';
192
M src/setup.c
+18 -1
--- src/setup.c
+++ src/setup.c
@@ -1129,10 +1129,12 @@
11291129
11301130
 /*
11311131
 ** WEBPAGE: setup_timeline
11321132
 */
11331133
 void setup_timeline(void){
1134
+ double tmDiff;
1135
+ char zTmDiff[20];
11341136
 login_check_credentials();
11351137
 if( !g.perm.Setup ){
11361138
 login_needed();
11371139
 }
11381140
@@ -1149,11 +1151,26 @@
11491151
11501152
 @ <hr />
11511153
 onoff_attribute("Use Universal Coordinated Time (UTC)",
11521154
 "timeline-utc", "utc", 1);
11531155
 @ <p>Show times as UTC (also sometimes called Greenwich Mean Time (GMT) or
1154
- @ Zulu) instead of in local time.</p>
1156
+ @ Zulu) instead of in local time. On this server, local time is currently
1157
+ g.fTimeFormat = 2;
1158
+ tmDiff = db_double(0.0, "SELECT julianday('now')");
1159
+ tmDiff = db_double(0.0,
1160
+ "SELECT (julianday(%.17g,'localtime')-julianday(%.17g))*24.0",
1161
+ tmDiff, tmDiff);
1162
+ sqlite3_snprintf(sizeof(zTmDiff), zTmDiff, "%.1f", tmDiff);
1163
+ if( strcmp(zTmDiff, "0.0")==0 ){
1164
+ @ the same as UTC and so this setting will make no difference in
1165
+ @ the display.</p>
1166
+ }else if( tmDiff<0.0 ){
1167
+ sqlite3_snprintf(sizeof(zTmDiff), zTmDiff, "%.1f", -tmDiff);
1168
+ @ %s(zTmDiff) hours behind UTC.</p>
1169
+ }else{
1170
+ @ %s(zTmDiff) hours ahead of UTC.</p>
1171
+ }
11551172
11561173
 @ <hr />
11571174
 onoff_attribute("Show version differences by default",
11581175
 "show-version-diffs", "vdiff", 0);
11591176
 @ <p>On the version-information pages linked from the timeline can either
11601177
--- src/setup.c
+++ src/setup.c
@@ -1129,10 +1129,12 @@
1129
1130 /*
1131 ** WEBPAGE: setup_timeline
1132 */
1133 void setup_timeline(void){
 
 
1134 login_check_credentials();
1135 if( !g.perm.Setup ){
1136 login_needed();
1137 }
1138
@@ -1149,11 +1151,26 @@
1149
1150 @ <hr />
1151 onoff_attribute("Use Universal Coordinated Time (UTC)",
1152 "timeline-utc", "utc", 1);
1153 @ <p>Show times as UTC (also sometimes called Greenwich Mean Time (GMT) or
1154 @ Zulu) instead of in local time.</p>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1155
1156 @ <hr />
1157 onoff_attribute("Show version differences by default",
1158 "show-version-diffs", "vdiff", 0);
1159 @ <p>On the version-information pages linked from the timeline can either
1160
--- src/setup.c
+++ src/setup.c
@@ -1129,10 +1129,12 @@
1129
1130 /*
1131 ** WEBPAGE: setup_timeline
1132 */
1133 void setup_timeline(void){
1134 double tmDiff;
1135 char zTmDiff[20];
1136 login_check_credentials();
1137 if( !g.perm.Setup ){
1138 login_needed();
1139 }
1140
@@ -1149,11 +1151,26 @@
1151
1152 @ <hr />
1153 onoff_attribute("Use Universal Coordinated Time (UTC)",
1154 "timeline-utc", "utc", 1);
1155 @ <p>Show times as UTC (also sometimes called Greenwich Mean Time (GMT) or
1156 @ Zulu) instead of in local time. On this server, local time is currently
1157 g.fTimeFormat = 2;
1158 tmDiff = db_double(0.0, "SELECT julianday('now')");
1159 tmDiff = db_double(0.0,
1160 "SELECT (julianday(%.17g,'localtime')-julianday(%.17g))*24.0",
1161 tmDiff, tmDiff);
1162 sqlite3_snprintf(sizeof(zTmDiff), zTmDiff, "%.1f", tmDiff);
1163 if( strcmp(zTmDiff, "0.0")==0 ){
1164 @ the same as UTC and so this setting will make no difference in
1165 @ the display.</p>
1166 }else if( tmDiff<0.0 ){
1167 sqlite3_snprintf(sizeof(zTmDiff), zTmDiff, "%.1f", -tmDiff);
1168 @ %s(zTmDiff) hours behind UTC.</p>
1169 }else{
1170 @ %s(zTmDiff) hours ahead of UTC.</p>
1171 }
1172
1173 @ <hr />
1174 onoff_attribute("Show version differences by default",
1175 "show-version-diffs", "vdiff", 0);
1176 @ <p>On the version-information pages linked from the timeline can either
1177
M src/sqlcmd.c
+2
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -118,10 +118,12 @@
118118
 sqlcmd_content, 0, 0);
119119
 sqlite3_create_function(db, "compress", 1, SQLITE_ANY, 0,
120120
 sqlcmd_compress, 0, 0);
121121
 sqlite3_create_function(db, "decompress", 1, SQLITE_ANY, 0,
122122
 sqlcmd_decompress, 0, 0);
123
+ g.repositoryOpen = 1;
124
+ g.db = db;
123125
 return SQLITE_OK;
124126
 }
125127
126128
127129
 /*
128130
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -118,10 +118,12 @@
118 sqlcmd_content, 0, 0);
119 sqlite3_create_function(db, "compress", 1, SQLITE_ANY, 0,
120 sqlcmd_compress, 0, 0);
121 sqlite3_create_function(db, "decompress", 1, SQLITE_ANY, 0,
122 sqlcmd_decompress, 0, 0);
 
 
123 return SQLITE_OK;
124 }
125
126
127 /*
128
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -118,10 +118,12 @@
118 sqlcmd_content, 0, 0);
119 sqlite3_create_function(db, "compress", 1, SQLITE_ANY, 0,
120 sqlcmd_compress, 0, 0);
121 sqlite3_create_function(db, "decompress", 1, SQLITE_ANY, 0,
122 sqlcmd_decompress, 0, 0);
123 g.repositoryOpen = 1;
124 g.db = db;
125 return SQLITE_OK;
126 }
127
128
129 /*
130
M src/timeline.c
+5 -1
--- src/timeline.c
+++ src/timeline.c
@@ -818,10 +818,14 @@
818818
 */
819819
 double symbolic_name_to_mtime(const char *z){
820820
 double mtime;
821821
 int rid;
822822
 if( z==0 ) return -1.0;
823
+ if( fossil_isdate(z) ){
824
+ mtime = db_double(0.0, "SELECT julianday(%Q,'utc')", z);
825
+ if( mtime>0.0 ) return mtime;
826
+ }
823827
 rid = symbolic_name_to_rid(z, "ci");
824828
 if( rid==0 ) return -1.0;
825829
 mtime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", rid);
826830
 return mtime;
827831
 }
@@ -1182,11 +1186,11 @@
11821186
 blob_appendf(&sql, " ORDER BY event.mtime DESC");
11831187
 }
11841188
 blob_appendf(&sql, " LIMIT %d", nEntry);
11851189
 db_multi_exec("%s", blob_str(&sql));
11861190
1187
- n = db_int(0, "SELECT count(*) FROM timeline /*scan*/");
1191
+ n = db_int(0, "SELECT count(*) FROM timeline WHERE etype!='div' /*scan*/");
11881192
 if( zAfter==0 && zBefore==0 && zCirca==0 ){
11891193
 blob_appendf(&desc, "%d most recent %ss", n, zEType);
11901194
 }else{
11911195
 blob_appendf(&desc, "%d %ss", n, zEType);
11921196
 }
11931197
--- src/timeline.c
+++ src/timeline.c
@@ -818,10 +818,14 @@
818 */
819 double symbolic_name_to_mtime(const char *z){
820 double mtime;
821 int rid;
822 if( z==0 ) return -1.0;
 
 
 
 
823 rid = symbolic_name_to_rid(z, "ci");
824 if( rid==0 ) return -1.0;
825 mtime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", rid);
826 return mtime;
827 }
@@ -1182,11 +1186,11 @@
1182 blob_appendf(&sql, " ORDER BY event.mtime DESC");
1183 }
1184 blob_appendf(&sql, " LIMIT %d", nEntry);
1185 db_multi_exec("%s", blob_str(&sql));
1186
1187 n = db_int(0, "SELECT count(*) FROM timeline /*scan*/");
1188 if( zAfter==0 && zBefore==0 && zCirca==0 ){
1189 blob_appendf(&desc, "%d most recent %ss", n, zEType);
1190 }else{
1191 blob_appendf(&desc, "%d %ss", n, zEType);
1192 }
1193
--- src/timeline.c
+++ src/timeline.c
@@ -818,10 +818,14 @@
818 */
819 double symbolic_name_to_mtime(const char *z){
820 double mtime;
821 int rid;
822 if( z==0 ) return -1.0;
823 if( fossil_isdate(z) ){
824 mtime = db_double(0.0, "SELECT julianday(%Q,'utc')", z);
825 if( mtime>0.0 ) return mtime;
826 }
827 rid = symbolic_name_to_rid(z, "ci");
828 if( rid==0 ) return -1.0;
829 mtime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", rid);
830 return mtime;
831 }
@@ -1182,11 +1186,11 @@
1186 blob_appendf(&sql, " ORDER BY event.mtime DESC");
1187 }
1188 blob_appendf(&sql, " LIMIT %d", nEntry);
1189 db_multi_exec("%s", blob_str(&sql));
1190
1191 n = db_int(0, "SELECT count(*) FROM timeline WHERE etype!='div' /*scan*/");
1192 if( zAfter==0 && zBefore==0 && zCirca==0 ){
1193 blob_appendf(&desc, "%d most recent %ss", n, zEType);
1194 }else{
1195 blob_appendf(&desc, "%d %ss", n, zEType);
1196 }
1197
M src/timeline.c
+5 -1
--- src/timeline.c
+++ src/timeline.c
@@ -818,10 +818,14 @@
818818
 */
819819
 double symbolic_name_to_mtime(const char *z){
820820
 double mtime;
821821
 int rid;
822822
 if( z==0 ) return -1.0;
823
+ if( fossil_isdate(z) ){
824
+ mtime = db_double(0.0, "SELECT julianday(%Q,'utc')", z);
825
+ if( mtime>0.0 ) return mtime;
826
+ }
823827
 rid = symbolic_name_to_rid(z, "ci");
824828
 if( rid==0 ) return -1.0;
825829
 mtime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", rid);
826830
 return mtime;
827831
 }
@@ -1182,11 +1186,11 @@
11821186
 blob_appendf(&sql, " ORDER BY event.mtime DESC");
11831187
 }
11841188
 blob_appendf(&sql, " LIMIT %d", nEntry);
11851189
 db_multi_exec("%s", blob_str(&sql));
11861190
1187
- n = db_int(0, "SELECT count(*) FROM timeline /*scan*/");
1191
+ n = db_int(0, "SELECT count(*) FROM timeline WHERE etype!='div' /*scan*/");
11881192
 if( zAfter==0 && zBefore==0 && zCirca==0 ){
11891193
 blob_appendf(&desc, "%d most recent %ss", n, zEType);
11901194
 }else{
11911195
 blob_appendf(&desc, "%d %ss", n, zEType);
11921196
 }
11931197
--- src/timeline.c
+++ src/timeline.c
@@ -818,10 +818,14 @@
818 */
819 double symbolic_name_to_mtime(const char *z){
820 double mtime;
821 int rid;
822 if( z==0 ) return -1.0;
 
 
 
 
823 rid = symbolic_name_to_rid(z, "ci");
824 if( rid==0 ) return -1.0;
825 mtime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", rid);
826 return mtime;
827 }
@@ -1182,11 +1186,11 @@
1182 blob_appendf(&sql, " ORDER BY event.mtime DESC");
1183 }
1184 blob_appendf(&sql, " LIMIT %d", nEntry);
1185 db_multi_exec("%s", blob_str(&sql));
1186
1187 n = db_int(0, "SELECT count(*) FROM timeline /*scan*/");
1188 if( zAfter==0 && zBefore==0 && zCirca==0 ){
1189 blob_appendf(&desc, "%d most recent %ss", n, zEType);
1190 }else{
1191 blob_appendf(&desc, "%d %ss", n, zEType);
1192 }
1193
--- src/timeline.c
+++ src/timeline.c
@@ -818,10 +818,14 @@
818 */
819 double symbolic_name_to_mtime(const char *z){
820 double mtime;
821 int rid;
822 if( z==0 ) return -1.0;
823 if( fossil_isdate(z) ){
824 mtime = db_double(0.0, "SELECT julianday(%Q,'utc')", z);
825 if( mtime>0.0 ) return mtime;
826 }
827 rid = symbolic_name_to_rid(z, "ci");
828 if( rid==0 ) return -1.0;
829 mtime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", rid);
830 return mtime;
831 }
@@ -1182,11 +1186,11 @@
1186 blob_appendf(&sql, " ORDER BY event.mtime DESC");
1187 }
1188 blob_appendf(&sql, " LIMIT %d", nEntry);
1189 db_multi_exec("%s", blob_str(&sql));
1190
1191 n = db_int(0, "SELECT count(*) FROM timeline WHERE etype!='div' /*scan*/");
1192 if( zAfter==0 && zBefore==0 && zCirca==0 ){
1193 blob_appendf(&desc, "%d most recent %ss", n, zEType);
1194 }else{
1195 blob_appendf(&desc, "%d %ss", n, zEType);
1196 }
1197
M src/winhttp.c
+6 -6
--- src/winhttp.c
+++ src/winhttp.c
@@ -129,20 +129,20 @@
129129
 file_delete(zRequestFName);
130130
 file_delete(zReplyFName);
131131
 free(p);
132132
 }
133133
134
+#if !defined(UNICODE)
135
+# define fossil_unicode_to_utf8 fossil_mbcs_to_utf8
136
+# define fossil_utf8_to_unicode fossil_utf8_to_mbcs
137
+#endif
138
+
134139
 /*
135140
 ** Start a listening socket and process incoming HTTP requests on
136141
 ** that socket.
137142
 */
138143
139
-#if !defined(UNICODE)
140
-# define fossil_unicode_to_utf8 fossil_mbcs_to_utf8
141
-# define fossil_utf8_to_unicode fossil_utf8_to_mbcs
142
-#endif
143
-
144144
 void win32_http_server(
145145
 int mnPort, int mxPort, /* Range of allowed TCP port numbers */
146146
 const char *zBrowser, /* Command to launch browser. (Or NULL) */
147147
 const char *zStopper, /* Stop server when this file is exists (Or NULL) */
148148
 const char *zNotFound, /* The --notfound option, or NULL */
@@ -454,11 +454,11 @@
454454
 }
455455
 return 0;
456456
 }
457457
458458
 #ifdef _WIN32
459
-/* dupe ifdef needed for mkindex */
459
+/* dupe ifdef needed for mkindex
460460
 ** COMMAND: winsrv*
461461
 ** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
462462
 **
463463
 ** Where METHOD is one of: create delete show start stop.
464464
 **
465465
--- src/winhttp.c
+++ src/winhttp.c
@@ -129,20 +129,20 @@
129 file_delete(zRequestFName);
130 file_delete(zReplyFName);
131 free(p);
132 }
133
 
 
 
 
 
134 /*
135 ** Start a listening socket and process incoming HTTP requests on
136 ** that socket.
137 */
138
139 #if !defined(UNICODE)
140 # define fossil_unicode_to_utf8 fossil_mbcs_to_utf8
141 # define fossil_utf8_to_unicode fossil_utf8_to_mbcs
142 #endif
143
144 void win32_http_server(
145 int mnPort, int mxPort, /* Range of allowed TCP port numbers */
146 const char *zBrowser, /* Command to launch browser. (Or NULL) */
147 const char *zStopper, /* Stop server when this file is exists (Or NULL) */
148 const char *zNotFound, /* The --notfound option, or NULL */
@@ -454,11 +454,11 @@
454 }
455 return 0;
456 }
457
458 #ifdef _WIN32
459 /* dupe ifdef needed for mkindex */
460 ** COMMAND: winsrv*
461 ** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
462 **
463 ** Where METHOD is one of: create delete show start stop.
464 **
465
--- src/winhttp.c
+++ src/winhttp.c
@@ -129,20 +129,20 @@
129 file_delete(zRequestFName);
130 file_delete(zReplyFName);
131 free(p);
132 }
133
134 #if !defined(UNICODE)
135 # define fossil_unicode_to_utf8 fossil_mbcs_to_utf8
136 # define fossil_utf8_to_unicode fossil_utf8_to_mbcs
137 #endif
138
139 /*
140 ** Start a listening socket and process incoming HTTP requests on
141 ** that socket.
142 */
143
 
 
 
 
 
144 void win32_http_server(
145 int mnPort, int mxPort, /* Range of allowed TCP port numbers */
146 const char *zBrowser, /* Command to launch browser. (Or NULL) */
147 const char *zStopper, /* Stop server when this file is exists (Or NULL) */
148 const char *zNotFound, /* The --notfound option, or NULL */
@@ -454,11 +454,11 @@
454 }
455 return 0;
456 }
457
458 #ifdef _WIN32
459 /* dupe ifdef needed for mkindex
460 ** COMMAND: winsrv*
461 ** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
462 **
463 ** Where METHOD is one of: create delete show start stop.
464 **
465
M src/winhttp.c
+6 -6
--- src/winhttp.c
+++ src/winhttp.c
@@ -129,20 +129,20 @@
129129
 file_delete(zRequestFName);
130130
 file_delete(zReplyFName);
131131
 free(p);
132132
 }
133133
134
+#if !defined(UNICODE)
135
+# define fossil_unicode_to_utf8 fossil_mbcs_to_utf8
136
+# define fossil_utf8_to_unicode fossil_utf8_to_mbcs
137
+#endif
138
+
134139
 /*
135140
 ** Start a listening socket and process incoming HTTP requests on
136141
 ** that socket.
137142
 */
138143
139
-#if !defined(UNICODE)
140
-# define fossil_unicode_to_utf8 fossil_mbcs_to_utf8
141
-# define fossil_utf8_to_unicode fossil_utf8_to_mbcs
142
-#endif
143
-
144144
 void win32_http_server(
145145
 int mnPort, int mxPort, /* Range of allowed TCP port numbers */
146146
 const char *zBrowser, /* Command to launch browser. (Or NULL) */
147147
 const char *zStopper, /* Stop server when this file is exists (Or NULL) */
148148
 const char *zNotFound, /* The --notfound option, or NULL */
@@ -454,11 +454,11 @@
454454
 }
455455
 return 0;
456456
 }
457457
458458
 #ifdef _WIN32
459
-/* dupe ifdef needed for mkindex */
459
+/* dupe ifdef needed for mkindex
460460
 ** COMMAND: winsrv*
461461
 ** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
462462
 **
463463
 ** Where METHOD is one of: create delete show start stop.
464464
 **
465465
--- src/winhttp.c
+++ src/winhttp.c
@@ -129,20 +129,20 @@
129 file_delete(zRequestFName);
130 file_delete(zReplyFName);
131 free(p);
132 }
133
 
 
 
 
 
134 /*
135 ** Start a listening socket and process incoming HTTP requests on
136 ** that socket.
137 */
138
139 #if !defined(UNICODE)
140 # define fossil_unicode_to_utf8 fossil_mbcs_to_utf8
141 # define fossil_utf8_to_unicode fossil_utf8_to_mbcs
142 #endif
143
144 void win32_http_server(
145 int mnPort, int mxPort, /* Range of allowed TCP port numbers */
146 const char *zBrowser, /* Command to launch browser. (Or NULL) */
147 const char *zStopper, /* Stop server when this file is exists (Or NULL) */
148 const char *zNotFound, /* The --notfound option, or NULL */
@@ -454,11 +454,11 @@
454 }
455 return 0;
456 }
457
458 #ifdef _WIN32
459 /* dupe ifdef needed for mkindex */
460 ** COMMAND: winsrv*
461 ** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
462 **
463 ** Where METHOD is one of: create delete show start stop.
464 **
465
--- src/winhttp.c
+++ src/winhttp.c
@@ -129,20 +129,20 @@
129 file_delete(zRequestFName);
130 file_delete(zReplyFName);
131 free(p);
132 }
133
134 #if !defined(UNICODE)
135 # define fossil_unicode_to_utf8 fossil_mbcs_to_utf8
136 # define fossil_utf8_to_unicode fossil_utf8_to_mbcs
137 #endif
138
139 /*
140 ** Start a listening socket and process incoming HTTP requests on
141 ** that socket.
142 */
143
 
 
 
 
 
144 void win32_http_server(
145 int mnPort, int mxPort, /* Range of allowed TCP port numbers */
146 const char *zBrowser, /* Command to launch browser. (Or NULL) */
147 const char *zStopper, /* Stop server when this file is exists (Or NULL) */
148 const char *zNotFound, /* The --notfound option, or NULL */
@@ -454,11 +454,11 @@
454 }
455 return 0;
456 }
457
458 #ifdef _WIN32
459 /* dupe ifdef needed for mkindex
460 ** COMMAND: winsrv*
461 ** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
462 **
463 ** Where METHOD is one of: create delete show start stop.
464 **
465
M win/Makefile.mingw
+5 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,13 @@
1313
 #
1414
1515
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
18
-PREFIX =
1918
 # PREFIX = mingw32-
2019
 # PREFIX = i686-pc-mingw32-
21
-# PREFIX = i686-w64-mingw32-
20
+PREFIX = i686-w64-mingw32-
2221
 # PREFIX = x86_64-w64-mingw32-
2322
2423
 #### The toplevel directory of the source tree. Fossil can be built
2524
 # in a directory that is separate from the source tree. Just change
2625
 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
104103
 # will run on the target platform. This is usually the same
105104
 # as BCC, unless you are cross-compiling. This C compiler builds
106105
 # the finished binary for fossil. The BCC compiler above is used
107106
 # for building intermediate code-generator tools.
108107
 #
109
-TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
108
+TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
110109
111110
 #### Compile resources for use in building executables that will run
112111
 # on the target platform.
113112
 #
114113
 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
175174
 ifdef FOSSIL_ENABLE_TCL
176175
 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
177176
 else
178177
 LIB += -lkernel32 -lws2_32
179178
 endif
179
+
180
+LIB += -municode
180181
181182
 #### Tcl shell for use in running the fossil test suite. This is only
182183
 # used for testing.
183184
 #
184
-TCLSH = tclsh
185
+TCLSH = tclsh86
185186
186187
 #### Nullsoft installer MakeNSIS location
187188
 #
188189
 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
189190
190191
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,13 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 # PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
25 # in a directory that is separate from the source tree. Just change
26 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
104 # will run on the target platform. This is usually the same
105 # as BCC, unless you are cross-compiling. This C compiler builds
106 # the finished binary for fossil. The BCC compiler above is used
107 # for building intermediate code-generator tools.
108 #
109 TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
110
111 #### Compile resources for use in building executables that will run
112 # on the target platform.
113 #
114 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
175 ifdef FOSSIL_ENABLE_TCL
176 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
177 else
178 LIB += -lkernel32 -lws2_32
179 endif
 
 
180
181 #### Tcl shell for use in running the fossil test suite. This is only
182 # used for testing.
183 #
184 TCLSH = tclsh
185
186 #### Nullsoft installer MakeNSIS location
187 #
188 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
189
190
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,13 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
 
18 # PREFIX = mingw32-
19 # PREFIX = i686-pc-mingw32-
20 PREFIX = i686-w64-mingw32-
21 # PREFIX = x86_64-w64-mingw32-
22
23 #### The toplevel directory of the source tree. Fossil can be built
24 # in a directory that is separate from the source tree. Just change
25 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
103 # will run on the target platform. This is usually the same
104 # as BCC, unless you are cross-compiling. This C compiler builds
105 # the finished binary for fossil. The BCC compiler above is used
106 # for building intermediate code-generator tools.
107 #
108 TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
109
110 #### Compile resources for use in building executables that will run
111 # on the target platform.
112 #
113 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
174 ifdef FOSSIL_ENABLE_TCL
175 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
176 else
177 LIB += -lkernel32 -lws2_32
178 endif
179
180 LIB += -municode
181
182 #### Tcl shell for use in running the fossil test suite. This is only
183 # used for testing.
184 #
185 TCLSH = tclsh86
186
187 #### Nullsoft installer MakeNSIS location
188 #
189 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
190
191
M win/Makefile.mingw
+5 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,13 @@
1313
 #
1414
1515
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
18
-PREFIX =
1918
 # PREFIX = mingw32-
2019
 # PREFIX = i686-pc-mingw32-
21
-# PREFIX = i686-w64-mingw32-
20
+PREFIX = i686-w64-mingw32-
2221
 # PREFIX = x86_64-w64-mingw32-
2322
2423
 #### The toplevel directory of the source tree. Fossil can be built
2524
 # in a directory that is separate from the source tree. Just change
2625
 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
104103
 # will run on the target platform. This is usually the same
105104
 # as BCC, unless you are cross-compiling. This C compiler builds
106105
 # the finished binary for fossil. The BCC compiler above is used
107106
 # for building intermediate code-generator tools.
108107
 #
109
-TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
108
+TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
110109
111110
 #### Compile resources for use in building executables that will run
112111
 # on the target platform.
113112
 #
114113
 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
175174
 ifdef FOSSIL_ENABLE_TCL
176175
 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
177176
 else
178177
 LIB += -lkernel32 -lws2_32
179178
 endif
179
+
180
+LIB += -municode
180181
181182
 #### Tcl shell for use in running the fossil test suite. This is only
182183
 # used for testing.
183184
 #
184
-TCLSH = tclsh
185
+TCLSH = tclsh86
185186
186187
 #### Nullsoft installer MakeNSIS location
187188
 #
188189
 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
189190
190191
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,13 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 # PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
25 # in a directory that is separate from the source tree. Just change
26 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
104 # will run on the target platform. This is usually the same
105 # as BCC, unless you are cross-compiling. This C compiler builds
106 # the finished binary for fossil. The BCC compiler above is used
107 # for building intermediate code-generator tools.
108 #
109 TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
110
111 #### Compile resources for use in building executables that will run
112 # on the target platform.
113 #
114 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
175 ifdef FOSSIL_ENABLE_TCL
176 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
177 else
178 LIB += -lkernel32 -lws2_32
179 endif
 
 
180
181 #### Tcl shell for use in running the fossil test suite. This is only
182 # used for testing.
183 #
184 TCLSH = tclsh
185
186 #### Nullsoft installer MakeNSIS location
187 #
188 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
189
190
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,13 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
 
18 # PREFIX = mingw32-
19 # PREFIX = i686-pc-mingw32-
20 PREFIX = i686-w64-mingw32-
21 # PREFIX = x86_64-w64-mingw32-
22
23 #### The toplevel directory of the source tree. Fossil can be built
24 # in a directory that is separate from the source tree. Just change
25 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
103 # will run on the target platform. This is usually the same
104 # as BCC, unless you are cross-compiling. This C compiler builds
105 # the finished binary for fossil. The BCC compiler above is used
106 # for building intermediate code-generator tools.
107 #
108 TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
109
110 #### Compile resources for use in building executables that will run
111 # on the target platform.
112 #
113 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
174 ifdef FOSSIL_ENABLE_TCL
175 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
176 else
177 LIB += -lkernel32 -lws2_32
178 endif
179
180 LIB += -municode
181
182 #### Tcl shell for use in running the fossil test suite. This is only
183 # used for testing.
184 #
185 TCLSH = tclsh86
186
187 #### Nullsoft installer MakeNSIS location
188 #
189 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
190
191
M win/Makefile.mingw.mistachkin
+5 -4
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -13,14 +13,13 @@
1313
 #
1414
1515
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
18
-PREFIX =
1918
 # PREFIX = mingw32-
2019
 # PREFIX = i686-pc-mingw32-
21
-# PREFIX = i686-w64-mingw32-
20
+PREFIX = i686-w64-mingw32-
2221
 # PREFIX = x86_64-w64-mingw32-
2322
2423
 #### The toplevel directory of the source tree. Fossil can be built
2524
 # in a directory that is separate from the source tree. Just change
2625
 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
104103
 # will run on the target platform. This is usually the same
105104
 # as BCC, unless you are cross-compiling. This C compiler builds
106105
 # the finished binary for fossil. The BCC compiler above is used
107106
 # for building intermediate code-generator tools.
108107
 #
109
-TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
108
+TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
110109
111110
 #### Compile resources for use in building executables that will run
112111
 # on the target platform.
113112
 #
114113
 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
175174
 ifdef FOSSIL_ENABLE_TCL
176175
 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
177176
 else
178177
 LIB += -lkernel32 -lws2_32
179178
 endif
179
+
180
+LIB += -municode
180181
181182
 #### Tcl shell for use in running the fossil test suite. This is only
182183
 # used for testing.
183184
 #
184
-TCLSH = tclsh
185
+TCLSH = tclsh86
185186
186187
 #### Nullsoft installer MakeNSIS location
187188
 #
188189
 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
189190
190191
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -13,14 +13,13 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 # PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
25 # in a directory that is separate from the source tree. Just change
26 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
104 # will run on the target platform. This is usually the same
105 # as BCC, unless you are cross-compiling. This C compiler builds
106 # the finished binary for fossil. The BCC compiler above is used
107 # for building intermediate code-generator tools.
108 #
109 TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
110
111 #### Compile resources for use in building executables that will run
112 # on the target platform.
113 #
114 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
175 ifdef FOSSIL_ENABLE_TCL
176 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
177 else
178 LIB += -lkernel32 -lws2_32
179 endif
 
 
180
181 #### Tcl shell for use in running the fossil test suite. This is only
182 # used for testing.
183 #
184 TCLSH = tclsh
185
186 #### Nullsoft installer MakeNSIS location
187 #
188 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
189
190
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -13,14 +13,13 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
 
18 # PREFIX = mingw32-
19 # PREFIX = i686-pc-mingw32-
20 PREFIX = i686-w64-mingw32-
21 # PREFIX = x86_64-w64-mingw32-
22
23 #### The toplevel directory of the source tree. Fossil can be built
24 # in a directory that is separate from the source tree. Just change
25 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
103 # will run on the target platform. This is usually the same
104 # as BCC, unless you are cross-compiling. This C compiler builds
105 # the finished binary for fossil. The BCC compiler above is used
106 # for building intermediate code-generator tools.
107 #
108 TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
109
110 #### Compile resources for use in building executables that will run
111 # on the target platform.
112 #
113 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
174 ifdef FOSSIL_ENABLE_TCL
175 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
176 else
177 LIB += -lkernel32 -lws2_32
178 endif
179
180 LIB += -municode
181
182 #### Tcl shell for use in running the fossil test suite. This is only
183 # used for testing.
184 #
185 TCLSH = tclsh86
186
187 #### Nullsoft installer MakeNSIS location
188 #
189 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
190
191
M win/Makefile.mingw.mistachkin
+5 -4
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -13,14 +13,13 @@
1313
 #
1414
1515
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
18
-PREFIX =
1918
 # PREFIX = mingw32-
2019
 # PREFIX = i686-pc-mingw32-
21
-# PREFIX = i686-w64-mingw32-
20
+PREFIX = i686-w64-mingw32-
2221
 # PREFIX = x86_64-w64-mingw32-
2322
2423
 #### The toplevel directory of the source tree. Fossil can be built
2524
 # in a directory that is separate from the source tree. Just change
2625
 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
104103
 # will run on the target platform. This is usually the same
105104
 # as BCC, unless you are cross-compiling. This C compiler builds
106105
 # the finished binary for fossil. The BCC compiler above is used
107106
 # for building intermediate code-generator tools.
108107
 #
109
-TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
108
+TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
110109
111110
 #### Compile resources for use in building executables that will run
112111
 # on the target platform.
113112
 #
114113
 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
175174
 ifdef FOSSIL_ENABLE_TCL
176175
 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
177176
 else
178177
 LIB += -lkernel32 -lws2_32
179178
 endif
179
+
180
+LIB += -municode
180181
181182
 #### Tcl shell for use in running the fossil test suite. This is only
182183
 # used for testing.
183184
 #
184
-TCLSH = tclsh
185
+TCLSH = tclsh86
185186
186187
 #### Nullsoft installer MakeNSIS location
187188
 #
188189
 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
189190
190191
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -13,14 +13,13 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 # PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
25 # in a directory that is separate from the source tree. Just change
26 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
104 # will run on the target platform. This is usually the same
105 # as BCC, unless you are cross-compiling. This C compiler builds
106 # the finished binary for fossil. The BCC compiler above is used
107 # for building intermediate code-generator tools.
108 #
109 TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
110
111 #### Compile resources for use in building executables that will run
112 # on the target platform.
113 #
114 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
175 ifdef FOSSIL_ENABLE_TCL
176 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
177 else
178 LIB += -lkernel32 -lws2_32
179 endif
 
 
180
181 #### Tcl shell for use in running the fossil test suite. This is only
182 # used for testing.
183 #
184 TCLSH = tclsh
185
186 #### Nullsoft installer MakeNSIS location
187 #
188 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
189
190
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -13,14 +13,13 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
 
18 # PREFIX = mingw32-
19 # PREFIX = i686-pc-mingw32-
20 PREFIX = i686-w64-mingw32-
21 # PREFIX = x86_64-w64-mingw32-
22
23 #### The toplevel directory of the source tree. Fossil can be built
24 # in a directory that is separate from the source tree. Just change
25 # the following to point from the build directory to the src/ folder.
@@ -104,11 +103,11 @@
103 # will run on the target platform. This is usually the same
104 # as BCC, unless you are cross-compiling. This C compiler builds
105 # the finished binary for fossil. The BCC compiler above is used
106 # for building intermediate code-generator tools.
107 #
108 TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
109
110 #### Compile resources for use in building executables that will run
111 # on the target platform.
112 #
113 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
@@ -175,15 +174,17 @@
174 ifdef FOSSIL_ENABLE_TCL
175 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
176 else
177 LIB += -lkernel32 -lws2_32
178 endif
179
180 LIB += -municode
181
182 #### Tcl shell for use in running the fossil test suite. This is only
183 # used for testing.
184 #
185 TCLSH = tclsh86
186
187 #### Nullsoft installer MakeNSIS location
188 #
189 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
190
191
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,11 +32,11 @@
3232
 ZLIBDIR = $(MSCDIR)\extra\lib
3333
 ZLIB = zlib.lib
3434
3535
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
3636
37
-CFLAGS = -nologo -MT -O2
37
+CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
3838
 BCC = $(CC) $(CFLAGS)
3939
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
4040
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
4141
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
4242
4343
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,11 +32,11 @@
32 ZLIBDIR = $(MSCDIR)\extra\lib
33 ZLIB = zlib.lib
34
35 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
36
37 CFLAGS = -nologo -MT -O2
38 BCC = $(CC) $(CFLAGS)
39 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
40 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,11 +32,11 @@
32 ZLIBDIR = $(MSCDIR)\extra\lib
33 ZLIB = zlib.lib
34
35 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
36
37 CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
38 BCC = $(CC) $(CFLAGS)
39 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
40 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,11 +32,11 @@
3232
 ZLIBDIR = $(MSCDIR)\extra\lib
3333
 ZLIB = zlib.lib
3434
3535
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
3636
37
-CFLAGS = -nologo -MT -O2
37
+CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
3838
 BCC = $(CC) $(CFLAGS)
3939
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
4040
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
4141
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
4242
4343
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,11 +32,11 @@
32 ZLIBDIR = $(MSCDIR)\extra\lib
33 ZLIB = zlib.lib
34
35 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
36
37 CFLAGS = -nologo -MT -O2
38 BCC = $(CC) $(CFLAGS)
39 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
40 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,11 +32,11 @@
32 ZLIBDIR = $(MSCDIR)\extra\lib
33 ZLIB = zlib.lib
34
35 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
36
37 CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
38 BCC = $(CC) $(CFLAGS)
39 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
40 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43

Keyboard Shortcuts

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