From 39cb018042ed1eac8d6f7ff6cbaaa0e2dda73e7a Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Tue, 25 May 2021 15:56:36 +1000 Subject: [PATCH] chore(windows): move to vc++ 2019 --- common/core/desktop/doc/BUILDING.md | 4 ++-- windows/src/.gitignore | 3 +++ windows/src/README.md | 14 +++++++------- .../help/start/download-and-install-keyboard.md | 6 ++---- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/common/core/desktop/doc/BUILDING.md b/common/core/desktop/doc/BUILDING.md index fa9e65340e..bb7ef01ce7 100644 --- a/common/core/desktop/doc/BUILDING.md +++ b/common/core/desktop/doc/BUILDING.md @@ -3,8 +3,8 @@ ## Prerequisites - Python 3 -- Meson build system. -- C++14 or later compiler (VC++ 2017 or later for Windows). +- Meson build system 0.50 or later. +- C++14 or later compiler (VC++ 2019 or later for Windows). - lib std::fs - kmcomp (for tests) -- must be added to path diff --git a/windows/src/.gitignore b/windows/src/.gitignore index 8e681d9969..75835990a4 100644 --- a/windows/src/.gitignore +++ b/windows/src/.gitignore @@ -11,6 +11,9 @@ **/obj **/x64 +# Temporary build files for VC++ +**/*.FileListAbsolute.txt + # KeymanWeb is copied from /web/src during Developer build developer/TIKE/xml/kmw/resource diff --git a/windows/src/README.md b/windows/src/README.md index 52eac1e637..8bbe69bf4e 100644 --- a/windows/src/README.md +++ b/windows/src/README.md @@ -2,7 +2,7 @@ ## Build Prerequisites -1. Install [VS2017 Community Edition](#visual-studio-2017-community-edition-setup-requirements). +1. Install [VS2019 Community Edition](#visual-studio-2019-community-edition-setup-requirements). 2. Install [Delphi 10.3](#delphi-setup-requirements). 3. Install [git](https://git-scm.com/download/win). 4. Install [nodejs](https://nodejs.org/en/download/). @@ -29,7 +29,7 @@ For local development you do not need to perform a release build so these are op ## Building Keyman for Windows and Keyman Developer -1. Start 'x64_x86 Cross Tools Command Prompt for VS 2017'. +1. Start 'Developer Command Prompt for VS 2019'. 2. Run `make build` from the **windows/src** folder. 3. Artifacts from a successful build will be placed in **windows/bin** folder. @@ -50,7 +50,7 @@ To perform a release build, you will need to obtain valid certificates. A releas unnecessary for local development. Release builds are currently run from a TeamCity CI environment. -1. Start 'x64_x86 Cross Tools Command Prompt for VS 2017'. +1. Start 'Developer Command Prompt for VS 2019'. 2. Run `make release` from the **windows/src** folder. 3. Artifacts from a successful build will be placed in **windows/release** folder. 4. **buildtools/help-keyman-com.sh** will push updated documentation to help.keyman.com. @@ -76,22 +76,22 @@ These steps are only required the first time you install Keyman: 'Trusted Root Certification Authorities'. Click Next and finish the wizard. To deploy a development build of Keyman and Keyman Developer, -1. Start 'x64_x86 Cross Tools Command Prompt for VS 2017'. +1. Start 'Developer Command Prompt for VS 2019'. 2. Run `make signcode` from the **windows/src** folder. 3. Ensure that Keyman and Keyman Developer are not running. 4. Run `make install` in **windows/src/engine**, **windows/src/desktop** and **windows/src/developer**. ## Detailed Prerequisite Notes -### Visual Studio 2017 Community Edition setup requirements +### Visual Studio 2019 Community Edition setup requirements -In Visual Studio 2017, you need to have the following installed: +In Visual Studio 2019, you need to have the following installed: #### Workloads * Desktop development with C++ * Universal Windows Platform development #### Individual components -* Windows Universal CRT SDK +--* Windows Universal CRT SDK * Windows 10.0.17763.0 SDK Configure Visual Studio to use two-space tab stops: diff --git a/windows/src/desktop/help/start/download-and-install-keyboard.md b/windows/src/desktop/help/start/download-and-install-keyboard.md index 096f4fd285..4d4a1e390d 100644 --- a/windows/src/desktop/help/start/download-and-install-keyboard.md +++ b/windows/src/desktop/help/start/download-and-install-keyboard.md @@ -64,8 +64,7 @@ Here's how to download and install a Keyman keyboard within Keyman: computer. **Note:** If a keyboard with the same name is already installed, Keyman will - ask you if you want to replace the old keyboard or cancel the - installation. + automatically replace it. 9. You may be prompted by User Account Control to allow Keyman to make changes to your computer -- click 'Yes'. @@ -118,8 +117,7 @@ how: **Note:** Install installs the keyboard for anyone who can log on to your computer. **Note:** If a keyboard with the same name is already installed, Keyman will - ask you if you want to replace the old keyboard or cancel the - installation. + automatically replace it. 8. Click OK to save your settings and exit Keyman Configuration.