Fossil SCM

Update custom mingw makefile. Update openssl version

jan.nijtmans 2018-11-29 21:38 trunk
Commit 71399243349a58086114103e56d573cfe0020346891cceec58b9dde57b2bc31b
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -710,11 +710,11 @@
710710
#### The directories where the OpenSSL include and library files are located.
711711
# The recommended usage here is to use the Sysinternals junction tool
712712
# to create a hard link between an "openssl-1.x" sub-directory of the
713713
# Fossil source code directory and the target OpenSSL source directory.
714714
#
715
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2p
715
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
716716
OPENSSLINCDIR = $(OPENSSLDIR)/include
717717
OPENSSLLIBDIR = $(OPENSSLDIR)
718718
719719
#### Either the directory where the Tcl library is installed or the Tcl
720720
# source code directory resides (depending on the value of the macro
@@ -1566,11 +1566,11 @@
15661566
!ifndef USE_SEE
15671567
USE_SEE = 0
15681568
!endif
15691569
15701570
!if $(FOSSIL_ENABLE_SSL)!=0
1571
-SSLDIR = $(B)\compat\openssl-1.0.2p
1571
+SSLDIR = $(B)\compat\openssl-1.0.2q
15721572
SSLINCDIR = $(SSLDIR)\inc32
15731573
!if $(FOSSIL_DYNAMIC_BUILD)!=0
15741574
SSLLIBDIR = $(SSLDIR)\out32dll
15751575
!else
15761576
SSLLIBDIR = $(SSLDIR)\out32
15771577
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -710,11 +710,11 @@
710 #### The directories where the OpenSSL include and library files are located.
711 # The recommended usage here is to use the Sysinternals junction tool
712 # to create a hard link between an "openssl-1.x" sub-directory of the
713 # Fossil source code directory and the target OpenSSL source directory.
714 #
715 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2p
716 OPENSSLINCDIR = $(OPENSSLDIR)/include
717 OPENSSLLIBDIR = $(OPENSSLDIR)
718
719 #### Either the directory where the Tcl library is installed or the Tcl
720 # source code directory resides (depending on the value of the macro
@@ -1566,11 +1566,11 @@
1566 !ifndef USE_SEE
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.0.2p
1572 SSLINCDIR = $(SSLDIR)\inc32
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)\out32dll
1575 !else
1576 SSLLIBDIR = $(SSLDIR)\out32
1577
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -710,11 +710,11 @@
710 #### The directories where the OpenSSL include and library files are located.
711 # The recommended usage here is to use the Sysinternals junction tool
712 # to create a hard link between an "openssl-1.x" sub-directory of the
713 # Fossil source code directory and the target OpenSSL source directory.
714 #
715 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
716 OPENSSLINCDIR = $(OPENSSLDIR)/include
717 OPENSSLLIBDIR = $(OPENSSLDIR)
718
719 #### Either the directory where the Tcl library is installed or the Tcl
720 # source code directory resides (depending on the value of the macro
@@ -1566,11 +1566,11 @@
1566 !ifndef USE_SEE
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.0.2q
1572 SSLINCDIR = $(SSLDIR)\inc32
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)\out32dll
1575 !else
1576 SSLLIBDIR = $(SSLDIR)\out32
1577
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -174,11 +174,11 @@
174174
#### The directories where the OpenSSL include and library files are located.
175175
# The recommended usage here is to use the Sysinternals junction tool
176176
# to create a hard link between an "openssl-1.x" sub-directory of the
177177
# Fossil source code directory and the target OpenSSL source directory.
178178
#
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2p
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
180180
OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
#### Either the directory where the Tcl library is installed or the Tcl
184184
# source code directory resides (depending on the value of the macro
185185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2p
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -174,11 +174,11 @@
174174
#### The directories where the OpenSSL include and library files are located.
175175
# The recommended usage here is to use the Sysinternals junction tool
176176
# to create a hard link between an "openssl-1.x" sub-directory of the
177177
# Fossil source code directory and the target OpenSSL source directory.
178178
#
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2p
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
180180
OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
#### Either the directory where the Tcl library is installed or the Tcl
184184
# source code directory resides (depending on the value of the macro
@@ -526,10 +526,11 @@
526526
$(SRCDIR)/printf.c \
527527
$(SRCDIR)/publish.c \
528528
$(SRCDIR)/purge.c \
529529
$(SRCDIR)/rebuild.c \
530530
$(SRCDIR)/regexp.c \
531
+ $(SRCDIR)/repolist.c \
531532
$(SRCDIR)/report.c \
532533
$(SRCDIR)/rss.c \
533534
$(SRCDIR)/schema.c \
534535
$(SRCDIR)/search.c \
535536
$(SRCDIR)/security_audit.c \
@@ -736,10 +737,11 @@
736737
$(OBJDIR)/printf_.c \
737738
$(OBJDIR)/publish_.c \
738739
$(OBJDIR)/purge_.c \
739740
$(OBJDIR)/rebuild_.c \
740741
$(OBJDIR)/regexp_.c \
742
+ $(OBJDIR)/repolist_.c \
741743
$(OBJDIR)/report_.c \
742744
$(OBJDIR)/rss_.c \
743745
$(OBJDIR)/schema_.c \
744746
$(OBJDIR)/search_.c \
745747
$(OBJDIR)/security_audit_.c \
@@ -873,10 +875,11 @@
873875
$(OBJDIR)/printf.o \
874876
$(OBJDIR)/publish.o \
875877
$(OBJDIR)/purge.o \
876878
$(OBJDIR)/rebuild.o \
877879
$(OBJDIR)/regexp.o \
880
+ $(OBJDIR)/repolist.o \
878881
$(OBJDIR)/report.o \
879882
$(OBJDIR)/rss.o \
880883
$(OBJDIR)/schema.o \
881884
$(OBJDIR)/search.o \
882885
$(OBJDIR)/security_audit.o \
@@ -1229,10 +1232,11 @@
12291232
$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
12301233
$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
12311234
$(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
12321235
$(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
12331236
$(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1237
+ $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
12341238
$(OBJDIR)/report_.c:$(OBJDIR)/report.h \
12351239
$(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
12361240
$(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
12371241
$(OBJDIR)/search_.c:$(OBJDIR)/search.h \
12381242
$(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
@@ -2002,10 +2006,18 @@
20022006
20032007
$(OBJDIR)/regexp.o: $(OBJDIR)/regexp_.c $(OBJDIR)/regexp.h $(SRCDIR)/config.h
20042008
$(XTCC) -o $(OBJDIR)/regexp.o -c $(OBJDIR)/regexp_.c
20052009
20062010
$(OBJDIR)/regexp.h: $(OBJDIR)/headers
2011
+
2012
+$(OBJDIR)/repolist_.c: $(SRCDIR)/repolist.c $(TRANSLATE)
2013
+ $(TRANSLATE) $(SRCDIR)/repolist.c >$@
2014
+
2015
+$(OBJDIR)/repolist.o: $(OBJDIR)/repolist_.c $(OBJDIR)/repolist.h $(SRCDIR)/config.h
2016
+ $(XTCC) -o $(OBJDIR)/repolist.o -c $(OBJDIR)/repolist_.c
2017
+
2018
+$(OBJDIR)/repolist.h: $(OBJDIR)/headers
20072019
20082020
$(OBJDIR)/report_.c: $(SRCDIR)/report.c $(TRANSLATE)
20092021
$(TRANSLATE) $(SRCDIR)/report.c >$@
20102022
20112023
$(OBJDIR)/report.o: $(OBJDIR)/report_.c $(OBJDIR)/report.h $(SRCDIR)/config.h
20122024
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2p
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
@@ -526,10 +526,11 @@
526 $(SRCDIR)/printf.c \
527 $(SRCDIR)/publish.c \
528 $(SRCDIR)/purge.c \
529 $(SRCDIR)/rebuild.c \
530 $(SRCDIR)/regexp.c \
 
531 $(SRCDIR)/report.c \
532 $(SRCDIR)/rss.c \
533 $(SRCDIR)/schema.c \
534 $(SRCDIR)/search.c \
535 $(SRCDIR)/security_audit.c \
@@ -736,10 +737,11 @@
736 $(OBJDIR)/printf_.c \
737 $(OBJDIR)/publish_.c \
738 $(OBJDIR)/purge_.c \
739 $(OBJDIR)/rebuild_.c \
740 $(OBJDIR)/regexp_.c \
 
741 $(OBJDIR)/report_.c \
742 $(OBJDIR)/rss_.c \
743 $(OBJDIR)/schema_.c \
744 $(OBJDIR)/search_.c \
745 $(OBJDIR)/security_audit_.c \
@@ -873,10 +875,11 @@
873 $(OBJDIR)/printf.o \
874 $(OBJDIR)/publish.o \
875 $(OBJDIR)/purge.o \
876 $(OBJDIR)/rebuild.o \
877 $(OBJDIR)/regexp.o \
 
878 $(OBJDIR)/report.o \
879 $(OBJDIR)/rss.o \
880 $(OBJDIR)/schema.o \
881 $(OBJDIR)/search.o \
882 $(OBJDIR)/security_audit.o \
@@ -1229,10 +1232,11 @@
1229 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1230 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1231 $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1232 $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1233 $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
 
1234 $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1235 $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1236 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1237 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1238 $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
@@ -2002,10 +2006,18 @@
2002
2003 $(OBJDIR)/regexp.o: $(OBJDIR)/regexp_.c $(OBJDIR)/regexp.h $(SRCDIR)/config.h
2004 $(XTCC) -o $(OBJDIR)/regexp.o -c $(OBJDIR)/regexp_.c
2005
2006 $(OBJDIR)/regexp.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
2007
2008 $(OBJDIR)/report_.c: $(SRCDIR)/report.c $(TRANSLATE)
2009 $(TRANSLATE) $(SRCDIR)/report.c >$@
2010
2011 $(OBJDIR)/report.o: $(OBJDIR)/report_.c $(OBJDIR)/report.h $(SRCDIR)/config.h
2012
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
@@ -526,10 +526,11 @@
526 $(SRCDIR)/printf.c \
527 $(SRCDIR)/publish.c \
528 $(SRCDIR)/purge.c \
529 $(SRCDIR)/rebuild.c \
530 $(SRCDIR)/regexp.c \
531 $(SRCDIR)/repolist.c \
532 $(SRCDIR)/report.c \
533 $(SRCDIR)/rss.c \
534 $(SRCDIR)/schema.c \
535 $(SRCDIR)/search.c \
536 $(SRCDIR)/security_audit.c \
@@ -736,10 +737,11 @@
737 $(OBJDIR)/printf_.c \
738 $(OBJDIR)/publish_.c \
739 $(OBJDIR)/purge_.c \
740 $(OBJDIR)/rebuild_.c \
741 $(OBJDIR)/regexp_.c \
742 $(OBJDIR)/repolist_.c \
743 $(OBJDIR)/report_.c \
744 $(OBJDIR)/rss_.c \
745 $(OBJDIR)/schema_.c \
746 $(OBJDIR)/search_.c \
747 $(OBJDIR)/security_audit_.c \
@@ -873,10 +875,11 @@
875 $(OBJDIR)/printf.o \
876 $(OBJDIR)/publish.o \
877 $(OBJDIR)/purge.o \
878 $(OBJDIR)/rebuild.o \
879 $(OBJDIR)/regexp.o \
880 $(OBJDIR)/repolist.o \
881 $(OBJDIR)/report.o \
882 $(OBJDIR)/rss.o \
883 $(OBJDIR)/schema.o \
884 $(OBJDIR)/search.o \
885 $(OBJDIR)/security_audit.o \
@@ -1229,10 +1232,11 @@
1232 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1233 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1234 $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1235 $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1236 $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1237 $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1238 $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1239 $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1240 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1241 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1242 $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
@@ -2002,10 +2006,18 @@
2006
2007 $(OBJDIR)/regexp.o: $(OBJDIR)/regexp_.c $(OBJDIR)/regexp.h $(SRCDIR)/config.h
2008 $(XTCC) -o $(OBJDIR)/regexp.o -c $(OBJDIR)/regexp_.c
2009
2010 $(OBJDIR)/regexp.h: $(OBJDIR)/headers
2011
2012 $(OBJDIR)/repolist_.c: $(SRCDIR)/repolist.c $(TRANSLATE)
2013 $(TRANSLATE) $(SRCDIR)/repolist.c >$@
2014
2015 $(OBJDIR)/repolist.o: $(OBJDIR)/repolist_.c $(OBJDIR)/repolist.h $(SRCDIR)/config.h
2016 $(XTCC) -o $(OBJDIR)/repolist.o -c $(OBJDIR)/repolist_.c
2017
2018 $(OBJDIR)/repolist.h: $(OBJDIR)/headers
2019
2020 $(OBJDIR)/report_.c: $(SRCDIR)/report.c $(TRANSLATE)
2021 $(TRANSLATE) $(SRCDIR)/report.c >$@
2022
2023 $(OBJDIR)/report.o: $(OBJDIR)/report_.c $(OBJDIR)/report.h $(SRCDIR)/config.h
2024
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
9898
!ifndef USE_SEE
9999
USE_SEE = 0
100100
!endif
101101
102102
!if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.0.2p
103
+SSLDIR = $(B)\compat\openssl-1.0.2q
104104
SSLINCDIR = $(SSLDIR)\inc32
105105
!if $(FOSSIL_DYNAMIC_BUILD)!=0
106106
SSLLIBDIR = $(SSLDIR)\out32dll
107107
!else
108108
SSLLIBDIR = $(SSLDIR)\out32
109109
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.0.2p
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.0.2q
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -136,11 +136,11 @@
136136
the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
137137
first <a href="https://www.openssl.org/source/">download the official
138138
source code for OpenSSL</a> and extract it to an appropriately named
139139
"<b>openssl-X.Y.ZA</b>" subdirectory within the local
140140
[/tree?ci=trunk&name=compat | compat] directory (e.g.
141
-"<b>compat/openssl-1.0.2p</b>"), then make sure that some recent
141
+"<b>compat/openssl-1.0.2q</b>"), then make sure that some recent
142142
<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
143143
and finally run one of the following commands:
144144
<blockquote><pre>
145145
nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
146146
</pre></blockquote>
147147
--- www/build.wiki
+++ www/build.wiki
@@ -136,11 +136,11 @@
136 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
137 first <a href="https://www.openssl.org/source/">download the official
138 source code for OpenSSL</a> and extract it to an appropriately named
139 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
140 [/tree?ci=trunk&name=compat | compat] directory (e.g.
141 "<b>compat/openssl-1.0.2p</b>"), then make sure that some recent
142 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
143 and finally run one of the following commands:
144 <blockquote><pre>
145 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
146 </pre></blockquote>
147
--- www/build.wiki
+++ www/build.wiki
@@ -136,11 +136,11 @@
136 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
137 first <a href="https://www.openssl.org/source/">download the official
138 source code for OpenSSL</a> and extract it to an appropriately named
139 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
140 [/tree?ci=trunk&name=compat | compat] directory (e.g.
141 "<b>compat/openssl-1.0.2q</b>"), then make sure that some recent
142 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
143 and finally run one of the following commands:
144 <blockquote><pre>
145 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
146 </pre></blockquote>
147

Keyboard Shortcuts

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