Fossil SCM

Fixes to the windows makefiles to support sequential version numbers.

drh 2011-06-18 17:02 trunk
Commit 30b0986d93c6d918acf3916fa3e52fe8b3457943
Parent e0303181a568fe9…
5 files changed +6 -6 +2 -2 +1 -1 +1 -1 +2 -2
~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
M src/makemake.tcl
+6 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -398,11 +398,11 @@
398398
 # the repository after running the tests.
399399
 test: $(APPNAME)
400400
 $(TCLSH) test/tester.tcl $(APPNAME)
401401
402402
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
403
- $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest >$(OBJDIR)/VERSION.h
403
+ $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
404404
405405
 EXTRAOBJ = \
406406
 $(OBJDIR)/sqlite3.o \
407407
 $(OBJDIR)/shell.o \
408408
 $(OBJDIR)/th.o \
@@ -570,11 +570,11 @@
570570
 $(TCC) -o$@ -c $**
571571
572572
 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
573573
 $(TCC) -o$@ -c $**
574574
575
-VERSION.h : version$E $B\manifest.uuid $B\manifest
575
+VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
576576
 +$** > $@
577577
578578
 page_index.h: mkindex$E $(SRC)
579579
 +$** > $@
580580
@@ -692,11 +692,11 @@
692692
 $(BCC) $**
693693
694694
 mkindex$E: $(SRCDIR)\mkindex.c
695695
 $(BCC) $**
696696
697
-version$E: $B\src\mkversion.c
697
+mkversion$E: $B\src\mkversion.c
698698
 $(BCC) $**
699699
700700
 $(OX)\shell$O : $(SRCDIR)\shell.c
701701
 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
702702
@@ -707,11 +707,11 @@
707707
 $(TCC) /Fo$@ -c $**
708708
709709
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
710710
 $(TCC) /Fo$@ -c $**
711711
712
-VERSION.h : version$E $B\manifest.uuid $B\manifest
712
+VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
713713
 $** > $@
714714
715715
 page_index.h: mkindex$E $(SRC)
716716
 $** > $@
717717
@@ -891,12 +891,12 @@
891891
 # generate the index source, containing all web references,..
892892
 page_index.h: $(TRANSLATEDSRC) mkindex.exe
893893
 mkindex.exe $(TRANSLATEDSRC) >$@
894894
895895
 # extracting version info from manifest
896
-VERSION.h: version.exe ..\manifest.uuid ..\manifest
897
- version.exe ..\manifest.uuid ..\manifest > $@
896
+VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
897
+ version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
898898
899899
 # generate the simplified headers
900900
 headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
901901
 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
902902
 echo Done >$@
903903
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -398,11 +398,11 @@
398 # the repository after running the tests.
399 test: $(APPNAME)
400 $(TCLSH) test/tester.tcl $(APPNAME)
401
402 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
403 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest >$(OBJDIR)/VERSION.h
404
405 EXTRAOBJ = \
406 $(OBJDIR)/sqlite3.o \
407 $(OBJDIR)/shell.o \
408 $(OBJDIR)/th.o \
@@ -570,11 +570,11 @@
570 $(TCC) -o$@ -c $**
571
572 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
573 $(TCC) -o$@ -c $**
574
575 VERSION.h : version$E $B\manifest.uuid $B\manifest
576 +$** > $@
577
578 page_index.h: mkindex$E $(SRC)
579 +$** > $@
580
@@ -692,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
@@ -707,11 +707,11 @@
707 $(TCC) /Fo$@ -c $**
708
709 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
710 $(TCC) /Fo$@ -c $**
711
712 VERSION.h : version$E $B\manifest.uuid $B\manifest
713 $** > $@
714
715 page_index.h: mkindex$E $(SRC)
716 $** > $@
717
@@ -891,12 +891,12 @@
891 # generate the index source, containing all web references,..
892 page_index.h: $(TRANSLATEDSRC) mkindex.exe
893 mkindex.exe $(TRANSLATEDSRC) >$@
894
895 # extracting version info from manifest
896 VERSION.h: version.exe ..\manifest.uuid ..\manifest
897 version.exe ..\manifest.uuid ..\manifest > $@
898
899 # generate the simplified headers
900 headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
901 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
902 echo Done >$@
903
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -398,11 +398,11 @@
398 # the repository after running the tests.
399 test: $(APPNAME)
400 $(TCLSH) test/tester.tcl $(APPNAME)
401
402 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
403 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
404
405 EXTRAOBJ = \
406 $(OBJDIR)/sqlite3.o \
407 $(OBJDIR)/shell.o \
408 $(OBJDIR)/th.o \
@@ -570,11 +570,11 @@
570 $(TCC) -o$@ -c $**
571
572 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
573 $(TCC) -o$@ -c $**
574
575 VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
576 +$** > $@
577
578 page_index.h: mkindex$E $(SRC)
579 +$** > $@
580
@@ -692,11 +692,11 @@
692 $(BCC) $**
693
694 mkindex$E: $(SRCDIR)\mkindex.c
695 $(BCC) $**
696
697 mkversion$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
@@ -707,11 +707,11 @@
707 $(TCC) /Fo$@ -c $**
708
709 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
710 $(TCC) /Fo$@ -c $**
711
712 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
713 $** > $@
714
715 page_index.h: mkindex$E $(SRC)
716 $** > $@
717
@@ -891,12 +891,12 @@
891 # generate the index source, containing all web references,..
892 page_index.h: $(TRANSLATEDSRC) mkindex.exe
893 mkindex.exe $(TRANSLATEDSRC) >$@
894
895 # extracting version info from manifest
896 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
897 version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
898
899 # generate the simplified headers
900 headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
901 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
902 echo Done >$@
903
M win/Makefile.PellesCGMake
+2 -2
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -138,12 +138,12 @@
138138
 # generate the index source, containing all web references,..
