yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

GP-2786: A few improvements

Browse source
This commit is contained in:
Ryan Kurtz 2022-11-02 11:01:47 -04:00
parent a437164b72
commit cddcf3d3e7
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GPL/nativeBuildProperties.gradle
View file

@ -52,7 +52,7 @@ model {
} }
} }
} }
if (isCurrentWindows()) { if (isCurrentWindows() && VISUAL_STUDIO_INSTALL_DIR) {
// specify installDir because Gradle doesn't find VS Build Tools. // specify installDir because Gradle doesn't find VS Build Tools.
// See https://github.com/gradle/gradle-native/issues/617#issuecomment-575735288 // See https://github.com/gradle/gradle-native/issues/617#issuecomment-575735288
visualCpp(VisualCpp) { visualCpp(VisualCpp) {

4
GPL/vsconfig.gradle
View file

@ -29,13 +29,13 @@ def configureVisualStudio() {
println "Searching for latest Visual Studio and required components..." println "Searching for latest Visual Studio and required components..."
def vswherePath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe" def vswherePath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe"
if (!file(vswherePath).exists()) { if (!file(vswherePath).exists()) {
println "Visual Studio not found!" println " -> Visual Studio vswhere.exe not found!"
return return
} }
def vswhereOutput = "${vswherePath} -products * -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -format json".execute().text.trim() def vswhereOutput = "${vswherePath} -products * -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -format json".execute().text.trim()
def vswhereJson = new groovy.json.JsonSlurper().parseText(vswhereOutput); def vswhereJson = new groovy.json.JsonSlurper().parseText(vswhereOutput);
if (vswhereJson.isEmpty()) { if (vswhereJson.isEmpty()) {
println "Visual Studio not found!" println " -> Visual Studio not found!"
return return
} }
def vsInstallDir = vswhereJson[0].installationPath def vsInstallDir = vswhereJson[0].installationPath

7
GhidraDocs/InstallationGuide.html
View file

@ -327,7 +327,12 @@ system:</p>
<li> <li>
<a href="https://visualstudio.microsoft.com/vs/community/">Microsoft Visual Studio</a> <a href="https://visualstudio.microsoft.com/vs/community/">Microsoft Visual Studio</a>
2017 or later, or <a href="https://visualstudio.microsoft.com/visual-cpp-build-tools/"> 2017 or later, or <a href="https://visualstudio.microsoft.com/visual-cpp-build-tools/">
Microsoft C++ Build Tools</a> (Windows-only) Microsoft C++ Build Tools</a> with the following components installed (Windows-only):
<ul>
<li>MSVC</li>
<li>Windows SDK</li>
<li>C++ ATL</li>
</ul>
</li> </li>
</ul> </ul>
<p>To build the native binaries for your current platform, execute the following script:</p> <p>To build the native binaries for your current platform, execute the following script:</p>

6
README.md
View file

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