Fossil SCM

merge trunk. Slightly simpler SELECT

jan.nijtmans 2013-10-16 13:39 tkt-change-hook merge
Commit 900bfb377d62e9f9980b95b30a0bb917a0dafb34
Parent 52861df1e93f5c5…
7 files changed +1 -1 +1 -1 +1 -1 +38 -28 +1 -1 +1 -1 +38 -28
~ src/checkin.c ~ src/checkin.c ~ src/config.h ~ src/makemake.tcl ~ src/manifest.c ~ src/manifest.c ~ win/Makefile.msc
M src/checkin.c
+1 -1
--- src/checkin.c
+++ src/checkin.c
@@ -797,11 +797,11 @@
797797
 #else
798798
 blob_init(&prompt, zInit, -1);
799799
 #endif
800800
 blob_append(&prompt,
801801
 "\n"
802
- "# Enter comments on this check-in. Lines beginning with # are ignored.\n"
802
+ "# Enter commit message for this check-in. Lines beginning with # are ignored.\n"
803803
 "#\n", -1
804804
 );
805805
 blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : g.zLogin);
806806
 if( p->zBranch && p->zBranch[0] ){
807807
 blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch);
808808
--- src/checkin.c
+++ src/checkin.c
@@ -797,11 +797,11 @@
797 #else
798 blob_init(&prompt, zInit, -1);
799 #endif
800 blob_append(&prompt,
801 "\n"
802 "# Enter comments on this check-in. Lines beginning with # are ignored.\n"
803 "#\n", -1
804 );
805 blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : g.zLogin);
806 if( p->zBranch && p->zBranch[0] ){
807 blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch);
808
--- src/checkin.c
+++ src/checkin.c
@@ -797,11 +797,11 @@
797 #else
798 blob_init(&prompt, zInit, -1);
799 #endif
800 blob_append(&prompt,
801 "\n"
802 "# Enter commit message for this check-in. Lines beginning with # are ignored.\n"
803 "#\n", -1
804 );
805 blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : g.zLogin);
806 if( p->zBranch && p->zBranch[0] ){
807 blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch);
808
M src/checkin.c
+1 -1
--- src/checkin.c
+++ src/checkin.c
@@ -797,11 +797,11 @@
797797
 #else
798798
 blob_init(&prompt, zInit, -1);
799799
 #endif
800800
 blob_append(&prompt,
801801
 "\n"
802
- "# Enter comments on this check-in. Lines beginning with # are ignored.\n"
802
+ "# Enter commit message for this check-in. Lines beginning with # are ignored.\n"
803803
 "#\n", -1
804804
 );
805805
 blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : g.zLogin);
806806
 if( p->zBranch && p->zBranch[0] ){
807807
 blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch);