139139
 page_index.h: $(TRANSLATEDSRC) mkindex.exe
140140
 mkindex.exe $(TRANSLATEDSRC) >$@
141141
142142
 # extracting version info from manifest
143
-VERSION.h: version.exe ..\manifest.uuid ..\manifest
144
- version.exe ..\manifest.uuid ..\manifest > $@
143
+VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
144
+ version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
145145
146146
 # generate the simplified headers
147147
 headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
148148
 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
149149
 echo Done >$@
150150
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -138,12 +138,12 @@
138 # generate the index source, containing all web references,..
139 page_index.h: $(TRANSLATEDSRC) mkindex.exe
140 mkindex.exe $(TRANSLATEDSRC) >$@
141
142 # extracting version info from manifest
143 VERSION.h: version.exe ..\manifest.uuid ..\manifest
144 version.exe ..\manifest.uuid ..\manifest > $@
145
146 # generate the simplified headers
147 headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
148 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
149 echo Done >$@
150
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -138,12 +138,12 @@
138 # generate the index source, containing all web references,..
139 page_index.h: $(TRANSLATEDSRC) mkindex.exe
140 mkindex.exe $(TRANSLATEDSRC) >$@
141
142 # extracting version info from manifest
143 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
144 version.exe ..\manifest.uuid ..\manifest ..\VERSION > $@
145
146 # generate the simplified headers
147 headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h
148 makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h
149 echo Done >$@
150
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -73,11 +73,11 @@
7373
 $(TCC) -o$@ -c $**
7474
7575
 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
7676
 $(TCC) -o$@ -c $**
7777
78
-VERSION.h : version$E $B\manifest.uuid $B\manifest
78
+VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
7979
 +$** > $@
8080
8181
 page_index.h: mkindex$E $(SRC)
8282
 +$** > $@
8383
8484
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -73,11 +73,11 @@
73 $(TCC) -o$@ -c $**
74
75 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
76 $(TCC) -o$@ -c $**
77
78 VERSION.h : version$E $B\manifest.uuid $B\manifest
79 +$** > $@
80
81 page_index.h: mkindex$E $(SRC)
82 +$** > $@
83
84
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -73,11 +73,11 @@
73 $(TCC) -o$@ -c $**
74
75 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
76 $(TCC) -o$@ -c $**
77
78 VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
79 +$** > $@
80
81 page_index.h: mkindex$E $(SRC)
82 +$** > $@
83
84
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -361,11 +361,11 @@
361361
 # the repository after running the tests.
362362
 test: $(APPNAME)
363363
 $(TCLSH) test/tester.tcl $(APPNAME)
364364
365365
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
366
- $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest >$(OBJDIR)/VERSION.h
366
+ $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
367367
368368
 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
369369
370370
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
371371
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
372372
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -361,11 +361,11 @@
361 # the repository after running the tests.
362 test: $(APPNAME)
363 $(TCLSH) test/tester.tcl $(APPNAME)
364
365 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
366 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest >$(OBJDIR)/VERSION.h
367
368 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
369
370 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
371 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
372
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -361,11 +361,11 @@
361 # the repository after running the tests.
362 test: $(APPNAME)
363 $(TCLSH) test/tester.tcl $(APPNAME)
364
365 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
366 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
367
368 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
369
370 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
371 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
372
M win/Makefile.msc
+2 -2
--- 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\src\mkversion.c
158
+mkversion$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
@@ -168,11 +168,11 @@
168168
 $(TCC) /Fo$@ -c $**
169169
170170
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
171171
 $(TCC) /Fo$@ -c $**
172172
173
-VERSION.h : version$E $B\manifest.uuid $B\manifest
173
+VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
174174
 $** > $@
175175
176176
 page_index.h: mkindex$E $(SRC)
177177
 $** > $@
178178
179179
--- 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
@@ -168,11 +168,11 @@
168 $(TCC) /Fo$@ -c $**
169
170 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
171 $(TCC) /Fo$@ -c $**
172
173 VERSION.h : version$E $B\manifest.uuid $B\manifest
174 $** > $@
175
176 page_index.h: mkindex$E $(SRC)
177 $** > $@
178
179
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -153,11 +153,11 @@
153 $(BCC) $**
154
155 mkindex$E: $(SRCDIR)\mkindex.c
156 $(BCC) $**
157
158 mkversion$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
@@ -168,11 +168,11 @@
168 $(TCC) /Fo$@ -c $**
169
170 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
171 $(TCC) /Fo$@ -c $**
172
173 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
174 $** > $@
175
176 page_index.h: mkindex$E $(SRC)
177 $** > $@
178
179

Keyboard Shortcuts

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