Merge 54c92b2 into e77dcbd

LeonarddeR · web-flow · commit 915c5f8752d7 · 2019-09-18T06:24:52.000Z
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2017
+os: Visual Studio 2019
 version: "{branch}-{build}"
 
 branches:
diff --git a/include/scons b/include/scons
@@ -1 +1 @@
-Subproject commit 73b2c02d7088c6d6490fdede8396d88103b00482
+Subproject commit 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3
diff --git a/nvdaHelper/archBuild_sconscript b/nvdaHelper/archBuild_sconscript
@@ -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']
diff --git a/nvdaHelper/localWin10/sconscript b/nvdaHelper/localWin10/sconscript
@@ -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") 
diff --git a/readme.md b/readme.md
@@ -37,19 +37,19 @@ The following dependencies need to be installed on your system:
 
 * [Python](http://www.python.org/), version 3.7, 32 bit
 	* Use latest minor version if possible.
-* Microsoft Visual Studio 2017 Community, Version 15.3 or later:
+* Microsoft Visual Studio 2019 Community, Version 16.2 or later:
 	* Download from https://visualstudio.microsoft.com/downloads/
 	* When installing Visual Studio, you need to enable the following:
-		On the Workloads tab, in the Windows group:
-			* Universal Windows Platform Development
+		* 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:
-			* 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
+			* 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
@@ -83,7 +83,7 @@ Additionally, the following build time dependencies are included in Git submodul
 * [Py2Exe](http://github.com/albertosottile/py2exe/), version 0.9.3.2 commit b372a8e
 * [Python Windows Extensions](http://sourceforge.net/projects/pywin32/ ), build 224, required by py2exe
 * [txt2tags](http://txt2tags.sourceforge.net/), version 2.5
-* [SCons](http://www.scons.org/), version 3.0.4
+* [SCons](http://www.scons.org/), version 3.1.1
 * [Nulsoft Install System](http://nsis.sourceforge.net/), version 2.51
 * [NSIS UAC plug-in](http://nsis.sourceforge.net/UAC_plug-in), version 0.2.4, ansi
 * xgettext and msgfmt from [GNU gettext](http://sourceforge.net/projects/cppcms/files/boost_locale/gettext_for_windows/)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-os: Visual Studio 2017`
	`1`	`+os: Visual Studio 2019`
`2`	`2`	`version: "{branch}-{build}"`
`3`	`3`
`4`	`4`	`branches:`