Fossil SCM

Upgrade to openssl 1.1.1c. Use single-argument "expr" in auto.def. Update custom mingw makefile.

jan.nijtmans 2019-06-27 14:39 trunk
Commit 5050132815737a54cbbbdaf76676f99c23206751d2b5b73f3be539a56f49bd97
Parent 70a7db80f577f96…
6 files changed +1 -1 +2 -2 +1 -1 +2 -1 +1 -1 +1 -1
~ auto.def ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki
M auto.def
+1 -1
--- auto.def
+++ auto.def
@@ -50,11 +50,11 @@
5050
 set hbtd /usr/local/Cellar/tcl-tk
5151
 if {[string equal false [get-define TCLSH]]} {
5252
 msg-result "WARNING: 'make test' will not run here."
5353
 } else {
5454
 set v [exec /bin/sh -c "echo 'puts \$tcl_version' | tclsh"]
55
- if {[expr $v >= 8.6]} {
55
+ if {[expr {$v >= 8.6}]} {
5656
 msg-result "Found Tclsh version $v in the PATH."
5757
 define TCLSH tclsh
5858
 } elseif {[file isdirectory $hbtd]} {
5959
 # This is a macOS system with the Homebrew version of Tcl/Tk
6060
 # installed. Select the newest version. It won't normally be
6161
--- auto.def
+++ auto.def
@@ -50,11 +50,11 @@
50 set hbtd /usr/local/Cellar/tcl-tk
51 if {[string equal false [get-define TCLSH]]} {
52 msg-result "WARNING: 'make test' will not run here."
53 } else {
54 set v [exec /bin/sh -c "echo 'puts \$tcl_version' | tclsh"]
55 if {[expr $v >= 8.6]} {
56 msg-result "Found Tclsh version $v in the PATH."
57 define TCLSH tclsh
58 } elseif {[file isdirectory $hbtd]} {
59 # This is a macOS system with the Homebrew version of Tcl/Tk
60 # installed. Select the newest version. It won't normally be
61
--- auto.def
+++ auto.def
@@ -50,11 +50,11 @@
50 set hbtd /usr/local/Cellar/tcl-tk
51 if {[string equal false [get-define TCLSH]]} {
52 msg-result "WARNING: 'make test' will not run here."
53 } else {
54 set v [exec /bin/sh -c "echo 'puts \$tcl_version' | tclsh"]
55 if {[expr {$v >= 8.6}]} {
56 msg-result "Found Tclsh version $v in the PATH."
57 define TCLSH tclsh
58 } elseif {[file isdirectory $hbtd]} {
59 # This is a macOS system with the Homebrew version of Tcl/Tk
60 # installed. Select the newest version. It won't normally be
61
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -711,11 +711,11 @@
711711
 #### The directories where the OpenSSL include and library files are located.
712712
 # The recommended usage here is to use the Sysinternals junction tool
713713
 # to create a hard link between an "openssl-1.x" sub-directory of the
714714
 # Fossil source code directory and the target OpenSSL source directory.
715715
 #
716
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
716
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1c
717717
 OPENSSLINCDIR = $(OPENSSLDIR)/include
718718
 OPENSSLLIBDIR = $(OPENSSLDIR)
719719
720720
 #### Either the directory where the Tcl library is installed or the Tcl
721721
 # source code directory resides (depending on the value of the macro
@@ -1568,11 +1568,11 @@
15681568
 !ifndef USE_SEE
15691569
 USE_SEE = 0
15701570
 !endif
15711571
15721572
 !if $(FOSSIL_ENABLE_SSL)!=0
1573
-SSLDIR = $(B)\compat\openssl-1.1.1b
1573
+SSLDIR = $(B)\compat\openssl-1.1.1c
15741574
 SSLINCDIR = $(SSLDIR)\include
15751575
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
15761576
 SSLLIBDIR = $(SSLDIR)
15771577
 !else
15781578
 SSLLIBDIR = $(SSLDIR)
15791579
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -711,11 +711,11 @@
711 #### The directories where the OpenSSL include and library files are located.
712 # The recommended usage here is to use the Sysinternals junction tool
713 # to create a hard link between an "openssl-1.x" sub-directory of the
714 # Fossil source code directory and the target OpenSSL source directory.
715 #
716 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
717 OPENSSLINCDIR = $(OPENSSLDIR)/include
718 OPENSSLLIBDIR = $(OPENSSLDIR)
719
720 #### Either the directory where the Tcl library is installed or the Tcl
721 # source code directory resides (depending on the value of the macro
@@ -1568,11 +1568,11 @@
1568 !ifndef USE_SEE
1569 USE_SEE = 0
1570 !endif
1571
1572 !if $(FOSSIL_ENABLE_SSL)!=0
1573 SSLDIR = $(B)\compat\openssl-1.1.1b
1574 SSLINCDIR = $(SSLDIR)\include
1575 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1576 SSLLIBDIR = $(SSLDIR)
1577 !else
1578 SSLLIBDIR = $(SSLDIR)
1579
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -711,11 +711,11 @@
711 #### The directories where the OpenSSL include and library files are located.
712 # The recommended usage here is to use the Sysinternals junction tool
713 # to create a hard link between an "openssl-1.x" sub-directory of the
714 # Fossil source code directory and the target OpenSSL source directory.
715 #
716 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1c
717 OPENSSLINCDIR = $(OPENSSLDIR)/include
718 OPENSSLLIBDIR = $(OPENSSLDIR)
719
720 #### Either the directory where the Tcl library is installed or the Tcl
721 # source code directory resides (depending on the value of the macro
@@ -1568,11 +1568,11 @@
1568 !ifndef USE_SEE
1569 USE_SEE = 0
1570 !endif
1571
1572 !if $(FOSSIL_ENABLE_SSL)!=0
1573 SSLDIR = $(B)\compat\openssl-1.1.1c
1574 SSLINCDIR = $(SSLDIR)\include
1575 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1576 SSLLIBDIR = $(SSLDIR)
1577 !else
1578 SSLLIBDIR = $(SSLDIR)
1579
M win/Makefile.mingw
+1 -1
--- 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.1.1b
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1c
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.1.1b
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.1.1c
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
M win/Makefile.mingw.mistachkin
+2 -1
--- 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.1.1b
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1c
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
@@ -632,10 +632,11 @@
632632
 $(SRCDIR)/../skins/xekri/css.txt \
633633
 $(SRCDIR)/../skins/xekri/details.txt \
634634
 $(SRCDIR)/../skins/xekri/footer.txt \
635635
 $(SRCDIR)/../skins/xekri/header.txt \
636636
 $(SRCDIR)/ci_edit.js \
637
+ $(SRCDIR)/copybtn.js \
637638
 $(SRCDIR)/diff.tcl \
638639
 $(SRCDIR)/forum.js \
639640
 $(SRCDIR)/graph.js \
640641
 $(SRCDIR)/href.js \
641642
 $(SRCDIR)/login.js \
642643
--- 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.1.1b
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
@@ -632,10 +632,11 @@
632 $(SRCDIR)/../skins/xekri/css.txt \
633 $(SRCDIR)/../skins/xekri/details.txt \
634 $(SRCDIR)/../skins/xekri/footer.txt \
635 $(SRCDIR)/../skins/xekri/header.txt \
636 $(SRCDIR)/ci_edit.js \
 
637 $(SRCDIR)/diff.tcl \
638 $(SRCDIR)/forum.js \
639 $(SRCDIR)/graph.js \
640 $(SRCDIR)/href.js \
641 $(SRCDIR)/login.js \
642
--- 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.1.1c
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
@@ -632,10 +632,11 @@
632 $(SRCDIR)/../skins/xekri/css.txt \
633 $(SRCDIR)/../skins/xekri/details.txt \
634 $(SRCDIR)/../skins/xekri/footer.txt \
635 $(SRCDIR)/../skins/xekri/header.txt \
636 $(SRCDIR)/ci_edit.js \
637 $(SRCDIR)/copybtn.js \
638 $(SRCDIR)/diff.tcl \
639 $(SRCDIR)/forum.js \
640 $(SRCDIR)/graph.js \
641 $(SRCDIR)/href.js \
642 $(SRCDIR)/login.js \
643
M win/Makefile.msc
+1 -1
--- 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.1.1b
103
+SSLDIR = $(B)\compat\openssl-1.1.1c
104104
 SSLINCDIR = $(SSLDIR)\include
105105
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106106
 SSLLIBDIR = $(SSLDIR)
107107
 !else
108108
 SSLLIBDIR = $(SSLDIR)
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.1.1b
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
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.1.1c
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161161
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162162
 first <a href="https://www.openssl.org/source/">download the official
163163
 source code for OpenSSL</a> and extract it to an appropriately named
164164
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165165
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166
-"<b>compat/openssl-1.1.1b</b>"), then make sure that some recent
166
+"<b>compat/openssl-1.1.1c</b>"), then make sure that some recent
167167
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168168
 and finally run one of the following commands:
169169
 <blockquote><pre>
170170
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171171
 </pre></blockquote>
172172
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162 first <a href="https://www.openssl.org/source/">download the official
163 source code for OpenSSL</a> and extract it to an appropriately named
164 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166 "<b>compat/openssl-1.1.1b</b>"), then make sure that some recent
167 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168 and finally run one of the following commands:
169 <blockquote><pre>
170 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171 </pre></blockquote>
172
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162 first <a href="https://www.openssl.org/source/">download the official
163 source code for OpenSSL</a> and extract it to an appropriately named
164 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166 "<b>compat/openssl-1.1.1c</b>"), then make sure that some recent
167 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168 and finally run one of the following commands:
169 <blockquote><pre>
170 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171 </pre></blockquote>
172

Keyboard Shortcuts

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