Merge remote-tracking branch 'origin/GP-1680_ryanmkurtz_gradle' into patch

This commit is contained in:
ghidra1
2022-01-14 19:22:57 -05:00
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ You may not need all of these, depending on which portions you are building or d
- https://adoptium.net/releases.html?variant=openjdk11&jvmVariant=hotspot - https://adoptium.net/releases.html?variant=openjdk11&jvmVariant=hotspot
- Amazon Corretto - Amazon Corretto
- https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html - https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
* Gradle 6.4+ or 7.x * Gradle 6.8+ or 7.x
- https://gradle.org/releases/ - https://gradle.org/releases/
* A C/C++ compiler - We use GCC on Linux, Xcode (Clang) on macOS, and Visual Studio (2017 or later) on Windows. * A C/C++ compiler - We use GCC on Linux, Xcode (Clang) on macOS, and Visual Studio (2017 or later) on Windows.
- https://gcc.gnu.org/ - https://gcc.gnu.org/
+1 -1
View File
@@ -2,7 +2,7 @@ application.name=Ghidra
application.version=10.1.2 application.version=10.1.2
application.release.name=DEV application.release.name=DEV
application.layout.version=1 application.layout.version=1
application.gradle.min=6.4 application.gradle.min=6.8
application.java.min=11 application.java.min=11
application.java.max= application.java.max=
application.java.compiler=11 application.java.compiler=11
+2 -2
View File
@@ -18,7 +18,7 @@
<h1>Ghidra Installation Guide</h1> <h1>Ghidra Installation Guide</h1>
<p> <p>
The installation information provided is effective as of Ghidra 10.1 and is subject to change with The installation information provided is effective as of Ghidra 10.1.2 and is subject to change with
future releases. future releases.
</p> </p>
@@ -318,7 +318,7 @@ Ghidra release includes native binaries for the following platforms:</p>
system:</p> system:</p>
<ul> <ul>
<li>A <a href="#Requirements">supported</a> version of a Java Development Kit</li> <li>A <a href="#Requirements">supported</a> version of a Java Development Kit</li>
<li><a href="https://gradle.org/releases/">Gradle 6 or 7</a></li> <li><a href="https://gradle.org/releases/">Gradle 6.8+ or 7.x</a></li>
<li>make, gcc, and g++ (Linux/macOS-only)</li> <li>make, gcc, and g++ (Linux/macOS-only)</li>
<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>
+1 -1
View File
@@ -38,7 +38,7 @@ To create the latest development build for your platform from this source reposi
##### Install build tools: ##### Install build tools:
* [JDK 11 64-bit][jdk11] * [JDK 11 64-bit][jdk11]
* [Gradle 6.4+ or 7.x][gradle] * [Gradle 6.8+ or 7.x][gradle]
* make, gcc, and g++ (Linux/macOS-only) * make, gcc, and g++ (Linux/macOS-only)
* [Microsoft Visual Studio][vs] (Windows-only) * [Microsoft Visual Studio][vs] (Windows-only)