Fossil SCM

Pull the latest changes in trunk over into the windows-i18n branch.

drh 2011-05-13 14:20 windows-i18n merge
Commit 70743ebae5c3bb914295aeb2e5ccd2bda1b4b924
Parent f25b6c00c8c7779…
8 files changed +5 -1 +5 -1 +1 -1 +4 -8 +1 -1 +1 -3 +1 -1 +1 -3
~ src/content.c ~ src/content.c ~ src/http.c ~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
M src/content.c
+5 -1
--- src/content.c
+++ src/content.c
@@ -79,11 +79,15 @@
7979
 ** The cache will deallocate memory when it has finished with it.
8080
 */
8181
 void content_cache_insert(int rid, Blob *pBlob){
8282
 struct cacheLine *p;
8383
 if( contentCache.n>500 || contentCache.szTotal>50000000 ){
84
- content_cache_expire_oldest();
84
+ i64 szBefore;
85
+ do{
86
+ szBefore = contentCache.szTotal;
87
+ content_cache_expire_oldest();
88
+ }while( contentCache.szTotal>50000000 && contentCache.szTotal<szBefore );
8589
 }
8690
 if( contentCache.n>=contentCache.nAlloc ){
8791
 contentCache.nAlloc = contentCache.nAlloc*2 + 10;
8892
 contentCache.a = fossil_realloc(contentCache.a,
8993
 contentCache.nAlloc*sizeof(contentCache.a[0]));
9094
--- src/content.c
+++ src/content.c
@@ -79,11 +79,15 @@
79 ** The cache will deallocate memory when it has finished with it.
80 */
81 void content_cache_insert(int rid, Blob *pBlob){
82 struct cacheLine *p;
83 if( contentCache.n>500 || contentCache.szTotal>50000000 ){
84 content_cache_expire_oldest();
 
 
 
 
85 }
86 if( contentCache.n>=contentCache.nAlloc ){
87 contentCache.nAlloc = contentCache.nAlloc*2 + 10;
88 contentCache.a = fossil_realloc(contentCache.a,
89 contentCache.nAlloc*sizeof(contentCache.a[0]));
90
--- src/content.c
+++ src/content.c
@@ -79,11 +79,15 @@
79 ** The cache will deallocate memory when it has finished with it.
80 */
81 void content_cache_insert(int rid, Blob *pBlob){
82 struct cacheLine *p;
83 if( contentCache.n>500 || contentCache.szTotal>50000000 ){
84 i64 szBefore;
85 do{
86 szBefore = contentCache.szTotal;
87 content_cache_expire_oldest();
88 }while( contentCache.szTotal>50000000 && contentCache.szTotal<szBefore );
89 }
90 if( contentCache.n>=contentCache.nAlloc ){
91 contentCache.nAlloc = contentCache.nAlloc*2 + 10;
92 contentCache.a = fossil_realloc(contentCache.a,
93 contentCache.nAlloc*sizeof(contentCache.a[0]));
94
M src/content.c
+5 -1
--- src/content.c
+++ src/content.c
@@ -79,11 +79,15 @@
7979
 ** The cache will deallocate memory when it has finished with it.
8080
 */
8181
 void content_cache_insert(int rid, Blob *pBlob){
8282
 struct cacheLine *p;
8383
 if( contentCache.n>500 || contentCache.szTotal>50000000 ){
84
- content_cache_expire_oldest();
84
+ i64 szBefore;
85
+ do{
86
+ szBefore = contentCache.szTotal;
87
+ content_cache_expire_oldest();
88
+ }while( contentCache.szTotal>50000000 && contentCache.szTotal<szBefore );
8589
 }
8690
 if( contentCache.n>=contentCache.nAlloc ){
8791
 contentCache.nAlloc = contentCache.nAlloc*2 + 10;
8892
 contentCache.a = fossil_realloc(contentCache.a,
8993
 contentCache.nAlloc*sizeof(contentCache.a[0]));
9094
--- src/content.c
+++ src/content.c
@@ -79,11 +79,15 @@
79 ** The cache will deallocate memory when it has finished with it.
80 */
81 void content_cache_insert(int rid, Blob *pBlob){
82 struct cacheLine *p;
83 if( contentCache.n>500 || contentCache.szTotal>50000000 ){
84 content_cache_expire_oldest();
 
 
 
 
85 }
86 if( contentCache.n>=contentCache.nAlloc ){
87 contentCache.nAlloc = contentCache.nAlloc*2 + 10;
88 contentCache.a = fossil_realloc(contentCache.a,
89 contentCache.nAlloc*sizeof(contentCache.a[0]));
90
--- src/content.c
+++ src/content.c
@@ -79,11 +79,15 @@
79 ** The cache will deallocate memory when it has finished with it.
80 */
81 void content_cache_insert(int rid, Blob *pBlob){
82 struct cacheLine *p;
83 if( contentCache.n>500 || contentCache.szTotal>50000000 ){
84 i64 szBefore;
85 do{
86 szBefore = contentCache.szTotal;
87 content_cache_expire_oldest();
88 }while( contentCache.szTotal>50000000 && contentCache.szTotal<szBefore );
89 }
90 if( contentCache.n>=contentCache.nAlloc ){
91 contentCache.nAlloc = contentCache.nAlloc*2 + 10;
92 contentCache.a = fossil_realloc(contentCache.a,
93 contentCache.nAlloc*sizeof(contentCache.a[0]));
94
M src/http.c
+1 -1
--- src/http.c
+++ src/http.c
@@ -100,11 +100,11 @@
100100
 }else{
101101
 zSep = "/";
102102
 }
103103
 blob_appendf(pHdr, "POST %s%sxfer/xfer HTTP/1.0\r\n", g.urlPath, zSep);
104104
 if( g.urlProxyAuth ){
105
- blob_appendf(pHdr, "Proxy-Authorization: %s\n", g.urlProxyAuth);
105
+ blob_appendf(pHdr, "Proxy-Authorization: %s\r\n", g.urlProxyAuth);
106106
 }
107107
 if( g.urlPasswd && g.urlUser && g.urlPasswd[0]=='#' ){
108108
 char *zCredentials = mprintf("%s:%s", g.urlUser, &g.urlPasswd[1]);
109109
 char *zEncoded = encode64(zCredentials, -1);
110110
 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111111
--- src/http.c
+++ src/http.c
@@ -100,11 +100,11 @@
100 }else{
101 zSep = "/";
102 }
103 blob_appendf(pHdr, "POST %s%sxfer/xfer HTTP/1.0\r\n", g.urlPath, zSep);
104 if( g.urlProxyAuth ){
105 blob_appendf(pHdr, "Proxy-Authorization: %s\n", g.urlProxyAuth);
106 }
107 if( g.urlPasswd && g.urlUser && g.urlPasswd[0]=='#' ){
108 char *zCredentials = mprintf("%s:%s", g.urlUser, &g.urlPasswd[1]);
109 char *zEncoded = encode64(zCredentials, -1);
110 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111
--- src/http.c
+++ src/http.c
@@ -100,11 +100,11 @@
100 }else{
101 zSep = "/";
102 }
103 blob_appendf(pHdr, "POST %s%sxfer/xfer HTTP/1.0\r\n", g.urlPath, zSep);
104 if( g.urlProxyAuth ){
105 blob_appendf(pHdr, "Proxy-Authorization: %s\r\n", g.urlProxyAuth);
106 }
107 if( g.urlPasswd && g.urlUser && g.urlPasswd[0]=='#' ){
108 char *zCredentials = mprintf("%s:%s", g.urlUser, &g.urlPasswd[1]);
109 char *zEncoded = encode64(zCredentials, -1);
110 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111
M src/makemake.tcl
+4 -8
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -307,11 +307,11 @@
307307
 # will run on the target platform. This is usually the same
308308
 # as BCC, unless you are cross-compiling. This C compiler builds
309309
 # the finished binary for fossil. The BCC compiler above is used
310310
 # for building intermediate code-generator tools.
311311
 #
312
-TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
312
+TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
313313
314314
 # With HTTPS support
315315
 ifdef FOSSIL_ENABLE_SSL
316316
 TCC += -static -DFOSSIL_ENABLE_SSL=1
317317
 endif
@@ -502,15 +502,13 @@
502502
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
503503
504504
 #SSL = -DFOSSIL_ENABLE_SSL=1
505505
 SSL =
506506
507
-I18N = -DFOSSIL_I18N=0
508
-
509507
 CFLAGS = -o
510508
 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
511
-TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
509
+TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
512510
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
513511
 }
514512
 writeln "SQLITE_OPTIONS = $SQLITE_OPTIONS\n"
515513
 writeln -nonewline "SRC = "
516514
 foreach s [lsort $src] {
@@ -645,15 +643,13 @@
645643
 ZLIBDIR = $(MSCDIR)\extra\lib
646644
 ZLIB = zlib.lib
647645
648646
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
649647
650
-I18N = -DFOSSIL_I18N=0
651
-
652648
 CFLAGS = -nologo -MT -O2
653649
 BCC = $(CC) $(CFLAGS)
654
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
650
+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
655651
 LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
656652
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
657653
 }
658654
 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
659655
 writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
@@ -819,11 +815,11 @@
819815
820816
 # define standard C-compiler and flags, used to compile
821817
 # the fossil binary. Some special definitions follow for
822818
 # special files follow
823819
 CC=$(PellesCDir)\bin\pocc.exe
824
-DEFINES=-DFOSSIL_I18N=0 -D_pgmptr=g.argv[0]
820
+DEFINES=-D_pgmptr=g.argv[0]
825821
 CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
826822
 INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR)
827823
828824
 # define commands for building the windows resource files
829825
 RESOURCE=fossil.res
830826
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -307,11 +307,11 @@
307 # will run on the target platform. This is usually the same
308 # as BCC, unless you are cross-compiling. This C compiler builds
309 # the finished binary for fossil. The BCC compiler above is used
310 # for building intermediate code-generator tools.
311 #
312 TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
313
314 # With HTTPS support
315 ifdef FOSSIL_ENABLE_SSL
316 TCC += -static -DFOSSIL_ENABLE_SSL=1
317 endif
@@ -502,15 +502,13 @@
502 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
503
504 #SSL = -DFOSSIL_ENABLE_SSL=1
505 SSL =
506
507 I18N = -DFOSSIL_I18N=0
508
509 CFLAGS = -o
510 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
511 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
512 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
513 }
514 writeln "SQLITE_OPTIONS = $SQLITE_OPTIONS\n"
515 writeln -nonewline "SRC = "
516 foreach s [lsort $src] {
@@ -645,15 +643,13 @@
645 ZLIBDIR = $(MSCDIR)\extra\lib
646 ZLIB = zlib.lib
647
648 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
649
650 I18N = -DFOSSIL_I18N=0
651
652 CFLAGS = -nologo -MT -O2
653 BCC = $(CC) $(CFLAGS)
654 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
655 LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
656 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
657 }
658 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
659 writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
@@ -819,11 +815,11 @@
819
820 # define standard C-compiler and flags, used to compile
821 # the fossil binary. Some special definitions follow for
822 # special files follow
823 CC=$(PellesCDir)\bin\pocc.exe
824 DEFINES=-DFOSSIL_I18N=0 -D_pgmptr=g.argv[0]
825 CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
826 INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR)
827
828 # define commands for building the windows resource files
829 RESOURCE=fossil.res
830
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -307,11 +307,11 @@
307 # will run on the target platform. This is usually the same
308 # as BCC, unless you are cross-compiling. This C compiler builds
309 # the finished binary for fossil. The BCC compiler above is used
310 # for building intermediate code-generator tools.
311 #
312 TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
313
314 # With HTTPS support
315 ifdef FOSSIL_ENABLE_SSL
316 TCC += -static -DFOSSIL_ENABLE_SSL=1
317 endif
@@ -502,15 +502,13 @@
502 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
503
504 #SSL = -DFOSSIL_ENABLE_SSL=1
505 SSL =
506
 
 
507 CFLAGS = -o
508 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
509 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
510 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
511 }
512 writeln "SQLITE_OPTIONS = $SQLITE_OPTIONS\n"
513 writeln -nonewline "SRC = "
514 foreach s [lsort $src] {
@@ -645,15 +643,13 @@
643 ZLIBDIR = $(MSCDIR)\extra\lib
644 ZLIB = zlib.lib
645
646 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
647
 
 
648 CFLAGS = -nologo -MT -O2
649 BCC = $(CC) $(CFLAGS)
650 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
651 LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
652 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
653 }
654 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
655 writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
@@ -819,11 +815,11 @@
815
816 # define standard C-compiler and flags, used to compile
817 # the fossil binary. Some special definitions follow for
818 # special files follow
819 CC=$(PellesCDir)\bin\pocc.exe
820 DEFINES=-D_pgmptr=g.argv[0]
821 CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
822 INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR)
823
824 # define commands for building the windows resource files
825 RESOURCE=fossil.res
826
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -61,11 +61,11 @@
6161
6262
 # define standard C-compiler and flags, used to compile
6363
 # the fossil binary. Some special definitions follow for
6464
 # special files follow
6565
 CC=$(PellesCDir)\bin\pocc.exe
66
-DEFINES=-DFOSSIL_I18N=0 -D_pgmptr=g.argv[0]
66
+DEFINES=-D_pgmptr=g.argv[0]
6767
 CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
6868
 INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR)
6969
7070
 # define commands for building the windows resource files
7171
 RESOURCE=fossil.res
7272
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -61,11 +61,11 @@
61
62 # define standard C-compiler and flags, used to compile
63 # the fossil binary. Some special definitions follow for
64 # special files follow
65 CC=$(PellesCDir)\bin\pocc.exe
66 DEFINES=-DFOSSIL_I18N=0 -D_pgmptr=g.argv[0]
67 CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
68 INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR)
69
70 # define commands for building the windows resource files
71 RESOURCE=fossil.res
72
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -61,11 +61,11 @@
61
62 # define standard C-compiler and flags, used to compile
63 # the fossil binary. Some special definitions follow for
64 # special files follow
65 CC=$(PellesCDir)\bin\pocc.exe
66 DEFINES=-D_pgmptr=g.argv[0]
67 CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
68 INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR)
69
70 # define commands for building the windows resource files
71 RESOURCE=fossil.res
72
M win/Makefile.dmc
+1 -3
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -15,15 +15,13 @@
1515
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
1616
1717
 #SSL = -DFOSSIL_ENABLE_SSL=1
1818
 SSL =
1919
20
-I18N = -DFOSSIL_I18N=0
21
-
2220
 CFLAGS = -o
2321
 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
24
-TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
22
+TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
2523
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
2624
2725
 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
2826
2927
 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
3028
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -15,15 +15,13 @@
15 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
16
17 #SSL = -DFOSSIL_ENABLE_SSL=1
18 SSL =
19
20 I18N = -DFOSSIL_I18N=0
21
22 CFLAGS = -o
23 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
24 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
25 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
26
27 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
28
29 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -15,15 +15,13 @@
15 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
16
17 #SSL = -DFOSSIL_ENABLE_SSL=1
18 SSL =
19
 
 
20 CFLAGS = -o
21 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
22 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
23 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
24
25 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
26
27 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
28
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -33,11 +33,11 @@
3333
 # will run on the target platform. This is usually the same
3434
 # as BCC, unless you are cross-compiling. This C compiler builds
3535
 # the finished binary for fossil. The BCC compiler above is used
3636
 # for building intermediate code-generator tools.
3737
 #
38
-TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
38
+TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
3939
4040
 # With HTTPS support
4141
 ifdef FOSSIL_ENABLE_SSL
4242
 TCC += -static -DFOSSIL_ENABLE_SSL=1
4343
 endif
4444
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -33,11 +33,11 @@
33 # will run on the target platform. This is usually the same
34 # as BCC, unless you are cross-compiling. This C compiler builds
35 # the finished binary for fossil. The BCC compiler above is used
36 # for building intermediate code-generator tools.
37 #
38 TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
39
40 # With HTTPS support
41 ifdef FOSSIL_ENABLE_SSL
42 TCC += -static -DFOSSIL_ENABLE_SSL=1
43 endif
44
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -33,11 +33,11 @@
33 # will run on the target platform. This is usually the same
34 # as BCC, unless you are cross-compiling. This C compiler builds
35 # the finished binary for fossil. The BCC compiler above is used
36 # for building intermediate code-generator tools.
37 #
38 TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
39
40 # With HTTPS support
41 ifdef FOSSIL_ENABLE_SSL
42 TCC += -static -DFOSSIL_ENABLE_SSL=1
43 endif
44
M win/Makefile.msc
+1 -3
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -28,15 +28,13 @@
2828
 ZLIBDIR = $(MSCDIR)\extra\lib
2929
 ZLIB = zlib.lib
3030
3131
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
3232
33
-I18N = -DFOSSIL_I18N=0
34
-
3533
 CFLAGS = -nologo -MT -O2
3634
 BCC = $(CC) $(CFLAGS)
37
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
35
+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
3836
 LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
3937
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
4038
4139
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT2 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
4240
4341
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -28,15 +28,13 @@
28 ZLIBDIR = $(MSCDIR)\extra\lib
29 ZLIB = zlib.lib
30
31 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
32
33 I18N = -DFOSSIL_I18N=0
34
35 CFLAGS = -nologo -MT -O2
36 BCC = $(CC) $(CFLAGS)
37 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
38 LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
39 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
40
41 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT2 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
42
43
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -28,15 +28,13 @@
28 ZLIBDIR = $(MSCDIR)\extra\lib
29 ZLIB = zlib.lib
30
31 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
32
 
 
33 CFLAGS = -nologo -MT -O2
34 BCC = $(CC) $(CFLAGS)
35 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
36 LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
37 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
38
39 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT2 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40
41

Keyboard Shortcuts

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