simon-git: putty (main): Simon Tatham

Mon May 3 17:02:24 BST 2021

TL;DR:
  de7c826f Spelling errors in the release checklist.
  4a8fc43d Prepare gitcommit.cmake to support multiple output types.
  f60853ec Configurable CHM path in installer source.
  31f496b5 Integrate the 'doc' subdir into the CMake system.
  e706c044 Add the man pages to the 'make install' target.
  c037aef2 Better detection of NOT_X_WINDOWS.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2021-05-03 17:02:24

commit de7c826fa380663c865cfd4dee3a5d43f05298b0
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=de7c826fa380663c865cfd4dee3a5d43f05298b0;hp=f36a871ad31468b0032afe70f743f9d6d89042f1
Author: Simon Tatham <anakin at pobox.com>
Date:   Thu Apr 29 20:05:24 2021 +0100

    Spelling errors in the release checklist.

    'master' is now spelled 'main', and 'testsc' has _never_ been spelled
    'sctest' (oops).

 CHECKLST.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 4a8fc43d81e97594691f6afcf5e9adefdcbec9d7
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=4a8fc43d81e97594691f6afcf5e9adefdcbec9d7;hp=de7c826fa380663c865cfd4dee3a5d43f05298b0
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon May 3 15:08:41 2021 +0100

    Prepare gitcommit.cmake to support multiple output types.

    I'm about to want to embed the current git commit into a Halibut
    source file, for which I'll need to add a second output mode to the
    existing script that finds it out.

 cmake/gitcommit.cmake | 6 +++++-
 cmake/setup.cmake     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

commit f60853ec664f431dfa06ab091e49a3f4110ab141
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=f60853ec664f431dfa06ab091e49a3f4110ab141;hp=4a8fc43d81e97594691f6afcf5e9adefdcbec9d7
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon May 3 16:21:26 2021 +0100

    Configurable CHM path in installer source.

    At the moment, it assumes the CHM lives in ../doc, which won't always
    be true once we start doing out-of-tree builds of the documentation.

 windows/installer.wxs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 31f496b59cb92f1cf14ce4064d57e9dd8cc751db
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=31f496b59cb92f1cf14ce4064d57e9dd8cc751db;hp=f60853ec664f431dfa06ab091e49a3f4110ab141
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun May 2 15:34:57 2021 +0100

    Integrate the 'doc' subdir into the CMake system.

    The standalone separate doc/Makefile is gone, replaced by a
    CMakeLists.txt that makes 'doc' function as a subdirectory of the main
    CMake build system. This auto-detects Halibut, and if it's present,
    uses it to build the man pages and the various forms of the main
    manual, including the Windows CHM help file in particular.

    One awkward thing I had to do was to move just one config directive in
    blurb.but into its own file: the one that cites a relative path to the
    stylesheet file to put into the CHM. CMake builds often like to be
    out-of-tree, so there's no longer a fixed relative path between the
    build directory and chm.css. And Halibut has no concept of an include
    path to search for files cited by other files, so I can't fix that
    with an -I option on the Halibut command line. So I moved that single
    config directive into its own file, and had CMake write out a custom
    version of that file in the build directory citing the right path.

    (Perhaps in the longer term I should fix that omission in Halibut;
    out-of-tree friendliness seems like a useful feature. But even if I
    do, I still need this build to work now.)

 Buildscr              |  48 ++++++++++----------
 CMakeLists.txt        |   2 +
 cmake/gitcommit.cmake |  10 ++++
 doc/CMakeLists.txt    | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/Makefile          |  85 ----------------------------------
 doc/blurb.but         |   1 -
 doc/chmextra.but      |   6 +++
 mkunxarc.sh           |   3 --
 8 files changed, 166 insertions(+), 112 deletions(-)

commit e706c044511e7b4ca792475b8b4642b34059378c
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=e706c044511e7b4ca792475b8b4642b34059378c;hp=31f496b59cb92f1cf14ce4064d57e9dd8cc751db
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon May 3 16:25:21 2021 +0100

    Add the man pages to the 'make install' target.

    doc/CMakeLists.txt now sets a variable indicating that we either have,
    or can build, each individual man page. And when we call our
    installed_program() function to mark a program as official enough to
    put in 'make install', that function also installs the man page
    similarly if it exists, and warns if not.

    For the convenience of people building-and-installing from the .tar.gz
    we ship, I've arranged that they can still get the man pages installed
    without needing Halibut: the previous commit ensured that the prebuilt
    man pages are still in the tarball, and this one arranges that if we
    don't have Halibut but we do have prebuilt man pages, then we can
    'build' them by copying from the prebuilt versions.

 CMakeLists.txt             | 2 ++
 cmake/platforms/unix.cmake | 8 ++++++++
 doc/CMakeLists.txt         | 8 ++++++++
 3 files changed, 18 insertions(+)

commit c037aef285f052cec31a0c346d8ab1fa9fc171a3
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=c037aef285f052cec31a0c346d8ab1fa9fc171a3;hp=e706c044511e7b4ca792475b8b4642b34059378c
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon May 3 16:42:03 2021 +0100

    Better detection of NOT_X_WINDOWS.

    When building against the Mac Homebrew installation of GTK, you find
    that GTK exists, libX11 exists, but the integration between the two
    (in the form of the header file gdk/gdkx.h) doesn't exist. In that
    situation, we need to compile out X11 support.

 cmake/platforms/unix.cmake | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)