pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Simplified and optimised the MSVC tool-chain. 

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/942/head
Dimitar Dobrev 9 years ago committed by João Matos
parent
f992cd8280
commit
b93674f261
2 changed files with 70 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 160
      src/Core/Toolchains/MSVCToolchain.cs
  2. 4
      src/Core/Toolchains/ManagedToolchain.cs

160
src/Core/Toolchains/MSVCToolchain.cs
Unescape View File

@ -53,24 +53,19 @@ namespace CppSharp
/// <summary>Dumps the detected SDK versions.</summary> /// <summary>Dumps the detected SDK versions.</summary>
public static void DumpSdks() public static void DumpSdks()
{ {
List<ToolchainVersion> vsSdks; List<ToolchainVersion> vsSdks = GetVisualStudioSdks();
GetVisualStudioSdks(out vsSdks);
DumpSdks("Visual Studio", vsSdks); DumpSdks("Visual Studio", vsSdks);
List<ToolchainVersion> windowsSdks; List<ToolchainVersion> windowsSdks = GetWindowsSdks();
GetWindowsSdks(out windowsSdks);
DumpSdks("Windows", windowsSdks); DumpSdks("Windows", windowsSdks);
List<ToolchainVersion> windowsKitsSdks; List<ToolchainVersion> windowsKitsSdks = GetWindowsKitsSdks();
GetWindowsKitsSdks(out windowsKitsSdks);
DumpSdks("Windows Kits", windowsKitsSdks); DumpSdks("Windows Kits", windowsKitsSdks);
List<ToolchainVersion> netFrameworkSdks; List<ToolchainVersion> netFrameworkSdks = GetNetFrameworkSdks();
GetNetFrameworkSdks(out netFrameworkSdks);
DumpSdks(".NET Framework", netFrameworkSdks); DumpSdks(".NET Framework", netFrameworkSdks);
List<ToolchainVersion> msbuildSdks; List<ToolchainVersion> msbuildSdks = GetMSBuildSdks();
GetMSBuildSdks(out msbuildSdks);
DumpSdks("MSBuild", msbuildSdks); DumpSdks("MSBuild", msbuildSdks);
} }
@ -80,7 +75,7 @@ namespace CppSharp
VisualStudioVersion.Latest) VisualStudioVersion.Latest)
{ {
Console.WriteLine("\nInclude search path (VS: {0}):", vsVersion); Console.WriteLine("\nInclude search path (VS: {0}):", vsVersion);
foreach (var include in GetSystemIncludes(vsVersion)) foreach (var include in MSVCToolchain.GetSystemIncludes(vsVersion))
Console.WriteLine($"\t{include}"); Console.WriteLine($"\t{include}");
} }
@ -111,15 +106,12 @@ namespace CppSharp
public static ToolchainVersion GetVSToolchain(VisualStudioVersion vsVersion) public static ToolchainVersion GetVSToolchain(VisualStudioVersion vsVersion)
{ {
List<ToolchainVersion> vsSdks; if (VSSdks.Value.Count == 0)
GetVisualStudioSdks(out vsSdks);
if (vsSdks.Count == 0)
throw new Exception("Could not find a valid Visual Studio toolchain"); throw new Exception("Could not find a valid Visual Studio toolchain");
return (vsVersion == VisualStudioVersion.Latest) return (vsVersion == VisualStudioVersion.Latest)
? vsSdks.Last() ? VSSdks.Value.Last()
: vsSdks.Find(version => : VSSdks.Value.Find(version =>
(int) version.Version == GetVisualStudioVersion(vsVersion)); (int) version.Version == GetVisualStudioVersion(vsVersion));
} }
@ -148,8 +140,7 @@ namespace CppSharp
if (match.Success) if (match.Success)
kitsRootKey = match.Groups[0].Value; kitsRootKey = match.Groups[0].Value;
List<ToolchainVersion> windowsKitsSdks; List<ToolchainVersion> windowsKitsSdks = GetWindowsKitsSdks();
GetWindowsKitsSdks(out windowsKitsSdks);
var windowsKitSdk = (!string.IsNullOrWhiteSpace(kitsRootKey)) var windowsKitSdk = (!string.IsNullOrWhiteSpace(kitsRootKey))
? windowsKitsSdks.Find(version => version.Value == kitsRootKey) ? windowsKitsSdks.Find(version => version.Value == kitsRootKey)
@ -231,8 +222,7 @@ namespace CppSharp
int windowsSdkMajorVer; int windowsSdkMajorVer;
var windowsKitSdk = GetWindowsKitsToolchain(vsVersion, out windowsSdkMajorVer); var windowsKitSdk = GetWindowsKitsToolchain(vsVersion, out windowsSdkMajorVer);
List<ToolchainVersion> windowsSdks; List<ToolchainVersion> windowsSdks = GetWindowsSdks();
GetWindowsSdks(out windowsSdks);
var includes = new List<string> { Path.Combine(vsDir, @"VC\include") }; var includes = new List<string> { Path.Combine(vsDir, @"VC\include") };
// Older Visual Studio versions provide their own Windows SDK. // Older Visual Studio versions provide their own Windows SDK.
@ -298,7 +288,7 @@ namespace CppSharp
if (File.Exists(vsVarsPath)) if (File.Exists(vsVarsPath))
{ {
var vsVarsFile = File.ReadAllText(vsVarsPath); var vsVarsFile = File.ReadAllText(vsVarsPath);
var match = Regex.Match(vsVarsFile, @"INCLUDE=%UniversalCRTSdkDir%(.+)%INCLUDE%"); var match = Regex.Match(vsVarsFile, "INCLUDE=%UniversalCRTSdkDir%(.+)%INCLUDE%");
if (match.Success) if (match.Success)
ucrtPaths = match.Groups[1].Value; ucrtPaths = match.Groups[1].Value;
} }
@ -338,99 +328,82 @@ namespace CppSharp
/// <summary> /// <summary>
/// Gets .NET framework installation directories. /// Gets .NET framework installation directories.
/// </summary> /// </summary>
/// <param name="versions">Collection holding information about available .Net-framework-sdks</param>
/// <returns>Success of the operation</returns> /// <returns>Success of the operation</returns>
public static bool GetNetFrameworkSdks(out List<ToolchainVersion> versions) public static List<ToolchainVersion> GetNetFrameworkSdks()
{ {
versions = new List<ToolchainVersion>(); List<ToolchainVersion> versions = GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\.NETFramework", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\.NETFramework",
"InstallRoot", versions, RegistryView.Registry32); "InstallRoot", RegistryView.Registry32);
if (versions.Count == 0 && Environment.Is64BitProcess) if (versions.Count == 0 && Environment.Is64BitProcess)
{ versions.AddRange(GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\.NETFramework", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\.NETFramework",
"InstallRoot", versions, RegistryView.Registry64); "InstallRoot", RegistryView.Registry64));
}
versions.Sort((v1, v2) => (int)(v1.Version - v2.Version)); versions.Sort((v1, v2) => (int)(v1.Version - v2.Version));
return versions.Count != 0; return versions;
} }
/// <summary> /// <summary>
/// Gets MSBuild installation directories. /// Gets MSBuild installation directories.
/// </summary> /// </summary>
/// <param name="versions">Collection holding information about available ms-build-sdks</param> ///
/// <returns>Success of the operation</returns> /// <returns>Success of the operation</returns>
public static bool GetMSBuildSdks(out List<ToolchainVersion> versions) public static List<ToolchainVersion> GetMSBuildSdks()
{ {
versions = new List<ToolchainVersion>(); List<ToolchainVersion> versions = GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions",
"MSBuildToolsPath", versions, RegistryView.Registry32); "MSBuildToolsPath", RegistryView.Registry32);
if (versions.Count == 0 && Environment.Is64BitProcess) if (versions.Count == 0 && Environment.Is64BitProcess)
{ versions.AddRange(GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions",
"MSBuildToolsPath", versions, RegistryView.Registry64); "MSBuildToolsPath", RegistryView.Registry64));
}
versions.Sort((v1, v2) => (int)(v1.Version - v2.Version)); versions.Sort((v1, v2) => (int)(v1.Version - v2.Version));
return versions.Count != 0; return versions;
} }
/// <summary> /// <summary>
/// Gets Windows SDK installation directories. /// Gets Windows SDK installation directories.
/// </summary> /// </summary>
/// <param name="versions">Collection holding information about available windows-sdks</param>
/// <returns>Success of the operation</returns> /// <returns>Success of the operation</returns>
public static bool GetWindowsSdks(out List<ToolchainVersion> versions) public static List<ToolchainVersion> GetWindowsSdks()
{ {
versions = new List<ToolchainVersion>(); List<ToolchainVersion> versions = GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows",
"InstallationFolder", versions, RegistryView.Registry32); "InstallationFolder", RegistryView.Registry32);
if (versions.Count == 0 && Environment.Is64BitProcess) if (versions.Count == 0 && Environment.Is64BitProcess)
{ versions.AddRange(GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows",
"InstallationFolder", versions, RegistryView.Registry64); "InstallationFolder", RegistryView.Registry64));
}
versions.Sort((v1, v2) => (int)(v1.Version - v2.Version)); versions.Sort((v1, v2) => (int)(v1.Version - v2.Version));
return versions.Count != 0;
return versions;
} }
/// <summary> /// <summary>
/// Gets Windows Kits SDK installation directories. /// Gets Windows Kits SDK installation directories.
/// </summary> /// </summary>
/// <param name="versions">Collection holding information about available WindowsKitsSdks</param>
/// <returns>Success of the operation</returns> /// <returns>Success of the operation</returns>
public static bool GetWindowsKitsSdks(out List<ToolchainVersion> versions) public static List<ToolchainVersion> GetWindowsKitsSdks()
{ {
versions = new List<ToolchainVersion>(); List<ToolchainVersion> versions = GetToolchainsFromSystemRegistryValues(
GetToolchainsFromSystemRegistryValues(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots",
"KitsRoot", versions, RegistryView.Registry32); "KitsRoot", RegistryView.Registry32);
if (versions.Count == 0 && Environment.Is64BitProcess) if (versions.Count == 0 && Environment.Is64BitProcess)
{ versions.AddRange(GetToolchainsFromSystemRegistryValues(
GetToolchainsFromSystemRegistryValues(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots",
"KitsRoot", versions, RegistryView.Registry64); "KitsRoot", RegistryView.Registry64));
}
versions.Sort((v1, v2) => (int)(v1.Version - v2.Version)); versions.Sort((v1, v2) => (int)(v1.Version - v2.Version));
return true; return versions;
} }
/// <summary> /// <summary>
@ -438,37 +411,31 @@ namespace CppSharp
/// </summary> /// </summary>
/// <param name="versions">Collection holding information about available Visual Studio instances</param> /// <param name="versions">Collection holding information about available Visual Studio instances</param>
/// <returns>Success of the operation</returns> /// <returns>Success of the operation</returns>
public static bool GetVisualStudioSdks(out List<ToolchainVersion> versions) public static List<ToolchainVersion> GetVisualStudioSdks()
{ {
versions = new List<ToolchainVersion>(); var versions = GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio",
"InstallDir", versions, RegistryView.Registry32); "InstallDir", RegistryView.Registry32);
if (versions.Count == 0 && Environment.Is64BitProcess) if (versions.Count == 0 && Environment.Is64BitProcess)
{ versions.AddRange(GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio",
"InstallDir", versions, RegistryView.Registry64); "InstallDir", RegistryView.Registry64));
}
GetToolchainsFromSystemRegistry( versions.AddRange(GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress",
"InstallDir", versions, RegistryView.Registry32); "InstallDir", RegistryView.Registry32));
if (versions.Count == 0 && Environment.Is64BitProcess) if (versions.Count == 0 && Environment.Is64BitProcess)
{ versions.AddRange(GetToolchainsFromSystemRegistry(
GetToolchainsFromSystemRegistry(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress",
"InstallDir", versions, RegistryView.Registry64); "InstallDir", RegistryView.Registry64));
}
//Check for VS 2017 //Check for VS 2017
GetVs2017Instances(versions); GetVs2017Instances(versions);
versions.Sort((v1, v2) => (int)(v1.Version - v2.Version)); versions.Sort((v1, v2) => (int)(v1.Version - v2.Version));
return true; return versions;
} }
/// <summary> /// <summary>
@ -476,18 +443,19 @@ namespace CppSharp
/// </summary> /// </summary>
/// <param name="keyPath">The path to the key in the registry.</param> /// <param name="keyPath">The path to the key in the registry.</param>
/// <param name="matchValue">The value to match in the located key, if any.</param> /// <param name="matchValue">The value to match in the located key, if any.</param>
/// <param name="entries">The collected tool-chains.</param>
/// <param name="view">The type of registry, 32 or 64, to target.</param> /// <param name="view">The type of registry, 32 or 64, to target.</param>
public static bool GetToolchainsFromSystemRegistryValues(string keyPath, ///
string matchValue, ICollection<ToolchainVersion> entries, RegistryView view) public static List<ToolchainVersion> GetToolchainsFromSystemRegistryValues(
string keyPath, string matchValue, RegistryView view)
{ {
string subKey; string subKey;
var hive = GetRegistryHive(keyPath, out subKey); var hive = GetRegistryHive(keyPath, out subKey);
using (var rootKey = RegistryKey.OpenBaseKey(hive, view)) using (var rootKey = RegistryKey.OpenBaseKey(hive, view))
using (var key = rootKey.OpenSubKey(subKey, writable: false)) using (var key = rootKey.OpenSubKey(subKey, writable: false))
{ {
var entries = new List<ToolchainVersion>();
if (key == null) if (key == null)
return false; return entries;
foreach (var valueName in key.GetValueNames()) foreach (var valueName in key.GetValueNames())
{ {
@ -517,9 +485,9 @@ namespace CppSharp
entries.Add(entry); entries.Add(entry);
} }
}
return true; return entries;
}
} }
/// <summary> /// <summary>
@ -533,19 +501,20 @@ namespace CppSharp
/// characters are compared. /// characters are compared.
/// </summary> /// </summary>
/// <param name="keyPath">The path to the key in the registry.</param> /// <param name="keyPath">The path to the key in the registry.</param>
/// <param name="valueName">The name of the value in the registry.</param>
/// <param name="matchValue">The value to match in the located key, if any.</param> /// <param name="matchValue">The value to match in the located key, if any.</param>
/// <param name="entries">The collected tool-chains.</param>
/// <param name="view">The type of registry, 32 or 64, to target.</param> /// <param name="view">The type of registry, 32 or 64, to target.</param>
private static bool GetToolchainsFromSystemRegistry(string keyPath, string valueName, private static List<ToolchainVersion> GetToolchainsFromSystemRegistry(
ICollection<ToolchainVersion> entries, RegistryView view) string keyPath, string valueName, RegistryView view)
{ {
string subKey; string subKey;
var hive = GetRegistryHive(keyPath, out subKey); var hive = GetRegistryHive(keyPath, out subKey);
using (var rootKey = RegistryKey.OpenBaseKey(hive, view)) using (var rootKey = RegistryKey.OpenBaseKey(hive, view))
using (var key = rootKey.OpenSubKey(subKey, writable: false)) using (var key = rootKey.OpenSubKey(subKey, writable: false))
{ {
var entries = new List<ToolchainVersion>();
if (key == null) if (key == null)
return false; return entries;
foreach (var subKeyName in key.GetSubKeyNames()) foreach (var subKeyName in key.GetSubKeyNames())
{ {
@ -554,9 +523,8 @@ namespace CppSharp
subKeyName)) subKeyName))
entries.Add(entry); entries.Add(entry);
} }
return entries;
} }
return true;
} }
private static bool HandleToolchainRegistrySubKey(out ToolchainVersion entry, private static bool HandleToolchainRegistrySubKey(out ToolchainVersion entry,
@ -624,6 +592,9 @@ namespace CppSharp
return hive; return hive;
} }
private static Lazy<List<ToolchainVersion>> VSSdks =
new Lazy<List<ToolchainVersion>>(GetVisualStudioSdks, true);
#region VS2017 #region VS2017
/// <summary> /// <summary>
@ -775,6 +746,7 @@ namespace CppSharp
} }
return true; return true;
} }
#endregion #endregion
} }
} }

4
src/Core/Toolchains/ManagedToolchain.cs
Unescape View File

@ -21,8 +21,8 @@ namespace CppSharp
{ {
if (Platform.IsWindows) if (Platform.IsWindows)
{ {
List<ToolchainVersion> versions; List<ToolchainVersion> versions = MSVCToolchain.GetMSBuildSdks();
if (!MSVCToolchain.GetMSBuildSdks(out versions)) if (versions.Count == 0)
throw new Exception("Could not find MSBuild SDK paths"); throw new Exception("Could not find MSBuild SDK paths");
var sdk = versions.Last(); var sdk = versions.Last();

Write Preview
Loading…
Cancel
Save