Merge remote-tracking branch 'NSA/master' into nsfw/cpu32-squash2

Author: LegacyNsfw

DevGuide.md

@@ -27,26 +27,29 @@
 The following is a list of dependencies, in no particular order.
 This guide includes instructions for obtaining many of these at the relevant step(s).
 You may not need all of these, depending on which portions you are building or developing.
-
+#### At minimum you will need all of the following
 * Java JDK 11 (64-bit) - Free long term support (LTS) versions of JDK 11 are provided by:
     - AdoptOpenJDK
       - https://adoptopenjdk.net/releases.html?variant=openjdk11&jvmVariant=hotspot
     - Amazon Corretto
       - https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
-* Eclipse - It must support JDK 11. Eclipse 2018-12 or later should work. Other IDEs may work, but we have not tested them.
-    - https://www.eclipse.org/downloads/
 * Gradle 5.0 or later - We use version 5.0, and tested with up to 5.6.3.
     - https://gradle.org/next-steps/?version=5.0&format=bin
 * 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://developer.apple.com/xcode/
     - https://visualstudio.microsoft.com/downloads/
-* Git - We use the official installer on Windows. Most Linux distros have git in their repos. Xcode provides git on macOS.
+#### Optional for Development
+* Eclipse - It must support JDK 11. Eclipse 2018-12 or later should work. Other IDEs may work, but we have not tested them.
+    - https://www.eclipse.org/downloads/
+#### Necessary unless a download zip snapshot of the ghidra repository is used
+* Git - We use the official installer on Windows. For windows you can also use the github CLI or git from with (Windows Subsystem for Linux - WSL). Most Linux distros have git in their repos. Xcode provides git on macOS.   You can skip Git if you download a .zip file of the ghidra repository.
     - https://git-scm.com/downloads
-* Bash - This is moot on Linux and macOS. On Windows, we use MinGW. This may be distributed with Git for Windows.
+    - https://cli.github.com/
+#### Optional unless following [Manual download instructions](#manual-download-instructions)
+* Bash - This is moot on Linux and macOS. On Windows, we use MinGW. This may be distributed with Git for Windows.  This can be skipped if using the automatic build.
     - https://osdn.net/projects/mingw/releases/
-* Bison and Flex - We use win-flex-bison v2.5.17. These packages may also be available in MSYS (MinGW). Most Linux distros have these in their repos. Xcode provides these for macOS.
-    - https://sourceforge.net/projects/winflexbison/
+#### Necessary for the development and building of Ghidra, these and more will be downloaded during the [Automatic](#automatic-script-instructions) or the [Manual](#manual-download-instructions) instructions
 * dex2jar. We use version 2.0.
     - https://github.com/pxb1988/dex2jar/releases
 * AXMLPrinter2
@@ -68,10 +71,8 @@ If you need these offline, a reasonable course of action is to set up a developm
 
 ## Install Development and Build Tools
 
-If you're on Windows, install Git, MinGW, Bison, and Flex.
-Many of the commands given below must be executed in Bash (Use git-bash or MSYS from MinGW).
-**IMPORTANT**: The bison and flex executables may be named `win-bison.exe` and `win-flex.exe`.
-Our build cannot currently cope with that, so you should rename them to `bison.exe` and `flex.exe`.
+If you're on Windows, install Git unless you will download a .zip clone of the ghidra repository. If you go the manual route
+many of the commands given below must be executed in Bash (Windows Subsystem for Linux (WSL), or Use git-bash or MSYS from MinGW).
 
 Install OpenJDK 11 and make sure it's the default java.
 
@@ -83,14 +84,15 @@ Install Gradle, add it to your `PATH`, and ensure it is launched using JDK 11.
 
 ## Setup Source Repository
 
-You may choose any directory for your working copy, but these instructions will assume you have cloned the source to `~/git/ghidra`.
+You may choose any directory for your working copy, however these instructions will assume you have cloned the source to `~/git/ghidra`.
 Be sure to adjust the commands to match your chosen working directory if different than suggested:
 
 ```bash
 mkdir ~/git
 cd ~/git
 git clone [email protected]:NationalSecurityAgency/ghidra.git
 ```
+or unzip a snapshot .zip of the ghidra repository
 
 ## Setup Build Dependency Repository
 
@@ -263,7 +265,6 @@ Some of Ghidra's components are built for the native platform.
 We currently support Linux, macOS, and Windows 64-bit x86 systems.
 Others should be possible, but we do not test on them.
 
-Ensure bison and flex are installed and in your `PATH`.
 Now build using Gradle:
 
 On Linux:
@@ -364,7 +365,7 @@ The result can be added to an installation or source tree by copying it to `~/gi
 This task is often done manually from the Ghidra GUI, and the archives included in our official build require a fair bit of fine tuning.
 You will first need to import the relevant libraries from which you'd like to produce a FID database.
 This is often a set of libraries from an SDK.
-We include a variety of Visual Studio platforms in the official build.
+We include a variety of Visual Studio platforms in the official build. The official .fidb files can be found in the ghidra-data repository here https://github.com/NationalSecurityAgency/ghidra-data/tree/master/FunctionID
 
 From a CodeBrowser window, select __File -> Configure__.
 Enable the "Function ID" plugins, and close the dialog.

Ghidra/Features/Base/.launch/Ghidra Code Coverage.launch

@@ -6,6 +6,10 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
+    <mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+        <mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+        <mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+    </mapAttribute>
     <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
     <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;    &lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;        &lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.eclipse.jdt.launching.JRE_CONTAINER&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#10;        &lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;    &lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">