Fossil SCM

merge trunk

jan.nijtmans 2014-10-01 09:22 winsymlink merge
Commit bebd408361a6b0cb5e508fa594dd1d84bcbf8437
Parent f2ba1d223373bd5…
4 files changed +17 -5 +9 -5 +9 -5 +8
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+17 -5
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -486,10 +486,18 @@
486486
 ifndef MINGW_IS_32BIT_ONLY
487487
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
488488
 MINGW_IS_32BIT_ONLY = 1
489489
 endif
490490
 endif
491
+ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
492
+SSLCONFIG = mingw
493
+else
494
+SSLCONFIG = mingw64
495
+endif
496
+ifndef FOSSIL_ENABLE_MINIZ
497
+SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
498
+endif
491499
492500
 #### The directories where the zlib include and library files are located.
493501
 #
494502
 ZINCDIR = $(SRCDIR)/../compat/zlib
495503
 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -859,15 +867,11 @@
859867
 ifndef FOSSIL_ENABLE_MINIZ
860868
 LIBTARGETS += zlib
861869
 endif
862870
863871
 openssl: $(LIBTARGETS)
864
-ifndef FOSSIL_ENABLE_MINIZ
865
- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
866
-else
867
- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
868
-endif
872
+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
869873
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
870874
871875
 clean-openssl:
872876
 $(MAKE) -C $(OPENSSLLIBDIR) clean