808808
--- src/checkin.c
+++ src/checkin.c
@@ -797,11 +797,11 @@
797 #else
798 blob_init(&prompt, zInit, -1);
799 #endif
800 blob_append(&prompt,
801 "\n"
802 "# Enter comments on this check-in. Lines beginning with # are ignored.\n"
803 "#\n", -1
804 );
805 blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : g.zLogin);
806 if( p->zBranch && p->zBranch[0] ){
807 blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch);
808
--- src/checkin.c
+++ src/checkin.c
@@ -797,11 +797,11 @@
797 #else
798 blob_init(&prompt, zInit, -1);
799 #endif
800 blob_append(&prompt,
801 "\n"
802 "# Enter commit message for this check-in. Lines beginning with # are ignored.\n"
803 "#\n", -1
804 );
805 blob_appendf(&prompt, "# user: %s\n", p->zUserOvrd ? p->zUserOvrd : g.zLogin);
806 if( p->zBranch && p->zBranch[0] ){
807 blob_appendf(&prompt, "# tags: %s\n#\n", p->zBranch);
808
M src/config.h
+1 -1
--- src/config.h
+++ src/config.h
@@ -26,11 +26,11 @@
2626
 # define _FILE_OFFSET_BITS 64
2727
 #endif
2828
 #define _LARGEFILE_SOURCE 1
2929
3030
 /* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */
31
-#if defined(_WIN32) && !defined(_WIN64)
31
+#if defined(_WIN32) && !defined(_WIN64) && !defined(_USE_32BIT_TIME_T)
3232
 # define _USE_32BIT_TIME_T
3333
 #endif
3434
3535
 #ifdef HAVE_AUTOCONFIG_H
3636
 #include "autoconfig.h"
3737
--- src/config.h
+++ src/config.h
@@ -26,11 +26,11 @@
26 # define _FILE_OFFSET_BITS 64
27 #endif
28 #define _LARGEFILE_SOURCE 1
29
30 /* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */
31 #if defined(_WIN32) && !defined(_WIN64)
32 # define _USE_32BIT_TIME_T
33 #endif
34
35 #ifdef HAVE_AUTOCONFIG_H
36 #include "autoconfig.h"
37
--- src/config.h
+++ src/config.h
@@ -26,11 +26,11 @@
26 # define _FILE_OFFSET_BITS 64
27 #endif
28 #define _LARGEFILE_SOURCE 1
29
30 /* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */
31 #if defined(_WIN32) && !defined(_WIN64) && !defined(_USE_32BIT_TIME_T)
32 # define _USE_32BIT_TIME_T
33 #endif
34
35 #ifdef HAVE_AUTOCONFIG_H
36 #include "autoconfig.h"
37
M src/makemake.tcl
+38 -28
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -974,10 +974,13 @@
974974
 SRCDIR = $B\src
975975
 OBJDIR = .
976976
 OX = .
977977
 O = .obj
978978
 E = .exe
979
+
980
+# Uncomment to enable debug symbols
981
+# DEBUG = 1
979982
980983
 # Uncomment to enable JSON API
981984
 # FOSSIL_ENABLE_JSON = 1
982985
983986
 # Uncomment to enable SSL support
@@ -988,37 +991,44 @@
988991
 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
989992
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
990993
 !endif
991994
992995
 # zlib options
993
-ZINCDIR = $(B)\compat\zlib
994
-ZLIBDIR = $(B)\compat\zlib
995
-ZLIB = zlib.lib
996
-
997
-INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
998
-
999
-!ifdef FOSSIL_ENABLE_SSL
1000
-INCL = $(INCL) -I$(SSLINCDIR)
1001
-!endif
1002
-
1003
-CFLAGS = -nologo -MT -O2
1004
-BCC = $(CC) $(CFLAGS)
1005
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
1006
-RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
1007
-LIBS = $(ZLIB) ws2_32.lib advapi32.lib
1008
-LIBDIR = -LIBPATH:$(ZLIBDIR)
1009
-
1010
-!ifdef FOSSIL_ENABLE_JSON
1011
-TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
1012
-RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
1013
-!endif
1014
-
1015
-!ifdef FOSSIL_ENABLE_SSL
1016
-TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
1017
-RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1018
-LIBS = $(LIBS) $(SSLLIB)
1019
-LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
996
+ZINCDIR = $(B)\compat\zlib
997
+ZLIBDIR = $(B)\compat\zlib
998
+ZLIB = zlib.lib
999
+
1000
+INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
1001
+
1002
+!ifdef FOSSIL_ENABLE_SSL
1003
+INCL = $(INCL) -I$(SSLINCDIR)
1004
+!endif
1005
+
1006
+CFLAGS = -nologo -MT -O2
1007
+LDFLAGS = /NODEFAULTLIB:msvcrt
1008
+
1009
+!ifdef DEBUG
1010
+CFLAGS = $(CFLAGS) -Zi
1011
+LDFLAGS = $(LDFLAGS) /DEBUG
1012
+!endif
1013
+
1014
+BCC = $(CC) $(CFLAGS)
1015
+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
1016
+RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
1017
+LIBS = $(ZLIB) ws2_32.lib advapi32.lib
1018
+LIBDIR = -LIBPATH:$(ZLIBDIR)
1019
+
1020
+!ifdef FOSSIL_ENABLE_JSON
1021
+TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
1022
+RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
1023
+!endif
1024
+
1025
+!ifdef FOSSIL_ENABLE_SSL
1026
+TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
1027
+RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1028
+LIBS = $(LIBS) $(SSLLIB)
1029
+LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
10201030
 !endif
10211031
 }
