# Fossil

Check-in [50501328]

Overview
Comment: Upgrade to openssl 1.1.1c. Use single-argument "expr" in auto.def. Update custom mingw makefile. Tarball | ZIP archive | SQL archive family | ancestors | descendants | both | files | file ages | folders 5050132815737a54cbbbdaf76676f99c23206751d2b5b73f3be539a56f49bd97 jan.nijtmans 2019-06-27 14:39:40
Context
 2019-06-27 23:12 Assorted improvements to the new material in www/branching.wiki, mainly in the way of clarifications and moderation of tone. check-in: 862b77b6 user: wyoung tags: trunk 21:22 Accidental commit by running mattwell's "makeforks" script from within a fossil-scm.org checkout directory. Moving to hidden branch. check-in: 28549ec2 user: wyoung tags: inadvertent-checkin 14:39 Upgrade to openssl 1.1.1c. Use single-argument "expr" in auto.def. Update custom mingw makefile. check-in: 50501328 user: jan.nijtmans tags: trunk 2019-06-22 03:46 More clarifications in the "How Can Forks Divide Development Effort?" section of branching.wiki, primarily in explaining how each user in the example arrives at the view shown in the swim lane diagram. There were multiple implicit possilibities before, and some were misinterpreting it. check-in: 70a7db80 user: wyoung tags: trunk
Changes

Changes to auto.def.

 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62  # or a version of tclsh that we find unsuitable below! cc-check-progs tclsh set hbtd /usr/local/Cellar/tcl-tk if {[string equal false [get-define TCLSH]]} { msg-result "WARNING: 'make test' will not run here." } else { set v [exec /bin/sh -c "echo 'puts \$tcl_version' | tclsh"] if {[expr$v >= 8.6]} { msg-result "Found Tclsh version $v in the PATH." define TCLSH tclsh } elseif {[file isdirectory$hbtd]} { # This is a macOS system with the Homebrew version of Tcl/Tk # installed. Select the newest version. It won't normally be # in the PATH to avoid shadowing /usr/bin/tclsh, and even if it # were in the PATH, it's bad practice to put /usr/local/bin (the   |  48 49 50 51 52 53 54 55 56 57 58 59 60 61 62  # or a version of tclsh that we find unsuitable below! cc-check-progs tclsh set hbtd /usr/local/Cellar/tcl-tk if {[string equal false [get-define TCLSH]]} { msg-result "WARNING: 'make test' will not run here." } else { set v [exec /bin/sh -c "echo 'puts \$tcl_version' | tclsh"] if {[expr {$v >= 8.6}]} { msg-result "Found Tclsh version $v in the PATH." define TCLSH tclsh } elseif {[file isdirectory$hbtd]} { # This is a macOS system with the Homebrew version of Tcl/Tk # installed. Select the newest version. It won't normally be # in the PATH to avoid shadowing /usr/bin/tclsh, and even if it # were in the PATH, it's bad practice to put /usr/local/bin (the 