873877
@@ -1141,10 +1145,18 @@
11411145
11421146
 writeln {#
11431147
 ##############################################################################
11441148
 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
11451149
 ##############################################################################
1150
+#
1151
+# This Makefile will only function correctly if used from a sub-directory
1152
+# that is a direct child of the top-level directory for this project.
1153
+#
1154
+!if !exist("..\.fossil-settings")
1155
+!error "Please change the current directory to the one containing this file."
1156
+!endif
1157
+
11461158
 #
11471159
 # This file is automatically generated. Instead of editing this
11481160
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
11491161
 # to regenerate this file.
11501162
 #
11511163
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -486,10 +486,18 @@
486 ifndef MINGW_IS_32BIT_ONLY
487 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
488 MINGW_IS_32BIT_ONLY = 1
489 endif
490 endif
 
 
 
 
 
 
 
 
491
492 #### The directories where the zlib include and library files are located.
493 #
494 ZINCDIR = $(SRCDIR)/../compat/zlib
495 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -859,15 +867,11 @@
859 ifndef FOSSIL_ENABLE_MINIZ
860 LIBTARGETS += zlib
861 endif
862
863 openssl: $(LIBTARGETS)
864 ifndef FOSSIL_ENABLE_MINIZ
865 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
866 else
867 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
868 endif
869 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
870
871 clean-openssl:
872 $(MAKE) -C $(OPENSSLLIBDIR) clean
873
@@ -1141,10 +1145,18 @@
1141
1142 writeln {#
1143 ##############################################################################
1144 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1145 ##############################################################################
 
 
 
 
 
 
 
 
1146 #
1147 # This file is automatically generated. Instead of editing this
1148 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1149 # to regenerate this file.
1150 #
1151
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -486,10 +486,18 @@
486 ifndef MINGW_IS_32BIT_ONLY
487 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
488 MINGW_IS_32BIT_ONLY = 1
489 endif
490 endif
491 ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
492 SSLCONFIG = mingw
493 else
494 SSLCONFIG = mingw64
495 endif
496 ifndef FOSSIL_ENABLE_MINIZ
497 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
498 endif
499
500 #### The directories where the zlib include and library files are located.
501 #
502 ZINCDIR = $(SRCDIR)/../compat/zlib
503 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -859,15 +867,11 @@
867 ifndef FOSSIL_ENABLE_MINIZ
868 LIBTARGETS += zlib
869 endif
870
871 openssl: $(LIBTARGETS)
872 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
 
 
 
 
873 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
874
875 clean-openssl:
876 $(MAKE) -C $(OPENSSLLIBDIR) clean
877
@@ -1141,10 +1145,18 @@
1145
1146 writeln {#
1147 ##############################################################################
1148 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1149 ##############################################################################
1150 #
1151 # This Makefile will only function correctly if used from a sub-directory
1152 # that is a direct child of the top-level directory for this project.
1153 #
1154 !if !exist("..\.fossil-settings")
1155 !error "Please change the current directory to the one containing this file."
1156 !endif
1157
1158 #
1159 # This file is automatically generated. Instead of editing this
1160 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1161 # to regenerate this file.
1162 #
1163
M win/Makefile.mingw
+9 -5
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -94,10 +94,18 @@
9494
 ifndef MINGW_IS_32BIT_ONLY
9595
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
9696
 MINGW_IS_32BIT_ONLY = 1
9797
 endif
9898
 endif
99
+ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
100
+SSLCONFIG = mingw
101
+else
102
+SSLCONFIG = mingw64
103
+endif
104
+ifndef FOSSIL_ENABLE_MINIZ
105
+SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
106
+endif
99107
100108
 #### The directories where the zlib include and library files are located.
101109
 #
102110
 ZINCDIR = $(SRCDIR)/../compat/zlib
103111
 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -788,15 +796,11 @@
788796
 ifndef FOSSIL_ENABLE_MINIZ
789797
 LIBTARGETS += zlib
790798
 endif
791799
792800
 openssl: $(LIBTARGETS)
793
-ifndef FOSSIL_ENABLE_MINIZ
794
- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
795
-else
796
- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
797
-endif
801
+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
798802
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
799803
800804
 clean-openssl:
801805
 $(MAKE) -C $(OPENSSLLIBDIR) clean
802806
803807
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -94,10 +94,18 @@
94 ifndef MINGW_IS_32BIT_ONLY
95 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96 MINGW_IS_32BIT_ONLY = 1
97 endif
98 endif
 
 
 
 
 
 
 
 
99
100 #### The directories where the zlib include and library files are located.
101 #
102 ZINCDIR = $(SRCDIR)/../compat/zlib
103 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -788,15 +796,11 @@
788 ifndef FOSSIL_ENABLE_MINIZ
789 LIBTARGETS += zlib
790 endif
791
792 openssl: $(LIBTARGETS)
793 ifndef FOSSIL_ENABLE_MINIZ
794 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
795 else
796 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
797 endif
798 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
799
800 clean-openssl:
801 $(MAKE) -C $(OPENSSLLIBDIR) clean
802
803
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -94,10 +94,18 @@
94 ifndef MINGW_IS_32BIT_ONLY
95 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96 MINGW_IS_32BIT_ONLY = 1
97 endif
98 endif
99 ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
100 SSLCONFIG = mingw
101 else
102 SSLCONFIG = mingw64
103 endif
104 ifndef FOSSIL_ENABLE_MINIZ
105 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
106 endif
107
108 #### The directories where the zlib include and library files are located.
109 #
110 ZINCDIR = $(SRCDIR)/../compat/zlib
111 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -788,15 +796,11 @@
796 ifndef FOSSIL_ENABLE_MINIZ
797 LIBTARGETS += zlib
798 endif
799
800 openssl: $(LIBTARGETS)
801 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
 
 
 
 
802 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
803
804 clean-openssl:
805 $(MAKE) -C $(OPENSSLLIBDIR) clean
806
807
M win/Makefile.mingw.mistachkin
+9 -5
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -94,10 +94,18 @@
9494
 ifndef MINGW_IS_32BIT_ONLY
9595
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
9696
 MINGW_IS_32BIT_ONLY = 1
9797
 endif
9898
 endif
99
+ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
100
+SSLCONFIG = mingw
101
+else
102
+SSLCONFIG = mingw64
103
+endif
104
+ifndef FOSSIL_ENABLE_MINIZ
105
+SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
106
+endif
99107
100108
 #### The directories where the zlib include and library files are located.
101109
 #
102110
 ZINCDIR = $(SRCDIR)/../compat/zlib
103111
 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -788,15 +796,11 @@
788796
 ifndef FOSSIL_ENABLE_MINIZ
789797
 LIBTARGETS += zlib
790798
 endif
791799
792800
 openssl: $(LIBTARGETS)
793
-ifndef FOSSIL_ENABLE_MINIZ
794
- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
795
-else
796
- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
797
-endif
801
+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
798802
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
799803
800804
 clean-openssl:
801805
 $(MAKE) -C $(OPENSSLLIBDIR) clean
802806
803807
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -94,10 +94,18 @@
94 ifndef MINGW_IS_32BIT_ONLY
95 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96 MINGW_IS_32BIT_ONLY = 1
97 endif
98 endif
 
 
 
 
 
 
 
 
99
100 #### The directories where the zlib include and library files are located.
101 #
102 ZINCDIR = $(SRCDIR)/../compat/zlib
103 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -788,15 +796,11 @@
788 ifndef FOSSIL_ENABLE_MINIZ
789 LIBTARGETS += zlib
790 endif
791
792 openssl: $(LIBTARGETS)
793 ifndef FOSSIL_ENABLE_MINIZ
794 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
795 else
796 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
797 endif
798 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
799
800 clean-openssl:
801 $(MAKE) -C $(OPENSSLLIBDIR) clean
802
803
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -94,10 +94,18 @@
94 ifndef MINGW_IS_32BIT_ONLY
95 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96 MINGW_IS_32BIT_ONLY = 1
97 endif
98 endif
99 ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
100 SSLCONFIG = mingw
101 else
102 SSLCONFIG = mingw64
103 endif
104 ifndef FOSSIL_ENABLE_MINIZ
105 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
106 endif
107
108 #### The directories where the zlib include and library files are located.
109 #
110 ZINCDIR = $(SRCDIR)/../compat/zlib
111 ZLIBDIR = $(SRCDIR)/../compat/zlib
@@ -788,15 +796,11 @@
796 ifndef FOSSIL_ENABLE_MINIZ
797 LIBTARGETS += zlib
798 endif
799
800 openssl: $(LIBTARGETS)
801 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
 
 
 
 
802 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
803
804 clean-openssl:
805 $(MAKE) -C $(OPENSSLLIBDIR) clean
806
807
M win/Makefile.msc
+8
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -1,9 +1,17 @@
11
 #
22
 ##############################################################################
33
 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
44
 ##############################################################################
5
+#
6
+# This Makefile will only function correctly if used from a sub-directory
7
+# that is a direct child of the top-level directory for this project.
8
+#
9
+!if !exist("..\.fossil-settings")
10
+!error "Please change the current directory to the one containing this file."
11
+!endif
12
+
513
 #
614
 # This file is automatically generated. Instead of editing this
715
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
816
 # to regenerate this file.
917
 #
1018
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -1,9 +1,17 @@
1 #
2 ##############################################################################
3 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4 ##############################################################################
 
 
 
 
 
 
 
 
5 #
6 # This file is automatically generated. Instead of editing this
7 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8 # to regenerate this file.
9 #
10
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -1,9 +1,17 @@
1 #
2 ##############################################################################
3 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4 ##############################################################################
5 #
6 # This Makefile will only function correctly if used from a sub-directory
7 # that is a direct child of the top-level directory for this project.
8 #
9 !if !exist("..\.fossil-settings")
10 !error "Please change the current directory to the one containing this file."
11 !endif
12
13 #
14 # This file is automatically generated. Instead of editing this
15 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
16 # to regenerate this file.
17 #
18

Keyboard Shortcuts

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