Fossil SCM

Add a version number that is increased by one on each release. Make the initial version number 1.18 since there have been 17 prior releases.

drh 2011-06-18 16:50 trunk
Commit e0303181a568fe959aaa0fa69d6437ba9895fb3c
Parent 89e6eb9674f5b55…
13 files changed +1 +2 -1 +1 -1 +5 -4 +12 -13 +1 -6 +2 -1 +2 -1 +1 -1 +1 -1 +2 -2 +1 -1 -10
+ VERSION ~ src/http.c ~ src/main.c ~ src/main.mk ~ src/makemake.tcl ~ src/mkversion.c ~ src/stat.c ~ src/style.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc - win/version.c
A VERSION
+1
--- a/VERSION
+++ b/VERSION
@@ -0,0 +1 @@
1
+1.18
--- a/VERSION
+++ b/VERSION
@@ -0,0 +1 @@
 
--- a/VERSION
+++ b/VERSION
@@ -0,0 +1 @@
1 1.18
M src/http.c
+2 -1
--- src/http.c
+++ src/http.c
@@ -110,11 +110,12 @@
110110
 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111111
 fossil_free(zEncoded);
112112
 fossil_free(zCredentials);
113113
 }
114114
 blob_appendf(pHdr, "Host: %s\r\n", g.urlHostname);
115
- blob_appendf(pHdr, "User-Agent: Fossil/" MANIFEST_VERSION "\r\n");
115
+ blob_appendf(pHdr, "User-Agent: Fossil/" RELEASE_VERSION
116
+ "-" MANIFEST_VERSION "\r\n");
116117
 if( g.fHttpTrace ){
117118
 blob_appendf(pHdr, "Content-Type: application/x-fossil-debug\r\n");
118119
 }else{
119120
 blob_appendf(pHdr, "Content-Type: application/x-fossil\r\n");
120121
 }
121122
--- src/http.c
+++ src/http.c
@@ -110,11 +110,12 @@
110 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111 fossil_free(zEncoded);
112 fossil_free(zCredentials);
113 }
114 blob_appendf(pHdr, "Host: %s\r\n", g.urlHostname);
115 blob_appendf(pHdr, "User-Agent: Fossil/" MANIFEST_VERSION "\r\n");
 
116 if( g.fHttpTrace ){
117 blob_appendf(pHdr, "Content-Type: application/x-fossil-debug\r\n");
118 }else{
119 blob_appendf(pHdr, "Content-Type: application/x-fossil\r\n");
120 }
121
--- src/http.c
+++ src/http.c
@@ -110,11 +110,12 @@
110 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111 fossil_free(zEncoded);
112 fossil_free(zCredentials);
113 }
114 blob_appendf(pHdr, "Host: %s\r\n", g.urlHostname);
115 blob_appendf(pHdr, "User-Agent: Fossil/" RELEASE_VERSION
116 "-" MANIFEST_VERSION "\r\n");
117 if( g.fHttpTrace ){
118 blob_appendf(pHdr, "Content-Type: application/x-fossil-debug\r\n");
119 }else{
120 blob_appendf(pHdr, "Content-Type: application/x-fossil\r\n");
121 }
122
M src/main.c
+1 -1
--- src/main.c
+++ src/main.c
@@ -644,11 +644,11 @@
644644
 ** Usage: %fossil version
645645
 **
646646
 ** Print the source code version number for the fossil executable.
647647
 */
648648
 void version_cmd(void){
649
- fossil_print("This is fossil version "
649
+ fossil_print("This is fossil version " RELEASE_VERSION " "
650650
 MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
651651
 }
652652
653653
654654
 /*
655655
--- src/main.c
+++ src/main.c
@@ -644,11 +644,11 @@
644 ** Usage: %fossil version
645 **
646 ** Print the source code version number for the fossil executable.
647 */
648 void version_cmd(void){
649 fossil_print("This is fossil version "
650 MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
651 }
652
653
654 /*
655
--- src/main.c
+++ src/main.c
@@ -644,11 +644,11 @@
644 ** Usage: %fossil version
645 **
646 ** Print the source code version number for the fossil executable.
647 */
648 void version_cmd(void){
649 fossil_print("This is fossil version " RELEASE_VERSION " "
650 MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
651 }
652
653
654 /*
655
M src/main.mk
+5 -4
--- src/main.mk
+++ src/main.mk
@@ -281,20 +281,21 @@
281281
 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
282282
283283
 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
284284
 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
285285
286
+$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
287
+ $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
288
+
286289
 # WARNING. DANGER. Running the testsuite modifies the repository the
287290
 # build is done from, i.e. the checkout belongs to. Do not sync/push
288291
 # the repository after running the tests.
289292
 test: $(APPNAME)
290293
 $(TCLSH) test/tester.tcl $(APPNAME)
291294
292
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
293
- awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
294
- awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
295
- awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12,8)}' $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
295
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296
+ $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
296297
297298
 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
298299
299300
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
300301
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
301302
--- src/main.mk
+++ src/main.mk
@@ -281,20 +281,21 @@
281 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
282
283 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
284 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
285
 
 
 
286 # WARNING. DANGER. Running the testsuite modifies the repository the
287 # build is done from, i.e. the checkout belongs to. Do not sync/push
288 # the repository after running the tests.
289 test: $(APPNAME)
290 $(TCLSH) test/tester.tcl $(APPNAME)
291
292 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
293 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
294 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
295 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12,8)}' $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
296
297 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
298
299 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
300 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
301
--- src/main.mk
+++ src/main.mk
@@ -281,20 +281,21 @@
281 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
282
283 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
284 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
285
286 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
287 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
288
289 # WARNING. DANGER. Running the testsuite modifies the repository the
290 # build is done from, i.e. the checkout belongs to. Do not sync/push
291 # the repository after running the tests.
292 test: $(APPNAME)
293 $(TCLSH) test/tester.tcl $(APPNAME)
294
295 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 
297
298 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
299
300 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
301 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
302
M src/makemake.tcl
+12 -13
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -176,24 +176,23 @@
176176
 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
177177
178178
 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
179179
 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
180180
181
+$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
182
+ $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
183
+
181184
 # WARNING. DANGER. Running the testsuite modifies the repository the
182185
 # build is done from, i.e. the checkout belongs to. Do not sync/push
183186
 # the repository after running the tests.
184187
 test: $(APPNAME)
185188
 $(TCLSH) test/tester.tcl $(APPNAME)
186189
187
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
188
- awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' \
189
- $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
190
- awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' \
191
- $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
192
- awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\
193
- substr($$2,1,10),substr($$2,12,8)}' \
194
- $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
190
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191
+ $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192
+ $(SRCDIR)/../manifest \
193
+ $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
195194
196195
 EXTRAOBJ = \
197196
 $(OBJDIR)/sqlite3.o \
198197
 $(OBJDIR)/shell.o \
199198
 $(OBJDIR)/th.o \
@@ -389,12 +388,12 @@
389388
 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
390389
391390
 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
392391
 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
393392
394
-$(VERSION): $(SRCDIR)/../win/version.c
395
- $(BCC) -o $(OBJDIR)/version $(SRCDIR)/../win/version.c
393
+$(VERSION): $(SRCDIR)/mkversion.c
394
+ $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
396395
397396
 # WARNING. DANGER. Running the testsuite modifies the repository the
398397
 # build is done from, i.e. the checkout belongs to. Do not sync/push
399398
 # the repository after running the tests.
400399
 test: $(APPNAME)
@@ -556,11 +555,11 @@
556555
 $(BCC) -o$@ $**
557556
558557
 mkindex$E: $(SRCDIR)\mkindex.c
559558
 $(BCC) -o$@ $**
560559
561
-version$E: $B\win\version.c
560
+version$E: $B\src\mkversion.c
562561
 $(BCC) -o$@ $**
563562
564563
 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
565564
 $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
566565
@@ -693,11 +692,11 @@
693692
 $(BCC) $**
694693
695694
 mkindex$E: $(SRCDIR)\mkindex.c
696695
 $(BCC) $**
697696
698
-version$E: $B\win\version.c
697
+version$E: $B\src\mkversion.c
699698
 $(BCC) $**
700699
701700
 $(OX)\shell$O : $(SRCDIR)\shell.c
702701
 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
703702
@@ -880,11 +879,11 @@
880879
 # compiling standard fossil utils
881880
 $(UTILS_OBJ): %.obj: $(SRCDIR)%.c
882881
 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
883882
884883
 # compile special windows utils
885
-version.obj: $(WINDIR)version.c
884
+version.obj: $(SRCDIR)mkversion.c
886885
 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
887886
888887
 # generate the translated c-source files
889888
 $(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
890889
 translate.exe $< >$@
891890
892891
ADDED src/mkversion.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -176,24 +176,23 @@
176 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
177
178 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
179 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
180
 
 
 
181 # WARNING. DANGER. Running the testsuite modifies the repository the
182 # build is done from, i.e. the checkout belongs to. Do not sync/push
183 # the repository after running the tests.
184 test: $(APPNAME)
185 $(TCLSH) test/tester.tcl $(APPNAME)
186
187 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
188 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' \
189 $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
190 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' \
191 $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
192 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\
193 substr($$2,1,10),substr($$2,12,8)}' \
194 $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
195
196 EXTRAOBJ = \
197 $(OBJDIR)/sqlite3.o \
198 $(OBJDIR)/shell.o \
199 $(OBJDIR)/th.o \
@@ -389,12 +388,12 @@
389 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
390
391 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
392 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
393
394 $(VERSION): $(SRCDIR)/../win/version.c
395 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/../win/version.c
396
397 # WARNING. DANGER. Running the testsuite modifies the repository the
398 # build is done from, i.e. the checkout belongs to. Do not sync/push
399 # the repository after running the tests.
400 test: $(APPNAME)
@@ -556,11 +555,11 @@
556 $(BCC) -o$@ $**
557
558 mkindex$E: $(SRCDIR)\mkindex.c
559 $(BCC) -o$@ $**
560
561 version$E: $B\win\version.c
562 $(BCC) -o$@ $**
563
564 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
565 $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
566
@@ -693,11 +692,11 @@
693 $(BCC) $**
694
695 mkindex$E: $(SRCDIR)\mkindex.c
696 $(BCC) $**
697
698 version$E: $B\win\version.c
699 $(BCC) $**
700
701 $(OX)\shell$O : $(SRCDIR)\shell.c
702 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
703
@@ -880,11 +879,11 @@
880 # compiling standard fossil utils
881 $(UTILS_OBJ): %.obj: $(SRCDIR)%.c
882 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
883
884 # compile special windows utils
885 version.obj: $(WINDIR)version.c
886 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
887
888 # generate the translated c-source files
889 $(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
890 translate.exe $< >$@
891
892 DDED src/mkversion.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -176,24 +176,23 @@
176 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
177
178 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
179 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
180
181 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
182 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
183
184 # WARNING. DANGER. Running the testsuite modifies the repository the
185 # build is done from, i.e. the checkout belongs to. Do not sync/push
186 # the repository after running the tests.
187 test: $(APPNAME)
188 $(TCLSH) test/tester.tcl $(APPNAME)
189
190 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192 $(SRCDIR)/../manifest \
193 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 
 
 
194
195 EXTRAOBJ = \
196 $(OBJDIR)/sqlite3.o \
197 $(OBJDIR)/shell.o \
198 $(OBJDIR)/th.o \
@@ -389,12 +388,12 @@
388 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
389
390 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
391 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
392
393 $(VERSION): $(SRCDIR)/mkversion.c
394 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
395
396 # WARNING. DANGER. Running the testsuite modifies the repository the
397 # build is done from, i.e. the checkout belongs to. Do not sync/push
398 # the repository after running the tests.
399 test: $(APPNAME)
@@ -556,11 +555,11 @@
555 $(BCC) -o$@ $**
556
557 mkindex$E: $(SRCDIR)\mkindex.c
558 $(BCC) -o$@ $**
559
560 version$E: $B\src\mkversion.c
561 $(BCC) -o$@ $**
562
563 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
564 $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
565
@@ -693,11 +692,11 @@
692 $(BCC) $**
693
694 mkindex$E: $(SRCDIR)\mkindex.c
695 $(BCC) $**
696
697 version$E: $B\src\mkversion.c
698 $(BCC) $**
699
700 $(OX)\shell$O : $(SRCDIR)\shell.c
701 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
702
@@ -880,11 +879,11 @@
879 # compiling standard fossil utils
880 $(UTILS_OBJ): %.obj: $(SRCDIR)%.c
881 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
882
883 # compile special windows utils
884 version.obj: $(SRCDIR)mkversion.c
885 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
886
887 # generate the translated c-source files
888 $(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
889 translate.exe $< >$@
890
891 DDED src/mkversion.c
M src/mkversion.c
+1 -6
--- a/src/mkversion.c
+++ b/src/mkversion.c
@@ -1,10 +1,5 @@
1
-fopen(argv[1],"gv[1],exists to do the job that AWK would do for the unix
2
-** makefile - to extract information from the "mainfest" and "manifest.uuid"
3
-** files for this p)
1
+fopen(argv[1],"gv[1],"fMSC_VER)
42
 d = _MSC_VER / 1 return 0;
53
 }
64
 b2b2,0,sizeof(b2)strcpy(b2b2b2vx[1000]return 0;
75
 }
8
-;
9
- char b[1024b[strlen(b)-1] =0; return 0"gv[1],"fMSC_VER)
10
- fopen(argv[1
--- a/src/mkversion.c
+++ b/src/mkversion.c
@@ -1,10 +1,5 @@
1 fopen(argv[1],"gv[1],exists to do the job that AWK would do for the unix
2 ** makefile - to extract information from the "mainfest" and "manifest.uuid"
3 ** files for this p)
4 d = _MSC_VER / 1 return 0;
5 }
6 b2b2,0,sizeof(b2)strcpy(b2b2b2vx[1000]return 0;
7 }
8 ;
9 char b[1024b[strlen(b)-1] =0; return 0"gv[1],"fMSC_VER)
10 fopen(argv[1
--- a/src/mkversion.c
+++ b/src/mkversion.c
@@ -1,10 +1,5 @@
1 fopen(argv[1],"gv[1],"fMSC_VER)
 
 
2 d = _MSC_VER / 1 return 0;
3 }
4 b2b2,0,sizeof(b2)strcpy(b2b2b2vx[1000]return 0;
5 }
 
 
 
M src/stat.c
+2 -1
--- src/stat.c
+++ src/stat.c
@@ -104,11 +104,12 @@
104104
 @ <tr><th>Server&nbsp;ID:</th><td>
105105
 @ %h(db_get("server-code",""))
106106
 @ </td></tr>
107107
108108
 @ <tr><th>Fossil&nbsp;Version:</th><td>
109
- @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION) (%h(COMPILER_NAME))
109
+ @ %h(RELEASE_VERSION) %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
110
+ @ (%h(COMPILER_NAME))
110111
 @ </td></tr>
111112
 @ <tr><th>SQLite&nbsp;Version:</th><td>
112113
 sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)",
113114
 SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
114115
 zDb = db_name("repository");
115116
--- src/stat.c
+++ src/stat.c
@@ -104,11 +104,12 @@
104 @ <tr><th>Server&nbsp;ID:</th><td>
105 @ %h(db_get("server-code",""))
106 @ </td></tr>
107
108 @ <tr><th>Fossil&nbsp;Version:</th><td>
109 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION) (%h(COMPILER_NAME))
 
110 @ </td></tr>
111 @ <tr><th>SQLite&nbsp;Version:</th><td>
112 sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)",
113 SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
114 zDb = db_name("repository");
115
--- src/stat.c
+++ src/stat.c
@@ -104,11 +104,12 @@
104 @ <tr><th>Server&nbsp;ID:</th><td>
105 @ %h(db_get("server-code",""))
106 @ </td></tr>
107
108 @ <tr><th>Fossil&nbsp;Version:</th><td>
109 @ %h(RELEASE_VERSION) %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
110 @ (%h(COMPILER_NAME))
111 @ </td></tr>
112 @ <tr><th>SQLite&nbsp;Version:</th><td>
113 sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)",
114 SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
115 zDb = db_name("repository");
116
M src/style.c
+2 -1
--- src/style.c
+++ src/style.c
@@ -98,10 +98,11 @@
9898
 Th_Store("title", zTitle);
9999
 Th_Store("baseurl", g.zBaseURL);
100100
 Th_Store("home", g.zTop);
101101
 Th_Store("index_page", db_get("index-page","/home"));
102102
 Th_Store("current_page", g.zPath);
103
+ Th_Store("release_version", RELEASE_VERSION);
103104
 Th_Store("manifest_version", MANIFEST_VERSION);
104105
 Th_Store("manifest_date", MANIFEST_DATE);
105106
 Th_Store("compiler_name", COMPILER_NAME);
106107
 if( g.zLogin ){
107108
 Th_Store("login", g.zLogin);
@@ -245,11 +246,11 @@
245246
 /*
246247
 ** The default page footer
247248
 */
248249
 const char zDefaultFooter[] =
249250
 @ <div class="footer">
250
-@ Fossil version $manifest_version $manifest_date
251
+@ Fossil version $release_version $manifest_version $manifest_date
251252
 @ </div>
252253
 @ </body></html>
253254
 ;
254255
255256
 /*
256257
--- src/style.c
+++ src/style.c
@@ -98,10 +98,11 @@
98 Th_Store("title", zTitle);
99 Th_Store("baseurl", g.zBaseURL);
100 Th_Store("home", g.zTop);
101 Th_Store("index_page", db_get("index-page","/home"));
102 Th_Store("current_page", g.zPath);
 
103 Th_Store("manifest_version", MANIFEST_VERSION);
104 Th_Store("manifest_date", MANIFEST_DATE);
105 Th_Store("compiler_name", COMPILER_NAME);
106 if( g.zLogin ){
107 Th_Store("login", g.zLogin);
@@ -245,11 +246,11 @@
245 /*
246 ** The default page footer
247 */
248 const char zDefaultFooter[] =
249 @ <div class="footer">
250 @ Fossil version $manifest_version $manifest_date
251 @ </div>
252 @ </body></html>
253 ;
254
255 /*
256
--- src/style.c
+++ src/style.c
@@ -98,10 +98,11 @@
98 Th_Store("title", zTitle);
99 Th_Store("baseurl", g.zBaseURL);
100 Th_Store("home", g.zTop);
101 Th_Store("index_page", db_get("index-page","/home"));
102 Th_Store("current_page", g.zPath);
103 Th_Store("release_version", RELEASE_VERSION);
104 Th_Store("manifest_version", MANIFEST_VERSION);
105 Th_Store("manifest_date", MANIFEST_DATE);
106 Th_Store("compiler_name", COMPILER_NAME);
107 if( g.zLogin ){
108 Th_Store("login", g.zLogin);
@@ -245,11 +246,11 @@
246 /*
247 ** The default page footer
248 */
249 const char zDefaultFooter[] =
250 @ <div class="footer">
251 @ Fossil version $release_version $manifest_version $manifest_date
252 @ </div>
253 @ </body></html>
254 ;
255
256 /*
257
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -126,11 +126,11 @@
126126
 # compiling standard fossil utils
127127
 $(UTILS_OBJ): %.obj: $(SRCDIR)%.c
128128
 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
129129
130130
 # compile special windows utils
131
-version.obj: $(WINDIR)version.c
131
+version.obj: $(SRCDIR)mkversion.c
132132
 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
133133
134134
 # generate the translated c-source files
135135
 $(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
136136
 translate.exe $< >$@
137137
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -126,11 +126,11 @@
126 # compiling standard fossil utils
127 $(UTILS_OBJ): %.obj: $(SRCDIR)%.c
128 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
129
130 # compile special windows utils
131 version.obj: $(WINDIR)version.c
132 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
133
134 # generate the translated c-source files
135 $(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
136 translate.exe $< >$@
137
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -126,11 +126,11 @@
126 # compiling standard fossil utils
127 $(UTILS_OBJ): %.obj: $(SRCDIR)%.c
128 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
129
130 # compile special windows utils
131 version.obj: $(SRCDIR)mkversion.c
132 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
133
134 # generate the translated c-source files
135 $(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
136 translate.exe $< >$@
137
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -58,11 +58,11 @@
5858
 $(BCC) -o$@ $**
5959
6060
 mkindex$E: $(SRCDIR)\mkindex.c
6161
 $(BCC) -o$@ $**
6262
63
-version$E: $B\win\version.c
63
+version$E: $B\src\mkversion.c
6464
 $(BCC) -o$@ $**
6565
6666
 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
6767
 $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
6868
6969
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -58,11 +58,11 @@
58 $(BCC) -o$@ $**
59
60 mkindex$E: $(SRCDIR)\mkindex.c
61 $(BCC) -o$@ $**
62
63 version$E: $B\win\version.c
64 $(BCC) -o$@ $**
65
66 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
67 $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
68
69
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -58,11 +58,11 @@
58 $(BCC) -o$@ $**
59
60 mkindex$E: $(SRCDIR)\mkindex.c
61 $(BCC) -o$@ $**
62
63 version$E: $B\src\mkversion.c
64 $(BCC) -o$@ $**
65
66 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
67 $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
68
69
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -351,12 +351,12 @@
351351
 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
352352
353353
 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
354354
 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
355355
356
-$(VERSION): $(SRCDIR)/../win/version.c
357
- $(BCC) -o $(OBJDIR)/version $(SRCDIR)/../win/version.c
356
+$(VERSION): $(SRCDIR)/mkversion.c
357
+ $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
358358
359359
 # WARNING. DANGER. Running the testsuite modifies the repository the
360360
 # build is done from, i.e. the checkout belongs to. Do not sync/push
361361
 # the repository after running the tests.
362362
 test: $(APPNAME)
363363
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -351,12 +351,12 @@
351 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
352
353 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
354 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
355
356 $(VERSION): $(SRCDIR)/../win/version.c
357 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/../win/version.c
358
359 # WARNING. DANGER. Running the testsuite modifies the repository the
360 # build is done from, i.e. the checkout belongs to. Do not sync/push
361 # the repository after running the tests.
362 test: $(APPNAME)
363
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -351,12 +351,12 @@
351 $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c
352
353 $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c
354 $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
355
356 $(VERSION): $(SRCDIR)/mkversion.c
357 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
358
359 # WARNING. DANGER. Running the testsuite modifies the repository the
360 # build is done from, i.e. the checkout belongs to. Do not sync/push
361 # the repository after running the tests.
362 test: $(APPNAME)
363
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -153,11 +153,11 @@
153153
 $(BCC) $**
154154
155155
 mkindex$E: $(SRCDIR)\mkindex.c
156156
 $(BCC) $**
157157
158
-version$E: $B\win\version.c
158
+version$E: $B\src\mkversion.c
159159
 $(BCC) $**
160160
161161
 $(OX)\shell$O : $(SRCDIR)\shell.c
162162
 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
163163
164164
165165
DELETED win/version.c
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -153,11 +153,11 @@
153 $(BCC) $**
154
155 mkindex$E: $(SRCDIR)\mkindex.c
156 $(BCC) $**
157
158 version$E: $B\win\version.c
159 $(BCC) $**
160
161 $(OX)\shell$O : $(SRCDIR)\shell.c
162 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
163
164
165 ELETED win/version.c
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -153,11 +153,11 @@
153 $(BCC) $**
154
155 mkindex$E: $(SRCDIR)\mkindex.c
156 $(BCC) $**
157
158 version$E: $B\src\mkversion.c
159 $(BCC) $**
160
161 $(OX)\shell$O : $(SRCDIR)\shell.c
162 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
163
164
165 ELETED win/version.c
D win/version.c
-10
--- a/win/version.c
+++ b/win/version.c
@@ -1,10 +0,0 @@
1
-fopen(argv[1],"gv[1],exists to do the job that AWK would do for the unix
2
-** makefile - to extract information from the "mainfest" and "manifest.uuid"
3
-** files for this p)
4
- d = _MSC_VER / 1 return 0;
5
-}
6
-b2b2,0,sizeof(b2)strcpy(b2b2b2vx[1000]return 0;
7
-}
8
-;
9
- char b[1024b[strlen(b)-1] =0; return 0"gv[1],"fMSC_VER)
10
- fopen(argv[1
--- a/win/version.c
+++ b/win/version.c
@@ -1,10 +0,0 @@
1 fopen(argv[1],"gv[1],exists to do the job that AWK would do for the unix
2 ** makefile - to extract information from the "mainfest" and "manifest.uuid"
3 ** files for this p)
4 d = _MSC_VER / 1 return 0;
5 }
6 b2b2,0,sizeof(b2)strcpy(b2b2b2vx[1000]return 0;
7 }
8 ;
9 char b[1024b[strlen(b)-1] =0; return 0"gv[1],"fMSC_VER)
10 fopen(argv[1
--- a/win/version.c
+++ b/win/version.c
@@ -1,10 +0,0 @@
 
 
 
 
 
 
 
 
 
 

Keyboard Shortcuts

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