Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-10 06:02:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz 2022-12-10 02:53:09 -05:00
commit d67c3d77d8
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GPL/nativeBuildProperties.gradle
View File

@ -71,7 +71,7 @@ task CheckToolChain {
if (isCurrentWindows()) {
// ensure that required MS Visual Studio is installed
if (!VISUAL_STUDIO_INSTALL_DIR) {
throw new GradleException("Visual Studio not found!");
throw new GradleException("Supported Windows native toolchain not found!");
}
}
}

15
GPL/vsconfig.gradle
View File

@ -32,7 +32,20 @@ def configureVisualStudio() {
println " -> Visual Studio vswhere.exe not found!"
return
}
def vswhereOutput = "${vswherePath} -products * -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -format json".execute().text.trim()
def vswhereProcess = "${vswherePath} -products * -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -format json -utf8".execute()
def vswhereOutput = vswhereProcess.text.trim()
def vswhereExit = vswhereProcess.exitValue()
if (vswhereExit != 0) {
if (vswhereExit == 87) { // ERROR_INVALID_PARAMATER
println " -> Visual Studio vswhere.exe was passed an unsupported argument!"
}
else {
println " -> Visual Studio vswhere.exe returned an error code (${vswhereExit})!"
}
println " -> Please confirm ${vswherePath} is version 2.5 or later."
println " -> Please check README.md or InstallationGuide.html to verify you are using a supported version of Visual Studio."
return
}
def vswhereJson = new groovy.json.JsonSlurper().parseText(vswhereOutput);
if (vswhereJson.isEmpty()) {
println " -> Visual Studio not found!"

4
README.md
View File

@ -46,8 +46,8 @@ To create the latest development build for your platform from this source reposi
* [JDK 17 64-bit][jdk17]
* [Gradle 7.3+][gradle]
* make, gcc, and g++ (Linux/macOS-only)
* [Microsoft Visual Studio][vs] or [Microsoft C++ Build Tools][vcbuildtools] with the following
components installed (Windows-only):
* [Microsoft Visual Studio][vs] 2017+ or [Microsoft C++ Build Tools][vcbuildtools] with the
following components installed (Windows-only):
- MSVC
- Windows SDK
- C++ ATL