Changes to src/makemake.tcl.

 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 .... 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b OPENSSLINCDIR =$(OPENSSLDIR)/include OPENSSLLIBDIR = $(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If ................................................................................ # Enable support for the SQLite Encryption Extension? !ifndef USE_SEE USE_SEE = 0 !endif !if$(FOSSIL_ENABLE_SSL)!=0 SSLDIR = $(B)\compat\openssl-1.1.1b SSLINCDIR =$(SSLDIR)\include !if $(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR =$(SSLDIR) !else SSLLIBDIR = $(SSLDIR) !endif SSLLFLAGS = /nologo /opt:ref /debug   | |  709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 .... 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR =$(SRCDIR)/../compat/openssl-1.1.1c OPENSSLINCDIR = $(OPENSSLDIR)/include OPENSSLLIBDIR =$(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If ................................................................................ # Enable support for the SQLite Encryption Extension? !ifndef USE_SEE USE_SEE = 0 !endif !if $(FOSSIL_ENABLE_SSL)!=0 SSLDIR =$(B)\compat\openssl-1.1.1c SSLINCDIR = $(SSLDIR)\include !if$(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR) !else SSLLIBDIR =$(SSLDIR) !endif SSLLFLAGS = /nologo /opt:ref /debug 

Changes to win/Makefile.mingw.

 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b OPENSSLINCDIR =$(OPENSSLDIR)/include OPENSSLLIBDIR = $(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If   |  172 173 174 175 176 177 178 179 180 181 182 183 184 185 186  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR =$(SRCDIR)/../compat/openssl-1.1.1c OPENSSLINCDIR = $(OPENSSLDIR)/include OPENSSLLIBDIR =$(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If 

Changes to win/Makefile.mingw.mistachkin.

 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 ... 630 631 632 633 634 635 636 637 638 639 640 641 642 643  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b OPENSSLINCDIR =$(OPENSSLDIR)/include OPENSSLLIBDIR = $(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If ................................................................................$(SRCDIR)/../skins/rounded1/footer.txt \ $(SRCDIR)/../skins/rounded1/header.txt \$(SRCDIR)/../skins/xekri/css.txt \ $(SRCDIR)/../skins/xekri/details.txt \$(SRCDIR)/../skins/xekri/footer.txt \ $(SRCDIR)/../skins/xekri/header.txt \$(SRCDIR)/ci_edit.js \ $(SRCDIR)/diff.tcl \$(SRCDIR)/forum.js \ $(SRCDIR)/graph.js \$(SRCDIR)/href.js \ $(SRCDIR)/login.js \$(SRCDIR)/markdown.md \ $(SRCDIR)/menu.js \   | >  172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 ... 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR =$(SRCDIR)/../compat/openssl-1.1.1c OPENSSLINCDIR = $(OPENSSLDIR)/include OPENSSLLIBDIR =$(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If ................................................................................ $(SRCDIR)/../skins/rounded1/footer.txt \$(SRCDIR)/../skins/rounded1/header.txt \ $(SRCDIR)/../skins/xekri/css.txt \$(SRCDIR)/../skins/xekri/details.txt \ $(SRCDIR)/../skins/xekri/footer.txt \$(SRCDIR)/../skins/xekri/header.txt \ $(SRCDIR)/ci_edit.js \$(SRCDIR)/copybtn.js \ $(SRCDIR)/diff.tcl \$(SRCDIR)/forum.js \ $(SRCDIR)/graph.js \$(SRCDIR)/href.js \ $(SRCDIR)/login.js \$(SRCDIR)/markdown.md \ $(SRCDIR)/menu.js \  Changes to win/Makefile.msc.  96 97 98 99 100 101 102 103 104 105 106 107 108 109 110   # Enable support for the SQLite Encryption Extension? !ifndef USE_SEE USE_SEE = 0 !endif !if$(FOSSIL_ENABLE_SSL)!=0 SSLDIR = $(B)\compat\openssl-1.1.1b SSLINCDIR =$(SSLDIR)\include !if $(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR =$(SSLDIR) !else SSLLIBDIR = $(SSLDIR) !endif SSLLFLAGS = /nologo /opt:ref /debug   |  96 97 98 99 100 101 102 103 104 105 106 107 108 109 110   # Enable support for the SQLite Encryption Extension? !ifndef USE_SEE USE_SEE = 0 !endif !if$(FOSSIL_ENABLE_SSL)!=0 SSLDIR = $(B)\compat\openssl-1.1.1c SSLINCDIR =$(SSLDIR)\include !if $(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR =$(SSLDIR) !else SSLLIBDIR = \$(SSLDIR) !endif SSLLFLAGS = /nologo /opt:ref /debug 

Changes to www/build.wiki.

 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173  file "win\buildmsvc.bat" may be used and it will attempt to detect and use the latest installed version of MSVC.

To enable the optional OpenSSL support, first download the official source code for OpenSSL and extract it to an appropriately named "openssl-X.Y.ZA" subdirectory within the local [/tree?ci=trunk&name=compat | compat] directory (e.g. "compat/openssl-1.1.1b"), then make sure that some recent Perl binaries are installed locally, and finally run one of the following commands:
nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin          |          159 160 161 162 163 164 165 166 167 168 169 170 171 172 173   file "win\buildmsvc.bat" may be used and it will attempt to detect and use the latest installed version of MSVC.

To enable the optional OpenSSL support, first download the official source code for OpenSSL and extract it to an appropriately named "openssl-X.Y.ZA" subdirectory within the local [/tree?ci=trunk&name=compat | compat] directory (e.g. "compat/openssl-1.1.1c"), then make sure that some recent Perl binaries are installed locally, and finally run one of the following commands:
nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin