Fossil SCM

Fix the unix makefile so that the fractional seconds of the date/time stamp are omitted from MANIFEST_DATE. Fix a missing #include in win/version.c. Ticket [a312a28952056ed5ee].

drh 2011-01-14 16:57 trunk
Commit d00dbfb403c1efa1bae1abd4a4393d1ac4964e21
Parent 4ab7251fcd55733…
3 files changed +1 -1 +1 -1 +1
~ src/main.mk ~ src/makemake.tcl ~ win/version.c
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -275,11 +275,11 @@
275275
 $(TCLSH) test/tester.tcl $(APPNAME)
276276
277277
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
278278
 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
279279
 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
280
- awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}' $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
280
+ awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12,8)}' $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
281281
282282
 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
283283
284284
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
285285
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
286286
--- src/main.mk
+++ src/main.mk
@@ -275,11 +275,11 @@
275 $(TCLSH) test/tester.tcl $(APPNAME)
276
277 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
278 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
279 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
280 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}' $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
281
282 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
283
284 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
285 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
286
--- src/main.mk
+++ src/main.mk
@@ -275,11 +275,11 @@
275 $(TCLSH) test/tester.tcl $(APPNAME)
276
277 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
278 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
279 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
280 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12,8)}' $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
281
282 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
283
284 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
285 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
286
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -183,11 +183,11 @@
183183
 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' \
184184
 $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
185185
 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' \
186186
 $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
187187
 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\
188
- substr($$2,1,10),substr($$2,12)}' \
188
+ substr($$2,1,10),substr($$2,12,8)}' \
189189
 $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
190190
191191
 EXTRAOBJ = \
192192
 $(OBJDIR)/sqlite3.o \
193193
 $(OBJDIR)/shell.o \
194194
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -183,11 +183,11 @@
183 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' \
184 $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
185 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' \
186 $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
187 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\
188 substr($$2,1,10),substr($$2,12)}' \
189 $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
190
191 EXTRAOBJ = \
192 $(OBJDIR)/sqlite3.o \
193 $(OBJDIR)/shell.o \
194
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -183,11 +183,11 @@
183 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' \
184 $(SRCDIR)/../manifest.uuid >$(OBJDIR)/VERSION.h
185 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' \
186 $(SRCDIR)/../manifest.uuid >>$(OBJDIR)/VERSION.h
187 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\
188 substr($$2,1,10),substr($$2,12,8)}' \
189 $(SRCDIR)/../manifest >>$(OBJDIR)/VERSION.h
190
191 EXTRAOBJ = \
192 $(OBJDIR)/sqlite3.o \
193 $(OBJDIR)/shell.o \
194
M win/version.c
+1
--- win/version.c
+++ win/version.c
@@ -2,10 +2,11 @@
22
 ** This C program exists to do the job that AWK would do for the unix
33
 ** makefile - to extract information from the "mainfest" and "manifest.uuid"
44
 ** files for this project in order to generate the "VERSION.h" header file.
55
 */
66
 #include <stdio.h>
7
+#include <string.h>
78
89
 int main(int argc, char *argv[]){
910
 FILE *m,*u;
1011
 char b[10240];
1112
 u = fopen(argv[1],"r");
1213
--- win/version.c
+++ win/version.c
@@ -2,10 +2,11 @@
2 ** This C program exists to do the job that AWK would do for the unix
3 ** makefile - to extract information from the "mainfest" and "manifest.uuid"
4 ** files for this project in order to generate the "VERSION.h" header file.
5 */
6 #include <stdio.h>
 
7
8 int main(int argc, char *argv[]){
9 FILE *m,*u;
10 char b[10240];
11 u = fopen(argv[1],"r");
12
--- win/version.c
+++ win/version.c
@@ -2,10 +2,11 @@
2 ** This C program exists to do the job that AWK would do for the unix
3 ** makefile - to extract information from the "mainfest" and "manifest.uuid"
4 ** files for this project in order to generate the "VERSION.h" header file.
5 */
6 #include <stdio.h>
7 #include <string.h>
8
9 int main(int argc, char *argv[]){
10 FILE *m,*u;
11 char b[10240];
12 u = fopen(argv[1],"r");
13

Keyboard Shortcuts

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