10221032
 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
10231033
 set j " \\\n "
10241034
 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
@@ -1053,11 +1063,11 @@
10531063
 @echo Building zlib from "$(ZLIBDIR)"...
10541064
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
10551065
10561066
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
10571067
 cd $(OX)
1058
- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1068
+ link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
10591069
10601070
 $(OX)\linkopts: $B\win\Makefile.msc}
10611071
 set redir {>}
10621072
 foreach s [lsort [concat $src $AdditionalObj]] {
10631073
 writeln "\techo \$(OX)\\$s.obj $redir \$@"
10641074
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -974,10 +974,13 @@
974 SRCDIR = $B\src
975 OBJDIR = .
976 OX = .
977 O = .obj
978 E = .exe
 
 
 
979
980 # Uncomment to enable JSON API
981 # FOSSIL_ENABLE_JSON = 1
982
983 # Uncomment to enable SSL support
@@ -988,37 +991,44 @@
988 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
989 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
990 !endif
991
992 # zlib options
993 ZINCDIR = $(B)\compat\zlib
994 ZLIBDIR = $(B)\compat\zlib
995 ZLIB = zlib.lib
996
997 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
998
999 !ifdef FOSSIL_ENABLE_SSL
1000 INCL = $(INCL) -I$(SSLINCDIR)
1001 !endif
1002
1003 CFLAGS = -nologo -MT -O2
1004 BCC = $(CC) $(CFLAGS)
1005 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
1006 RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
1007 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
1008 LIBDIR = -LIBPATH:$(ZLIBDIR)
1009
1010 !ifdef FOSSIL_ENABLE_JSON
1011 TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
1012 RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
1013 !endif
1014
1015 !ifdef FOSSIL_ENABLE_SSL
1016 TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
1017 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1018 LIBS = $(LIBS) $(SSLLIB)
1019 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
 
 
 
 
 
 
 
1020 !endif
1021 }
1022 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
1023 set j " \\\n "
1024 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
@@ -1053,11 +1063,11 @@
1053 @echo Building zlib from "$(ZLIBDIR)"...
1054 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1055
1056 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1057 cd $(OX)
1058 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1059
1060 $(OX)\linkopts: $B\win\Makefile.msc}
1061 set redir {>}
1062 foreach s [lsort [concat $src $AdditionalObj]] {
1063 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1064
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -974,10 +974,13 @@
974 SRCDIR = $B\src
975 OBJDIR = .
976 OX = .
977 O = .obj
978 E = .exe
979
980 # Uncomment to enable debug symbols
981 # DEBUG = 1
982
983 # Uncomment to enable JSON API
984 # FOSSIL_ENABLE_JSON = 1
985
986 # Uncomment to enable SSL support
@@ -988,37 +991,44 @@
991 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
992 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
993 !endif
994
995 # zlib options
996 ZINCDIR = $(B)\compat\zlib
997 ZLIBDIR = $(B)\compat\zlib
998 ZLIB = zlib.lib
999
1000 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
1001
1002 !ifdef FOSSIL_ENABLE_SSL
1003 INCL = $(INCL) -I$(SSLINCDIR)
1004 !endif
1005
1006 CFLAGS = -nologo -MT -O2
1007 LDFLAGS = /NODEFAULTLIB:msvcrt
1008
1009 !ifdef DEBUG
1010 CFLAGS = $(CFLAGS) -Zi
1011 LDFLAGS = $(LDFLAGS) /DEBUG
1012 !endif
1013
1014 BCC = $(CC) $(CFLAGS)
1015 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
1016 RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
1017 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
1018 LIBDIR = -LIBPATH:$(ZLIBDIR)
1019
1020 !ifdef FOSSIL_ENABLE_JSON
1021 TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
1022 RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
1023 !endif
1024
1025 !ifdef FOSSIL_ENABLE_SSL
1026 TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
1027 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
1028 LIBS = $(LIBS) $(SSLLIB)
1029 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1030 !endif
1031 }
1032 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
1033 set j " \\\n "
1034 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
@@ -1053,11 +1063,11 @@
1063 @echo Building zlib from "$(ZLIBDIR)"...
1064 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1065
1066 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1067 cd $(OX)
1068 link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1069
1070 $(OX)\linkopts: $B\win\Makefile.msc}
1071 set redir {>}
1072 foreach s [lsort [concat $src $AdditionalObj]] {
1073 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1074
M src/manifest.c
+1 -1
--- src/manifest.c
+++ src/manifest.c
@@ -1965,11 +1965,11 @@
19651965
 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
19661966
 blob_appendf(&comment,
19671967
 " Edit [%S]:",
19681968
 zTagUuid);
19691969
 branchMove = 0;
1970
- if( db_exists("SELECT event.type FROM event, blob"
1970
+ if( db_exists("SELECT 1 FROM event, blob"
19711971
 " WHERE event.type='ci' AND event.objid=blob.rid"
19721972
 " AND blob.uuid='%s'", zTagUuid) ){
19731973
 zScript = xfer_commit_code();
19741974
 zUuid = zTagUuid;
19751975
 }
19761976
--- src/manifest.c
+++ src/manifest.c
@@ -1965,11 +1965,11 @@
1965 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
1966 blob_appendf(&comment,
1967 " Edit [%S]:",
1968 zTagUuid);
1969 branchMove = 0;
1970 if( db_exists("SELECT event.type FROM event, blob"
1971 " WHERE event.type='ci' AND event.objid=blob.rid"
1972 " AND blob.uuid='%s'", zTagUuid) ){
1973 zScript = xfer_commit_code();
1974 zUuid = zTagUuid;
1975 }
1976
--- src/manifest.c
+++ src/manifest.c
@@ -1965,11 +1965,11 @@
1965 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
1966 blob_appendf(&comment,
1967 " Edit [%S]:",
1968 zTagUuid);
1969 branchMove = 0;
1970 if( db_exists("SELECT 1 FROM event, blob"
1971 " WHERE event.type='ci' AND event.objid=blob.rid"
1972 " AND blob.uuid='%s'", zTagUuid) ){
1973 zScript = xfer_commit_code();
1974 zUuid = zTagUuid;
1975 }
1976
M src/manifest.c
+1 -1
--- src/manifest.c
+++ src/manifest.c
@@ -1965,11 +1965,11 @@
19651965
 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
19661966
 blob_appendf(&comment,
19671967
 " Edit [%S]:",
19681968
 zTagUuid);
19691969
 branchMove = 0;
1970
- if( db_exists("SELECT event.type FROM event, blob"
1970
+ if( db_exists("SELECT 1 FROM event, blob"
19711971
 " WHERE event.type='ci' AND event.objid=blob.rid"
19721972
 " AND blob.uuid='%s'", zTagUuid) ){
19731973
 zScript = xfer_commit_code();
19741974
 zUuid = zTagUuid;
19751975
 }
19761976
--- src/manifest.c
+++ src/manifest.c
@@ -1965,11 +1965,11 @@
1965 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
1966 blob_appendf(&comment,
1967 " Edit [%S]:",
1968 zTagUuid);
1969 branchMove = 0;
1970 if( db_exists("SELECT event.type FROM event, blob"
1971 " WHERE event.type='ci' AND event.objid=blob.rid"
1972 " AND blob.uuid='%s'", zTagUuid) ){
1973 zScript = xfer_commit_code();
1974 zUuid = zTagUuid;
1975 }
1976
--- src/manifest.c
+++ src/manifest.c
@@ -1965,11 +1965,11 @@
1965 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
1966 blob_appendf(&comment,
1967 " Edit [%S]:",
1968 zTagUuid);
1969 branchMove = 0;
1970 if( db_exists("SELECT 1 FROM event, blob"
1971 " WHERE event.type='ci' AND event.objid=blob.rid"
1972 " AND blob.uuid='%s'", zTagUuid) ){
1973 zScript = xfer_commit_code();
1974 zUuid = zTagUuid;
1975 }
1976
M win/Makefile.msc
+38 -28
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,13 @@
1111
 SRCDIR = $B\src
1212
 OBJDIR = .
1313
 OX = .
1414
 O = .obj
1515
 E = .exe
16
+
17
+# Uncomment to enable debug symbols
18
+# DEBUG = 1
1619
1720
 # Uncomment to enable JSON API
1821
 # FOSSIL_ENABLE_JSON = 1
1922
2023
 # Uncomment to enable SSL support
@@ -25,37 +28,44 @@
2528
 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
2629
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
2730
 !endif
2831
2932
 # zlib options
30
-ZINCDIR = $(B)\compat\zlib
31
-ZLIBDIR = $(B)\compat\zlib
32
-ZLIB = zlib.lib
33
-
34
-INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
35
-
36
-!ifdef FOSSIL_ENABLE_SSL
37
-INCL = $(INCL) -I$(SSLINCDIR)
38
-!endif
39
-
40
-CFLAGS = -nologo -MT -O2
41
-BCC = $(CC) $(CFLAGS)
42
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
43
-RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
44
-LIBS = $(ZLIB) ws2_32.lib advapi32.lib
45
-LIBDIR = -LIBPATH:$(ZLIBDIR)
46
-
47
-!ifdef FOSSIL_ENABLE_JSON
48
-TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
49
-RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
50
-!endif
51
-
52
-!ifdef FOSSIL_ENABLE_SSL
53
-TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
54
-RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
55
-LIBS = $(LIBS) $(SSLLIB)
56
-LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
33
+ZINCDIR = $(B)\compat\zlib
34
+ZLIBDIR = $(B)\compat\zlib
35
+ZLIB = zlib.lib
36
+
37
+INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
38
+
39
+!ifdef FOSSIL_ENABLE_SSL
40
+INCL = $(INCL) -I$(SSLINCDIR)
41
+!endif
42
+
43
+CFLAGS = -nologo -MT -O2
44
+LDFLAGS = /NODEFAULTLIB:msvcrt
45
+
46
+!ifdef DEBUG
47
+CFLAGS = $(CFLAGS) -Zi
48
+LDFLAGS = $(LDFLAGS) /DEBUG
49
+!endif
50
+
51
+BCC = $(CC) $(CFLAGS)
52
+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
53
+RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
54
+LIBS = $(ZLIB) ws2_32.lib advapi32.lib
55
+LIBDIR = -LIBPATH:$(ZLIBDIR)
56
+
57
+!ifdef FOSSIL_ENABLE_JSON
58
+TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
59
+RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
60
+!endif
61
+
62
+!ifdef FOSSIL_ENABLE_SSL
63
+TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
64
+RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
65
+LIBS = $(LIBS) $(SSLLIB)
66
+LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
5767
 !endif
5868
5969
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
6070
 /DSQLITE_THREADSAFE=0 \
6171
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
@@ -294,11 +304,11 @@
294304
 @echo Building zlib from "$(ZLIBDIR)"...
295305
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
296306
297307
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
298308
 cd $(OX)
299
- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
309
+ link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
300310
301311
 $(OX)\linkopts: $B\win\Makefile.msc
302312
 echo $(OX)\add.obj > $@
303313
 echo $(OX)\allrepo.obj >> $@
304314
 echo $(OX)\attach.obj >> $@
305315
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,13 @@
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
 
 
 
16
17 # Uncomment to enable JSON API
18 # FOSSIL_ENABLE_JSON = 1
19
20 # Uncomment to enable SSL support
@@ -25,37 +28,44 @@
25 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
26 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
27 !endif
28
29 # zlib options
30 ZINCDIR = $(B)\compat\zlib
31 ZLIBDIR = $(B)\compat\zlib
32 ZLIB = zlib.lib
33
34 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
35
36 !ifdef FOSSIL_ENABLE_SSL
37 INCL = $(INCL) -I$(SSLINCDIR)
38 !endif
39
40 CFLAGS = -nologo -MT -O2
41 BCC = $(CC) $(CFLAGS)
42 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
43 RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
44 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
45 LIBDIR = -LIBPATH:$(ZLIBDIR)
46
47 !ifdef FOSSIL_ENABLE_JSON
48 TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
49 RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
50 !endif
51
52 !ifdef FOSSIL_ENABLE_SSL
53 TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
54 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
55 LIBS = $(LIBS) $(SSLLIB)
56 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
 
 
 
 
 
 
 
57 !endif
58
59 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
60 /DSQLITE_THREADSAFE=0 \
61 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
@@ -294,11 +304,11 @@
294 @echo Building zlib from "$(ZLIBDIR)"...
295 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
296
297 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
298 cd $(OX)
299 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
300
301 $(OX)\linkopts: $B\win\Makefile.msc
302 echo $(OX)\add.obj > $@
303 echo $(OX)\allrepo.obj >> $@
304 echo $(OX)\attach.obj >> $@
305
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,13 @@
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16
17 # Uncomment to enable debug symbols
18 # DEBUG = 1
19
20 # Uncomment to enable JSON API
21 # FOSSIL_ENABLE_JSON = 1
22
23 # Uncomment to enable SSL support
@@ -25,37 +28,44 @@
28 SSLLIBDIR = $(B)\compat\openssl-1.0.1e\out32
29 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
30 !endif
31
32 # zlib options
33 ZINCDIR = $(B)\compat\zlib
34 ZLIBDIR = $(B)\compat\zlib
35 ZLIB = zlib.lib
36
37 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
38
39 !ifdef FOSSIL_ENABLE_SSL
40 INCL = $(INCL) -I$(SSLINCDIR)
41 !endif
42
43 CFLAGS = -nologo -MT -O2
44 LDFLAGS = /NODEFAULTLIB:msvcrt
45
46 !ifdef DEBUG
47 CFLAGS = $(CFLAGS) -Zi
48 LDFLAGS = $(LDFLAGS) /DEBUG
49 !endif
50
51 BCC = $(CC) $(CFLAGS)
52 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(INCL)
53 RCC = rc -D_WIN32 -D_MSC_VER $(MSCDEF) $(INCL)
54 LIBS = $(ZLIB) ws2_32.lib advapi32.lib
55 LIBDIR = -LIBPATH:$(ZLIBDIR)
56
57 !ifdef FOSSIL_ENABLE_JSON
58 TCC = $(TCC) -DFOSSIL_ENABLE_JSON=1
59 RCC = $(RCC) -DFOSSIL_ENABLE_JSON=1
60 !endif
61
62 !ifdef FOSSIL_ENABLE_SSL
63 TCC = $(TCC) -DFOSSIL_ENABLE_SSL=1
64 RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
65 LIBS = $(LIBS) $(SSLLIB)
66 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
67 !endif
68
69 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
70 /DSQLITE_THREADSAFE=0 \
71 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
@@ -294,11 +304,11 @@
304 @echo Building zlib from "$(ZLIBDIR)"...
305 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
306
307 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
308 cd $(OX)
309 link $(LDFLAGS) -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
310
311 $(OX)\linkopts: $B\win\Makefile.msc
312 echo $(OX)\add.obj > $@
313 echo $(OX)\allrepo.obj >> $@
314 echo $(OX)\attach.obj >> $@
315

Keyboard Shortcuts

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