simon-git: putty (main): Simon Tatham
Commits to Tartarus hosted VCS
tartarus-commits at lists.tartarus.org
Mon Apr 26 18:25:09 BST 2021
TL;DR:
d9f21732 Break up gtkmisc.c.
f39c51f9 Rename most of the platform source files.
77940f8f Move some add_executable() calls to top-level CMakeLists.
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-04-26 18:25:09
commit d9f217323e5218bb4b881901255ee46ced3d6777
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=d9f217323e5218bb4b881901255ee46ced3d6777;hp=7f3a3a21eb7aee752fbce70bd2a5de1bcae0e704
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Apr 24 07:51:15 2021 +0100
Break up gtkmisc.c.
It's another file that should have been subdivided into lots of tiny
separate things in the utils library - especially since for some
reason I made a completely separate 'guimisc' cmake-level library for
it when there was no need.
unix/CMakeLists.txt | 21 ++++----
unix/utils/align_label_left.c | 20 +++++++
unix/utils/buildinfo_gtk_version.c | 14 +++++
unix/utils/get_label_text_dimensions.c | 42 +++++++++++++++
unix/utils/get_x11_display.c | 34 ++++++++++++
unix/{gtkmisc.c => utils/our_dialog.c} | 98 ++--------------------------------
unix/utils/string_width.c | 18 +++++++
7 files changed, 145 insertions(+), 102 deletions(-)
commit f39c51f9a74bdf2b00c4939c02abf12090781446
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=f39c51f9a74bdf2b00c4939c02abf12090781446;hp=d9f217323e5218bb4b881901255ee46ced3d6777
Author: Simon Tatham <anakin at pobox.com>
Date: Fri Apr 23 06:19:05 2021 +0100
Rename most of the platform source files.
This gets rid of all those annoying 'win', 'ux' and 'gtk' prefixes
which made filenames annoying to type and to tab-complete. Also, as
with my other recent renaming sprees, I've taken the opportunity to
expand and clarify some of the names so that they're not such cryptic
abbreviations.
unix/CMakeLists.txt | 99 ++++++++++++++++---------------
unix/{uxagentc.c => agent-client.c} | 0
unix/{uxagentsock.c => agent-socket.c} | 0
unix/{gtkask.c => askpass.c} | 2 +-
unix/{uxcliloop.c => cliloop.c} | 0
unix/{gtkcols.c => columns.c} | 2 +-
unix/{gtkcols.h => columns.h} | 2 +-
unix/{gtkcfg.c => config-gtk.c} | 0
unix/{uxcfg.c => config-unix.c} | 0
unix/{uxcons.c => console.c} | 0
unix/{gtkdlg.c => dialog.c} | 4 +-
unix/{uxfdsock.c => fd-socket.c} | 0
unix/{uxgss.c => gss.c} | 0
unix/{gtkcomm.c => gtk-common.c} | 2 +-
unix/{uxgen.c => keygen-noise.c} | 0
unix/{uxproxy.c => local-proxy.c} | 0
unix/{gtkapp.c => main-gtk-application.c} | 0
unix/{gtkmain.c => main-gtk-simple.c} | 2 +-
unix/{uxnet.c => network.c} | 0
unix/{uxnogtk.c => no-gtk.c} | 0
unix/{uxnoise.c => noise.c} | 0
unix/{uxpgnt.c => pageant.c} | 0
unix/{uxpeer.c => peerinfo.c} | 0
unix/{uxplink.c => plink.c} | 0
unix/{uxprint.c => printing.c} | 0
unix/{uxsocks.c => psocks.c} | 0
unix/{uxpsusan.c => psusan.c} | 0
unix/{xpmptcfg.c => pterm-config-xpm.c} | 0
unix/{xpmpterm.c => pterm-xpm.c} | 0
unix/{uxpterm.c => pterm.c} | 0
unix/{uxpty.c => pty.c} | 0
unix/{xpmpucfg.c => putty-config-xpm.c} | 0
unix/{xpmputty.c => putty-xpm.c} | 0
unix/{uxputty.c => putty.c} | 0
unix/{uxser.c => serial.c} | 0
unix/{uxsftp.c => sftp.c} | 0
unix/{uxsftpserver.c => sftpserver.c} | 0
unix/{uxshare.c => sharing.c} | 0
unix/{uxstore.c => storage.c} | 0
unix/{uxucs.c => unicode.c} | 0
unix/{gtkfont.c => unifont.c} | 2 +-
unix/{gtkfont.h => unifont.h} | 0
unix/{uxserver.c => uppity.c} | 0
unix/{gtkwin.c => window.c} | 2 +-
unix/{ux_x11.c => x11.c} | 0
windows/CMakeLists.txt | 66 ++++++++++-----------
windows/{winpgntc.c => agent-client.c} | 4 +-
windows/{wincliloop.c => cliloop.c} | 0
windows/{wincfg.c => config.c} | 0
windows/{wincons.c => console.c} | 0
windows/{winctrls.c => controls.c} | 0
windows/{wincapi.h => cryptoapi.h} | 2 +-
windows/{windlg.c => dialog.c} | 4 +-
windows/{wingss.c => gss.c} | 0
windows/{winhandl.c => handle-io.c} | 0
windows/{winhsock.c => handle-socket.c} | 0
windows/{winhelp.c => help.c} | 2 +-
windows/{winhelp.h => help.h} | 2 +-
windows/{winhelp.rc2 => help.rc2} | 2 +-
windows/{winjump.c => jump-list.c} | 0
windows/{winproxy.c => local-proxy.c} | 0
windows/{winnpc.c => named-pipe-client.c} | 2 +-
windows/{winnps.c => named-pipe-server.c} | 2 +-
windows/{winnet.c => network.c} | 0
windows/{winnojmp.c => no-jump-list.c} | 0
windows/{winnohlp.c => nohelp.c} | 0
windows/{winnoise.c => noise.c} | 0
windows/{winpgnt.c => pageant.c} | 4 +-
windows/pageant.rc | 2 +-
windows/platform.h | 2 +-
windows/{winplink.c => plink.c} | 2 +-
windows/{winprint.c => printing.c} | 0
windows/{winsocks.c => psocks.c} | 0
windows/{win_res.rc2 => putty-common.rc2} | 2 +-
windows/{win_res.h => putty-rc.h} | 2 +-
windows/putty.rc | 4 +-
windows/{winpgen.c => puttygen.c} | 2 +-
windows/puttygen.rc | 2 +-
windows/puttytel.rc | 4 +-
windows/{winsecur.h => security-api.h} | 2 +-
windows/{winselcli.c => select-cli.c} | 0
windows/{winselgui.c => select-gui.c} | 0
windows/{winser.c => serial.c} | 0
windows/{winsftp.c => sftp.c} | 2 +-
windows/{winshare.c => sharing.c} | 4 +-
windows/{winstore.c => storage.c} | 0
windows/{winucs.c => unicode.c} | 0
windows/utils/{capi.c => cryptoapi.c} | 4 +-
windows/utils/security.c | 4 +-
windows/{winseat.h => win-gui-seat.h} | 0
windows/window.c | 6 +-
windows/{winx11.c => x11.c} | 0
92 files changed, 127 insertions(+), 124 deletions(-)
commit 77940f8fa3c7da491933e2efbacad3dec165b21f
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=77940f8fa3c7da491933e2efbacad3dec165b21f;hp=f39c51f9a74bdf2b00c4939c02abf12090781446
Author: Simon Tatham <anakin at pobox.com>
Date: Fri Apr 23 06:46:02 2021 +0100
Move some add_executable() calls to top-level CMakeLists.
Now that the main source file of Plink in each platform directory has
the same name, we can put centralise the main definition of the
program in the main CMakeLists.txt, and in the platform directory,
just add the few extra modules needed to clear up platform-specific
details.
The same goes for psocks. And PSCP and PSFTP could have been moved to
the top level already - I just hadn't done it in the initial setup.
CMakeLists.txt | 37 ++++++++++++++++++++++++++++++++++-
cmake/platforms/unix.cmake | 4 ++--
cmake/platforms/windows.cmake | 2 --
cmake/setup.cmake | 10 +++++++---
unix/CMakeLists.txt | 38 ++++--------------------------------
windows/CMakeLists.txt | 45 ++++---------------------------------------
6 files changed, 53 insertions(+), 83 deletions(-)
More information about the tartarus-commits
mailing list