Skip to content

Build NVDA with Visual Studio 2019 #10169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelDCurran merged 10 commits into from
Feb 13, 2020
Merged

Build NVDA with Visual Studio 2019 #10169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
56c08e4
Update to VS2019
Sep 5, 2019
54c92b2
Update readme
Sep 6, 2019
5dee347
Fix flake8 include
Sep 20, 2019
4632cd1
Fix openssl 1.1 on appveyor
Sep 20, 2019
b2a13a0
Fix readme
Sep 20, 2019
56922f9
Merge remote-tracking branch 'origin/master' into vs2019
Sep 25, 2019
28bc3ab
Merge remote-tracking branch 'origin/master' into vs2019
Nov 26, 2019
2edffb0
Merge remote-tracking branch 'origin/master' into vs2019
LeonarddeR Jan 21, 2020
39d436b
Bump scons to 3.1.2
LeonarddeR Jan 21, 2020
79cb9c0
Fix bad merge for download link
LeonarddeR Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
url = https://github.com/nvaccess/comtypes-bin
[submodule "include/scons"]
path = include/scons
url = https://github.com/SConsProject/scons
url = https://github.com/SCons/scons
[submodule "include/ia2"]
path = include/ia2
url = https://github.com/LinuxA11y/IAccessible2.git
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
os: Visual Studio 2017
os: Visual Studio 2019
version: "{branch}-{build}"

branches:
Expand Down Expand Up @@ -63,8 +63,8 @@ install:
# Decrypt files.
- ps: |
if(!$env:APPVEYOR_PULL_REQUEST_NUMBER) {
openssl enc -aes-256-cbc -d -pass pass:$env:encFileKey -in authenticode.pfx.enc -out authenticode.pfx
openssl enc -aes-256-cbc -d -pass pass:$env:encFileKey -in ssh_id_rsa.enc -out ssh_id_rsa
openssl enc -md md5 -aes-256-cbc -d -pass pass:$env:encFileKey -in authenticode.pfx.enc -out authenticode.pfx
openssl enc -md md5 -aes-256-cbc -d -pass pass:$env:encFileKey -in ssh_id_rsa.enc -out ssh_id_rsa
# Install ssh stuff.
copy ssh_id_rsa $env:userprofile\.ssh\id_rsa
}
Expand Down
2 changes: 1 addition & 1 deletion include/scons
Open in desktop
Submodule scons updated 844 files
6 changes: 3 additions & 3 deletions nvdaHelper/archBuild_sconscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ def COMProxyDllBuilder(env,target,source,proxyClsid):
return proxyDll
env.AddMethod(COMProxyDllBuilder,'COMProxyDll')

# We only support compiling with MSVC 14.1 (2017)
if not env.get('MSVC_VERSION')=='14.1':
raise RuntimeError("Visual C++ 14.1 (Visual Studio 2017) not found")
# We only support compiling with MSVC 14.2 (2019)
if not env.get('MSVC_VERSION')=='14.2':
raise RuntimeError("Visual C++ 14.2 (Visual Studio 2019) not found")


TARGET_ARCH=env['TARGET_ARCH']
Expand Down
5 changes: 3 additions & 2 deletions nvdaHelper/localWin10/sconscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ localWin10Lib = env.SharedLibrary(
# Therefore, we must include it.
# VS 2017 keeps changing the path to reflect the latest major.minor.build version which we canot easily find out.
# Therefore Search these versioned directories from newest to oldest to collect all the files we need.
msvc = env.get('MSVC_VERSION')
vcRedistDirs = glob.glob(os.path.join(
find_vc_pdir(env.get("MSVC_VERSION")),
r"Redist\MSVC\%s*\x86\Microsoft.VC141.CRT" % env.get("MSVC_VERSION")
find_vc_pdir(msvc),
rf"Redist\MSVC\{msvc}*\x86\Microsoft.VC{msvc.replace('.', '')}.CRT"
))
if len(vcRedistDirs)==0:
raise RuntimeError("Could not locate vc redistributables. Perhaps the Universal Windows Platform component in visual Studio is not installed")
Expand Down
27 changes: 14 additions & 13 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,20 @@ The following dependencies need to be installed on your system:

* [Python](https://www.python.org/), version 3.7, 32 bit
* Don't use `3.7.6` it causes an error while building, for now use `3.7.5` see #10696.
* Microsoft Visual Studio 2017 Community, Version 15.3 or later:
* Download from https://visualstudio.microsoft.com/vs/older-downloads/
* Microsoft Visual Studio 2019 Community, Version 16.3 or later:
* Download from https://visualstudio.microsoft.com/vs/
* When installing Visual Studio, you need to enable the following:
On the Workloads tab, in the Windows group:
* Universal Windows Platform Development
* Desktop development with C++
* Then in the Installation details section, under Desktop for C++, Optional grouping, ensure the following are selected:
* VC++ 2017 v141 toolset (x86,x64)
* Windows 10 SDK (10.0.17134.0) for Desktop C++ x86 and x64
* Visual C++ ATL for x86 and x64
* In the Installation details section, under Individual components, ensure the following are selected:
* Visual C++ compilers and libraries for ARM64
* Visual C++ ATL for ARM64
* On the Workloads tab
* in the Windows group:
* Desktop development with C++
* Then in the Installation details section, under Desktop for C++, Optional grouping, ensure the following are selected:
* MSVC v142 - VS 2019 C++ x64/x86 build tools
* Windows 10 SDK (10.0.18362.0)
* C++ ATL for v142 build tools (x86 & x64)
* C++ Clang tools for Windows
* On the Individual components tab, ensure the following items are selected:
* MSVC v142 - VS 2019 C++ ARM64 build tools
* C++ ATL for v142 build tools (ARM64)


### Git Submodules
Expand Down Expand Up @@ -84,7 +85,7 @@ Additionally, the following build time dependencies are included in Git submodul
* [Py2Exe](https://github.com/albertosottile/py2exe/), version 0.9.3.2 commit b372a8e
* [Python Windows Extensions](https://sourceforge.net/projects/pywin32/ ), build 224, required by py2exe
* [txt2tags](https://txt2tags.org/), version 2.5
* [SCons](https://www.scons.org/), version 3.0.4
* [SCons](https://www.scons.org/), version 3.1.2
* [Nulsoft Install System](https://nsis.sourceforge.io/Main_Page/), version 2.51
* [NSIS UAC plug-in](https://nsis.sourceforge.io/UAC_plug-in), version 0.2.4, ansi
* xgettext and msgfmt from [GNU gettext](https://sourceforge.net/projects/cppcms/files/boost_locale/gettext_for_windows/)
Expand Down
2 changes: 1 addition & 1 deletion tests/lint/flake8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ exclude = # don't bother looking in the following subdirectories / files.
.tox,
build,
output,
include,
include/*,
miscDeps,
source/louis,