Fossil SCM

Manually port all 'cosmetic' fixes from the optionalMiniz branch to trunk.

mistachkin 2014-08-25 20:51 trunk
Commit 894e72b2980e89610f870cfd066cb7f01fe7404a
Parent bdf9c708075dbe6…
9 files changed +2 -2 +3 -3 +19 -14 +2 -2 +2 -2 +8 -3 +8 -3 +4 -4 +3 -3
~ auto.def ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/fossil.rc
M auto.def
+2 -2
--- auto.def
+++ auto.def
@@ -2,11 +2,11 @@
22
33
 use cc cc-lib
44
55
 options {
66
 with-openssl:path|auto|none
7
- => {Look for openssl in the given path, or auto or none}
7
+ => {Look for OpenSSL in the given path, or auto or none}
88
 with-zlib:path => {Look for zlib in the given path}
99
 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
1010
 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
1111
 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
1212
 with-tcl-private-stubs=0
@@ -161,11 +161,11 @@
161161
 define-append EXTRA_CFLAGS $cflags
162162
 define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
163163
 define FOSSIL_ENABLE_TCL
164164
 }
165165
166
-# Helper for openssl checking
166
+# Helper for OpenSSL checking
167167
 proc check-for-openssl {msg {cflags {}}} {
168168
 msg-checking "Checking for $msg..."
169169
 set rc 0
170170
 msg-quiet cc-with [list -cflags $cflags -libs {-lssl -lcrypto}] {
171171
 if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} {
172172
--- auto.def
+++ auto.def
@@ -2,11 +2,11 @@
2
3 use cc cc-lib
4
5 options {
6 with-openssl:path|auto|none
7 => {Look for openssl in the given path, or auto or none}
8 with-zlib:path => {Look for zlib in the given path}
9 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
10 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
11 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
12 with-tcl-private-stubs=0
@@ -161,11 +161,11 @@
161 define-append EXTRA_CFLAGS $cflags
162 define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
163 define FOSSIL_ENABLE_TCL
164 }
165
166 # Helper for openssl checking
167 proc check-for-openssl {msg {cflags {}}} {
168 msg-checking "Checking for $msg..."
169 set rc 0
170 msg-quiet cc-with [list -cflags $cflags -libs {-lssl -lcrypto}] {
171 if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} {
172
--- auto.def
+++ auto.def
@@ -2,11 +2,11 @@
2
3 use cc cc-lib
4
5 options {
6 with-openssl:path|auto|none
7 => {Look for OpenSSL in the given path, or auto or none}
8 with-zlib:path => {Look for zlib in the given path}
9 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
10 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
11 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
12 with-tcl-private-stubs=0
@@ -161,11 +161,11 @@
161 define-append EXTRA_CFLAGS $cflags
162 define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
163 define FOSSIL_ENABLE_TCL
164 }
165
166 # Helper for OpenSSL checking
167 proc check-for-openssl {msg {cflags {}}} {
168 msg-checking "Checking for $msg..."
169 set rc 0
170 msg-quiet cc-with [list -cflags $cflags -libs {-lssl -lcrypto}] {
171 if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} {
172
M src/main.mk
+3 -3
--- src/main.mk
+++ src/main.mk
@@ -403,11 +403,11 @@
403403
404404
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
405405
 # to 1. If it is set to 1, then there is no need to build or link
406406
 # the sqlite3.o object. Instead, the system sqlite will be linked
407407
 # using -lsqlite3.
408
-SQLITE3_OBJ.1 =
408
+SQLITE3_OBJ.1 =
409409
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
410410
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
411411
412412
 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
413413
@@ -415,14 +415,14 @@
415415
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
416416
417417
 # This rule prevents make from using its default rules to try build
418418
 # an executable named "manifest" out of the file named "manifest.c"
419419
 #
420
-$(SRCDIR)/../manifest:
420
+$(SRCDIR)/../manifest:
421421
 # noop
422422
423
-clean:
423
+clean:
424424
 rm -rf $(OBJDIR)/* $(APPNAME)
425425
426426
427427
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
428428
 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
429429
--- src/main.mk
+++ src/main.mk
@@ -403,11 +403,11 @@
403
404 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
405 # to 1. If it is set to 1, then there is no need to build or link
406 # the sqlite3.o object. Instead, the system sqlite will be linked
407 # using -lsqlite3.
408 SQLITE3_OBJ.1 =
409 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
410 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
411
412 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
413
@@ -415,14 +415,14 @@
415 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
416
417 # This rule prevents make from using its default rules to try build
418 # an executable named "manifest" out of the file named "manifest.c"
419 #
420 $(SRCDIR)/../manifest:
421 # noop
422
423 clean:
424 rm -rf $(OBJDIR)/* $(APPNAME)
425
426
427 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
428 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
429
--- src/main.mk
+++ src/main.mk
@@ -403,11 +403,11 @@
403
404 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
405 # to 1. If it is set to 1, then there is no need to build or link
406 # the sqlite3.o object. Instead, the system sqlite will be linked
407 # using -lsqlite3.
408 SQLITE3_OBJ.1 =
409 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
410 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
411
412 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
413
@@ -415,14 +415,14 @@
415 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
416
417 # This rule prevents make from using its default rules to try build
418 # an executable named "manifest" out of the file named "manifest.c"
419 #
420 $(SRCDIR)/../manifest:
421 # noop
422
423 clean:
424 rm -rf $(OBJDIR)/* $(APPNAME)
425
426
427 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
428 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
429
M src/makemake.tcl
+19 -14
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -268,11 +268,11 @@
268268
269269
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
270270
 # to 1. If it is set to 1, then there is no need to build or link
271271
 # the sqlite3.o object. Instead, the system sqlite will be linked
272272
 # using -lsqlite3.
273
-SQLITE3_OBJ.1 =
273
+SQLITE3_OBJ.1 =
274274
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
275275
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
276276
277277
 EXTRAOBJ = \
278278
 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
@@ -286,14 +286,14 @@
286286
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
287287
288288
 # This rule prevents make from using its default rules to try build
289289
 # an executable named "manifest" out of the file named "manifest.c"
290290
 #
291
-$(SRCDIR)/../manifest:
291
+$(SRCDIR)/../manifest:
292292
 # noop
293293
294
-clean:
294
+clean:
295295
 rm -rf $(OBJDIR)/* $(APPNAME)
296296
297297
 }]
298298
299299
 set mhargs {}
@@ -580,25 +580,30 @@
580580
 #### We add the -static option here so that we can build a static
581581
 # executable that will run in a chroot jail.
582582
 #
583583
 LIB = -static
584584
585
-# MinGW: If available, use the Unicode capable runtime startup code.
585
+#### MinGW: If available, use the Unicode capable runtime startup code.
586
+#
586587
 ifndef MINGW_IS_32BIT_ONLY
587588
 LIB += -municode
588589
 endif
589590
591
+#### SQLite: If enabled, use the system SQLite library.
592
+#
590593
 ifdef USE_SYSTEM_SQLITE
591594
 LIB += -lsqlite3
592595
 endif
593596
594
-# OpenSSL: Add the necessary libraries required, if enabled.
597
+#### OpenSSL: Add the necessary libraries required, if enabled.
598
+#
595599
 ifdef FOSSIL_ENABLE_SSL
596600
 LIB += -lssl -lcrypto -lgdi32
597601
 endif
598602
599
-# Tcl: Add the necessary libraries required, if enabled.
603
+#### Tcl: Add the necessary libraries required, if enabled.
604
+#
600605
 ifdef FOSSIL_ENABLE_TCL
601606
 LIB += $(LIBTCL)
602607
 endif
603608
604609
 #### Extra arguments for linking the finished binary. Fossil needs
@@ -921,11 +926,11 @@
921926
 APPNAME = $(OBJDIR)\fossil$(E)
922927
923928
 all: $(APPNAME)
924929
925930
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
926
- cd $(OBJDIR)
931
+ cd $(OBJDIR)
927932
 $(DMDIR)\bin\link @link
928933
929934
 $(OBJDIR)\fossil.res: $B\win\fossil.rc
930935
 $(RC) $(RCFLAGS) -o$@ $**
931936
@@ -970,11 +975,11 @@
970975
 cp $@ $@
971976
972977
 VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
973978
 +$** > $@
974979
975
-page_index.h: mkindex$E $(SRC)
980
+page_index.h: mkindex$E $(SRC)
976981
 +$** > $@
977982
978983
 clean:
979984
 -del $(OBJDIR)\*.obj
980985
 -del *.obj *_.c *.h *.map
@@ -1168,31 +1173,31 @@
11681173
11691174
 all: $(OX) $(APPNAME)
11701175
11711176
 zlib:
11721177
 @echo Building zlib from "$(ZLIBDIR)"...
1173
- @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1178
+ @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
11741179
11751180
 !ifdef FOSSIL_ENABLE_SSL
11761181
 openssl:
11771182
 @echo Building OpenSSL from "$(SSLDIR)"...
11781183
 !if "$(PERLDIR)" != ""
11791184
 @set PATH=$(PERLDIR);$(PATH)
11801185
 !endif
11811186
 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
11821187
 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1183
- @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1188
+ @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
11841189
 !endif
11851190
11861191
 EXTRATARGETS = $(EXTRATARGETS) zlib
11871192
11881193
 !ifdef FOSSIL_ENABLE_SSL
11891194
 EXTRATARGETS = $(EXTRATARGETS) openssl
11901195
 !endif
11911196
11921197
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
1193
- cd $(OX)
1198
+ cd $(OX)
11941199
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
11951200
11961201
 $(OX)\linkopts: $B\win\Makefile.msc}
11971202
 set redir {>}
11981203
 foreach s [lsort [concat $src $AdditionalObj]] {
@@ -1235,11 +1240,11 @@
12351240
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
12361241
 $** > $@
12371242
 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
12381243
 $(TCC) /Fo$@ /c $**
12391244
1240
-page_index.h: mkindex$E $(SRC)
1245
+page_index.h: mkindex$E $(SRC)
12411246
 $** > $@
12421247
12431248
 clean:
12441249
 -del $(OX)\*.obj
12451250
 -del *.obj
@@ -1353,13 +1358,13 @@
13531358
 # and
13541359
 # PellesC 6.00.4
13551360
 # gmake 3.80
13561361
 # zlib sources 1.2.5
13571362
 # Windows 7 Home Premium
1358
-#
1363
+#
13591364
1360
-#
1365
+#
13611366
 PellesCDir=c:\Programme\PellesC
13621367
13631368
 # Select between 32/64 bit code, default is 32 bit
13641369
 #TARGETVERSION=64
13651370
13661371
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -268,11 +268,11 @@
268
269 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
270 # to 1. If it is set to 1, then there is no need to build or link
271 # the sqlite3.o object. Instead, the system sqlite will be linked
272 # using -lsqlite3.
273 SQLITE3_OBJ.1 =
274 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
275 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
276
277 EXTRAOBJ = \
278 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
@@ -286,14 +286,14 @@
286 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
287
288 # This rule prevents make from using its default rules to try build
289 # an executable named "manifest" out of the file named "manifest.c"
290 #
291 $(SRCDIR)/../manifest:
292 # noop
293
294 clean:
295 rm -rf $(OBJDIR)/* $(APPNAME)
296
297 }]
298
299 set mhargs {}
@@ -580,25 +580,30 @@
580 #### We add the -static option here so that we can build a static
581 # executable that will run in a chroot jail.
582 #
583 LIB = -static
584
585 # MinGW: If available, use the Unicode capable runtime startup code.
 
586 ifndef MINGW_IS_32BIT_ONLY
587 LIB += -municode
588 endif
589
 
 
590 ifdef USE_SYSTEM_SQLITE
591 LIB += -lsqlite3
592 endif
593
594 # OpenSSL: Add the necessary libraries required, if enabled.
 
595 ifdef FOSSIL_ENABLE_SSL
596 LIB += -lssl -lcrypto -lgdi32
597 endif
598
599 # Tcl: Add the necessary libraries required, if enabled.
 
600 ifdef FOSSIL_ENABLE_TCL
601 LIB += $(LIBTCL)
602 endif
603
604 #### Extra arguments for linking the finished binary. Fossil needs
@@ -921,11 +926,11 @@
921 APPNAME = $(OBJDIR)\fossil$(E)
922
923 all: $(APPNAME)
924
925 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
926 cd $(OBJDIR)
927 $(DMDIR)\bin\link @link
928
929 $(OBJDIR)\fossil.res: $B\win\fossil.rc
930 $(RC) $(RCFLAGS) -o$@ $**
931
@@ -970,11 +975,11 @@
970 cp $@ $@
971
972 VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
973 +$** > $@
974
975 page_index.h: mkindex$E $(SRC)
976 +$** > $@
977
978 clean:
979 -del $(OBJDIR)\*.obj
980 -del *.obj *_.c *.h *.map
@@ -1168,31 +1173,31 @@
1168
1169 all: $(OX) $(APPNAME)
1170
1171 zlib:
1172 @echo Building zlib from "$(ZLIBDIR)"...
1173 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1174
1175 !ifdef FOSSIL_ENABLE_SSL
1176 openssl:
1177 @echo Building OpenSSL from "$(SSLDIR)"...
1178 !if "$(PERLDIR)" != ""
1179 @set PATH=$(PERLDIR);$(PATH)
1180 !endif
1181 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1182 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1183 @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1184 !endif
1185
1186 EXTRATARGETS = $(EXTRATARGETS) zlib
1187
1188 !ifdef FOSSIL_ENABLE_SSL
1189 EXTRATARGETS = $(EXTRATARGETS) openssl
1190 !endif
1191
1192 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
1193 cd $(OX)
1194 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1195
1196 $(OX)\linkopts: $B\win\Makefile.msc}
1197 set redir {>}
1198 foreach s [lsort [concat $src $AdditionalObj]] {
@@ -1235,11 +1240,11 @@
1235 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1236 $** > $@
1237 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1238 $(TCC) /Fo$@ /c $**
1239
1240 page_index.h: mkindex$E $(SRC)
1241 $** > $@
1242
1243 clean:
1244 -del $(OX)\*.obj
1245 -del *.obj
@@ -1353,13 +1358,13 @@
1353 # and
1354 # PellesC 6.00.4
1355 # gmake 3.80
1356 # zlib sources 1.2.5
1357 # Windows 7 Home Premium
1358 #
1359
1360 #
1361 PellesCDir=c:\Programme\PellesC
1362
1363 # Select between 32/64 bit code, default is 32 bit
1364 #TARGETVERSION=64
1365
1366
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -268,11 +268,11 @@
268
269 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
270 # to 1. If it is set to 1, then there is no need to build or link
271 # the sqlite3.o object. Instead, the system sqlite will be linked
272 # using -lsqlite3.
273 SQLITE3_OBJ.1 =
274 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
275 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
276
277 EXTRAOBJ = \
278 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
@@ -286,14 +286,14 @@
286 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
287
288 # This rule prevents make from using its default rules to try build
289 # an executable named "manifest" out of the file named "manifest.c"
290 #
291 $(SRCDIR)/../manifest:
292 # noop
293
294 clean:
295 rm -rf $(OBJDIR)/* $(APPNAME)
296
297 }]
298
299 set mhargs {}
@@ -580,25 +580,30 @@
580 #### We add the -static option here so that we can build a static
581 # executable that will run in a chroot jail.
582 #
583 LIB = -static
584
585 #### MinGW: If available, use the Unicode capable runtime startup code.
586 #
587 ifndef MINGW_IS_32BIT_ONLY
588 LIB += -municode
589 endif
590
591 #### SQLite: If enabled, use the system SQLite library.
592 #
593 ifdef USE_SYSTEM_SQLITE
594 LIB += -lsqlite3
595 endif
596
597 #### OpenSSL: Add the necessary libraries required, if enabled.
598 #
599 ifdef FOSSIL_ENABLE_SSL
600 LIB += -lssl -lcrypto -lgdi32
601 endif
602
603 #### Tcl: Add the necessary libraries required, if enabled.
604 #
605 ifdef FOSSIL_ENABLE_TCL
606 LIB += $(LIBTCL)
607 endif
608
609 #### Extra arguments for linking the finished binary. Fossil needs
@@ -921,11 +926,11 @@
926 APPNAME = $(OBJDIR)\fossil$(E)
927
928 all: $(APPNAME)
929
930 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
931 cd $(OBJDIR)
932 $(DMDIR)\bin\link @link
933
934 $(OBJDIR)\fossil.res: $B\win\fossil.rc
935 $(RC) $(RCFLAGS) -o$@ $**
936
@@ -970,11 +975,11 @@
975 cp $@ $@
976
977 VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
978 +$** > $@
979
980 page_index.h: mkindex$E $(SRC)
981 +$** > $@
982
983 clean:
984 -del $(OBJDIR)\*.obj
985 -del *.obj *_.c *.h *.map
@@ -1168,31 +1173,31 @@
1173
1174 all: $(OX) $(APPNAME)
1175
1176 zlib:
1177 @echo Building zlib from "$(ZLIBDIR)"...
1178 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1179
1180 !ifdef FOSSIL_ENABLE_SSL
1181 openssl:
1182 @echo Building OpenSSL from "$(SSLDIR)"...
1183 !if "$(PERLDIR)" != ""
1184 @set PATH=$(PERLDIR);$(PATH)
1185 !endif
1186 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1187 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1188 @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1189 !endif
1190
1191 EXTRATARGETS = $(EXTRATARGETS) zlib
1192
1193 !ifdef FOSSIL_ENABLE_SSL
1194 EXTRATARGETS = $(EXTRATARGETS) openssl
1195 !endif
1196
1197 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
1198 cd $(OX)
1199 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1200
1201 $(OX)\linkopts: $B\win\Makefile.msc}
1202 set redir {>}
1203 foreach s [lsort [concat $src $AdditionalObj]] {
@@ -1235,11 +1240,11 @@
1240 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1241 $** > $@
1242 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1243 $(TCC) /Fo$@ /c $**
1244
1245 page_index.h: mkindex$E $(SRC)
1246 $** > $@
1247
1248 clean:
1249 -del $(OX)\*.obj
1250 -del *.obj
@@ -1353,13 +1358,13 @@
1358 # and
1359 # PellesC 6.00.4
1360 # gmake 3.80
1361 # zlib sources 1.2.5
1362 # Windows 7 Home Premium
1363 #
1364
1365 #
1366 PellesCDir=c:\Programme\PellesC
1367
1368 # Select between 32/64 bit code, default is 32 bit
1369 #TARGETVERSION=64
1370
1371
M win/Makefile.PellesCGMake
+2 -2
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -30,13 +30,13 @@
3030
 # and
3131
 # PellesC 6.00.4
3232
 # gmake 3.80
3333
 # zlib sources 1.2.5
3434
 # Windows 7 Home Premium
35
-#
35
+#
3636
37
-#
37
+#
3838
 PellesCDir=c:\Programme\PellesC
3939
4040
 # Select between 32/64 bit code, default is 32 bit
4141
 #TARGETVERSION=64
4242
4343
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -30,13 +30,13 @@
30 # and
31 # PellesC 6.00.4
32 # gmake 3.80
33 # zlib sources 1.2.5
34 # Windows 7 Home Premium
35 #
36
37 #
38 PellesCDir=c:\Programme\PellesC
39
40 # Select between 32/64 bit code, default is 32 bit
41 #TARGETVERSION=64
42
43
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -30,13 +30,13 @@
30 # and
31 # PellesC 6.00.4
32 # gmake 3.80
33 # zlib sources 1.2.5
34 # Windows 7 Home Premium
35 #
36
37 #
38 PellesCDir=c:\Programme\PellesC
39
40 # Select between 32/64 bit code, default is 32 bit
41 #TARGETVERSION=64
42
43
M win/Makefile.dmc
+2 -2
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -41,11 +41,11 @@
4141
 APPNAME = $(OBJDIR)\fossil$(E)
4242
4343
 all: $(APPNAME)
4444
4545
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
46
- cd $(OBJDIR)
46
+ cd $(OBJDIR)
4747
 $(DMDIR)\bin\link @link
4848
4949
 $(OBJDIR)\fossil.res: $B\win\fossil.rc
5050
 $(RC) $(RCFLAGS) -o$@ $**
5151
@@ -85,11 +85,11 @@
8585
 cp $@ $@
8686
8787
 VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
8888
 +$** > $@
8989
90
-page_index.h: mkindex$E $(SRC)
90
+page_index.h: mkindex$E $(SRC)
9191
 +$** > $@
9292
9393
 clean:
9494
 -del $(OBJDIR)\*.obj
9595
 -del *.obj *_.c *.h *.map
9696
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -41,11 +41,11 @@
41 APPNAME = $(OBJDIR)\fossil$(E)
42
43 all: $(APPNAME)
44
45 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
46 cd $(OBJDIR)
47 $(DMDIR)\bin\link @link
48
49 $(OBJDIR)\fossil.res: $B\win\fossil.rc
50 $(RC) $(RCFLAGS) -o$@ $**
51
@@ -85,11 +85,11 @@
85 cp $@ $@
86
87 VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
88 +$** > $@
89
90 page_index.h: mkindex$E $(SRC)
91 +$** > $@
92
93 clean:
94 -del $(OBJDIR)\*.obj
95 -del *.obj *_.c *.h *.map
96
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -41,11 +41,11 @@
41 APPNAME = $(OBJDIR)\fossil$(E)
42
43 all: $(APPNAME)
44
45 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
46 cd $(OBJDIR)
47 $(DMDIR)\bin\link @link
48
49 $(OBJDIR)\fossil.res: $B\win\fossil.rc
50 $(RC) $(RCFLAGS) -o$@ $**
51
@@ -85,11 +85,11 @@
85 cp $@ $@
86
87 VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
88 +$** > $@
89
90 page_index.h: mkindex$E $(SRC)
91 +$** > $@
92
93 clean:
94 -del $(OBJDIR)\*.obj
95 -del *.obj *_.c *.h *.map
96
M win/Makefile.mingw
+8 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -216,25 +216,30 @@
216216
 #### We add the -static option here so that we can build a static
217217
 # executable that will run in a chroot jail.
218218
 #
219219
 LIB = -static
220220
221
-# MinGW: If available, use the Unicode capable runtime startup code.
221
+#### MinGW: If available, use the Unicode capable runtime startup code.
222
+#
222223
 ifndef MINGW_IS_32BIT_ONLY
223224
 LIB += -municode
224225
 endif
225226
227
+#### SQLite: If enabled, use the system SQLite library.
228
+#
226229
 ifdef USE_SYSTEM_SQLITE
227230
 LIB += -lsqlite3
228231
 endif
229232
230
-# OpenSSL: Add the necessary libraries required, if enabled.
233
+#### OpenSSL: Add the necessary libraries required, if enabled.
234
+#
231235
 ifdef FOSSIL_ENABLE_SSL
232236
 LIB += -lssl -lcrypto -lgdi32
233237
 endif
234238
235
-# Tcl: Add the necessary libraries required, if enabled.
239
+#### Tcl: Add the necessary libraries required, if enabled.
240
+#
236241
 ifdef FOSSIL_ENABLE_TCL
237242
 LIB += $(LIBTCL)
238243
 endif
239244
240245
 #### Extra arguments for linking the finished binary. Fossil needs
241246
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -216,25 +216,30 @@
216 #### We add the -static option here so that we can build a static
217 # executable that will run in a chroot jail.
218 #
219 LIB = -static
220
221 # MinGW: If available, use the Unicode capable runtime startup code.
 
222 ifndef MINGW_IS_32BIT_ONLY
223 LIB += -municode
224 endif
225
 
 
226 ifdef USE_SYSTEM_SQLITE
227 LIB += -lsqlite3
228 endif
229
230 # OpenSSL: Add the necessary libraries required, if enabled.
 
231 ifdef FOSSIL_ENABLE_SSL
232 LIB += -lssl -lcrypto -lgdi32
233 endif
234
235 # Tcl: Add the necessary libraries required, if enabled.
 
236 ifdef FOSSIL_ENABLE_TCL
237 LIB += $(LIBTCL)
238 endif
239
240 #### Extra arguments for linking the finished binary. Fossil needs
241
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -216,25 +216,30 @@
216 #### We add the -static option here so that we can build a static
217 # executable that will run in a chroot jail.
218 #
219 LIB = -static
220
221 #### MinGW: If available, use the Unicode capable runtime startup code.
222 #
223 ifndef MINGW_IS_32BIT_ONLY
224 LIB += -municode
225 endif
226
227 #### SQLite: If enabled, use the system SQLite library.
228 #
229 ifdef USE_SYSTEM_SQLITE
230 LIB += -lsqlite3
231 endif
232
233 #### OpenSSL: Add the necessary libraries required, if enabled.
234 #
235 ifdef FOSSIL_ENABLE_SSL
236 LIB += -lssl -lcrypto -lgdi32
237 endif
238
239 #### Tcl: Add the necessary libraries required, if enabled.
240 #
241 ifdef FOSSIL_ENABLE_TCL
242 LIB += $(LIBTCL)
243 endif
244
245 #### Extra arguments for linking the finished binary. Fossil needs
246
M win/Makefile.mingw.mistachkin
+8 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -216,25 +216,30 @@
216216
 #### We add the -static option here so that we can build a static
217217
 # executable that will run in a chroot jail.
218218
 #
219219
 LIB = -static
220220
221
-# MinGW: If available, use the Unicode capable runtime startup code.
221
+#### MinGW: If available, use the Unicode capable runtime startup code.
222
+#
222223
 ifndef MINGW_IS_32BIT_ONLY
223224
 LIB += -municode
224225
 endif
225226
227
+#### SQLite: If enabled, use the system SQLite library.
228
+#
226229
 ifdef USE_SYSTEM_SQLITE
227230
 LIB += -lsqlite3
228231
 endif
229232
230
-# OpenSSL: Add the necessary libraries required, if enabled.
233
+#### OpenSSL: Add the necessary libraries required, if enabled.
234
+#
231235
 ifdef FOSSIL_ENABLE_SSL
232236
 LIB += -lssl -lcrypto -lgdi32
233237
 endif
234238
235
-# Tcl: Add the necessary libraries required, if enabled.
239
+#### Tcl: Add the necessary libraries required, if enabled.
240
+#
236241
 ifdef FOSSIL_ENABLE_TCL
237242
 LIB += $(LIBTCL)
238243
 endif
239244
240245
 #### Extra arguments for linking the finished binary. Fossil needs
241246
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -216,25 +216,30 @@
216 #### We add the -static option here so that we can build a static
217 # executable that will run in a chroot jail.
218 #
219 LIB = -static
220
221 # MinGW: If available, use the Unicode capable runtime startup code.
 
222 ifndef MINGW_IS_32BIT_ONLY
223 LIB += -municode
224 endif
225
 
 
226 ifdef USE_SYSTEM_SQLITE
227 LIB += -lsqlite3
228 endif
229
230 # OpenSSL: Add the necessary libraries required, if enabled.
 
231 ifdef FOSSIL_ENABLE_SSL
232 LIB += -lssl -lcrypto -lgdi32
233 endif
234
235 # Tcl: Add the necessary libraries required, if enabled.
 
236 ifdef FOSSIL_ENABLE_TCL
237 LIB += $(LIBTCL)
238 endif
239
240 #### Extra arguments for linking the finished binary. Fossil needs
241
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -216,25 +216,30 @@
216 #### We add the -static option here so that we can build a static
217 # executable that will run in a chroot jail.
218 #
219 LIB = -static
220
221 #### MinGW: If available, use the Unicode capable runtime startup code.
222 #
223 ifndef MINGW_IS_32BIT_ONLY
224 LIB += -municode
225 endif
226
227 #### SQLite: If enabled, use the system SQLite library.
228 #
229 ifdef USE_SYSTEM_SQLITE
230 LIB += -lsqlite3
231 endif
232
233 #### OpenSSL: Add the necessary libraries required, if enabled.
234 #
235 ifdef FOSSIL_ENABLE_SSL
236 LIB += -lssl -lcrypto -lgdi32
237 endif
238
239 #### Tcl: Add the necessary libraries required, if enabled.
240 #
241 ifdef FOSSIL_ENABLE_TCL
242 LIB += $(LIBTCL)
243 endif
244
245 #### Extra arguments for linking the finished binary. Fossil needs
246
M win/Makefile.msc
+4 -4
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -359,31 +359,31 @@
359359
360360
 all: $(OX) $(APPNAME)
361361
362362
 zlib:
363363
 @echo Building zlib from "$(ZLIBDIR)"...
364
- @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
364
+ @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
365365
366366
 !ifdef FOSSIL_ENABLE_SSL
367367
 openssl:
368368
 @echo Building OpenSSL from "$(SSLDIR)"...
369369
 !if "$(PERLDIR)" != ""
370370
 @set PATH=$(PERLDIR);$(PATH)
371371
 !endif
372372
 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
373373
 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
374
- @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
374
+ @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
375375
 !endif
376376
377377
 EXTRATARGETS = $(EXTRATARGETS) zlib
378378
379379
 !ifdef FOSSIL_ENABLE_SSL
380380
 EXTRATARGETS = $(EXTRATARGETS) openssl
381381
 !endif
382382
383383
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
384
- cd $(OX)
384
+ cd $(OX)
385385
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
386386
387387
 $(OX)\linkopts: $B\win\Makefile.msc
388388
 echo $(OX)\add.obj > $@
389389
 echo $(OX)\allrepo.obj >> $@
@@ -537,11 +537,11 @@
537537
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
538538
 $** > $@
539539
 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
540540
 $(TCC) /Fo$@ /c $**
541541
542
-page_index.h: mkindex$E $(SRC)
542
+page_index.h: mkindex$E $(SRC)
543543
 $** > $@
544544
545545
 clean:
546546
 -del $(OX)\*.obj
547547
 -del *.obj
548548
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -359,31 +359,31 @@
359
360 all: $(OX) $(APPNAME)
361
362 zlib:
363 @echo Building zlib from "$(ZLIBDIR)"...
364 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
365
366 !ifdef FOSSIL_ENABLE_SSL
367 openssl:
368 @echo Building OpenSSL from "$(SSLDIR)"...
369 !if "$(PERLDIR)" != ""
370 @set PATH=$(PERLDIR);$(PATH)
371 !endif
372 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
373 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
374 @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
375 !endif
376
377 EXTRATARGETS = $(EXTRATARGETS) zlib
378
379 !ifdef FOSSIL_ENABLE_SSL
380 EXTRATARGETS = $(EXTRATARGETS) openssl
381 !endif
382
383 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
384 cd $(OX)
385 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
386
387 $(OX)\linkopts: $B\win\Makefile.msc
388 echo $(OX)\add.obj > $@
389 echo $(OX)\allrepo.obj >> $@
@@ -537,11 +537,11 @@
537 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
538 $** > $@
539 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
540 $(TCC) /Fo$@ /c $**
541
542 page_index.h: mkindex$E $(SRC)
543 $** > $@
544
545 clean:
546 -del $(OX)\*.obj
547 -del *.obj
548
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -359,31 +359,31 @@
359
360 all: $(OX) $(APPNAME)
361
362 zlib:
363 @echo Building zlib from "$(ZLIBDIR)"...
364 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
365
366 !ifdef FOSSIL_ENABLE_SSL
367 openssl:
368 @echo Building OpenSSL from "$(SSLDIR)"...
369 !if "$(PERLDIR)" != ""
370 @set PATH=$(PERLDIR);$(PATH)
371 !endif
372 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
373 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
374 @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
375 !endif
376
377 EXTRATARGETS = $(EXTRATARGETS) zlib
378
379 !ifdef FOSSIL_ENABLE_SSL
380 EXTRATARGETS = $(EXTRATARGETS) openssl
381 !endif
382
383 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
384 cd $(OX)
385 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
386
387 $(OX)\linkopts: $B\win\Makefile.msc
388 echo $(OX)\add.obj > $@
389 echo $(OX)\allrepo.obj >> $@
@@ -537,11 +537,11 @@
537 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
538 $** > $@
539 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
540 $(TCC) /Fo$@ /c $**
541
542 page_index.h: mkindex$E $(SRC)
543 $** > $@
544
545 clean:
546 -del $(OX)\*.obj
547 -del *.obj
548
M win/fossil.rc
+3 -3
--- win/fossil.rc
+++ win/fossil.rc
@@ -105,11 +105,11 @@
105105
 #endif /* defined(FOSSIL_ENABLE_SSL) */
106106
 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
107107
 VALUE "Th1Hooks", "Yes\0"
108108
 #else
109109
 VALUE "Th1Hooks", "No\0"
110
-#endif
110
+#endif /* defined(FOSSIL_ENABLE_TH1_HOOKS) */
111111
 #if defined(FOSSIL_ENABLE_TCL)
112112
 VALUE "TclEnabled", "Yes, Tcl " TCL_PATCH_LEVEL "\0"
113113
 #if defined(USE_TCL_STUBS)
114114
 VALUE "UseTclStubsEnabled", "Yes\0"
115115
 #else
@@ -142,12 +142,12 @@
142142
 * This embedded manifest is needed for Windows 8.1.
143143
 */
144144
145145
 #ifndef RT_MANIFEST
146146
 #define RT_MANIFEST 24
147
-#endif
147
+#endif /* RT_MANIFEST */
148148
149149
 #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
150150
 #define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
151
-#endif
151
+#endif /* CREATEPROCESS_MANIFEST_RESOURCE_ID */
152152
153153
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fossil.exe.manifest"
154154
--- win/fossil.rc
+++ win/fossil.rc
@@ -105,11 +105,11 @@
105 #endif /* defined(FOSSIL_ENABLE_SSL) */
106 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
107 VALUE "Th1Hooks", "Yes\0"
108 #else
109 VALUE "Th1Hooks", "No\0"
110 #endif
111 #if defined(FOSSIL_ENABLE_TCL)
112 VALUE "TclEnabled", "Yes, Tcl " TCL_PATCH_LEVEL "\0"
113 #if defined(USE_TCL_STUBS)
114 VALUE "UseTclStubsEnabled", "Yes\0"
115 #else
@@ -142,12 +142,12 @@
142 * This embedded manifest is needed for Windows 8.1.
143 */
144
145 #ifndef RT_MANIFEST
146 #define RT_MANIFEST 24
147 #endif
148
149 #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
150 #define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
151 #endif
152
153 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fossil.exe.manifest"
154
--- win/fossil.rc
+++ win/fossil.rc
@@ -105,11 +105,11 @@
105 #endif /* defined(FOSSIL_ENABLE_SSL) */
106 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
107 VALUE "Th1Hooks", "Yes\0"
108 #else
109 VALUE "Th1Hooks", "No\0"
110 #endif /* defined(FOSSIL_ENABLE_TH1_HOOKS) */
111 #if defined(FOSSIL_ENABLE_TCL)
112 VALUE "TclEnabled", "Yes, Tcl " TCL_PATCH_LEVEL "\0"
113 #if defined(USE_TCL_STUBS)
114 VALUE "UseTclStubsEnabled", "Yes\0"
115 #else
@@ -142,12 +142,12 @@
142 * This embedded manifest is needed for Windows 8.1.
143 */
144
145 #ifndef RT_MANIFEST
146 #define RT_MANIFEST 24
147 #endif /* RT_MANIFEST */
148
149 #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
150 #define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
151 #endif /* CREATEPROCESS_MANIFEST_RESOURCE_ID */
152
153 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fossil.exe.manifest"
154

Keyboard Shortcuts

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