Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-16 15:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed patch directory

Browse Source 
and updated distribution.gradle to copy patch/README.txt
This commit is contained in:
ghidravore 2019-04-03 17:04:56 -04:00
parent 5de10ed2a9
commit 9857ade2fe
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
View File

@ -88,13 +88,7 @@ public class GhidraLauncher {
private static void addPatchPaths(List<String> pathList, Collection<ResourceFile> appRootDirs) { private static void addPatchPaths(List<String> pathList, Collection<ResourceFile> appRootDirs) {
for (ResourceFile rootDir : appRootDirs) { for (ResourceFile rootDir : appRootDirs) {
ResourceFile debugLibDir = new ResourceFile(rootDir, "patch");
ResourceFile dir = new ResourceFile(rootDir, "bin");
if (dir.exists()) {
pathList.add(dir.getAbsolutePath());
}
ResourceFile debugLibDir = new ResourceFile(rootDir, "lib");
if (debugLibDir.exists()) { if (debugLibDir.exists()) {
pathList.addAll(findJarsInDir(debugLibDir)); pathList.addAll(findJarsInDir(debugLibDir));
} }

9
gradleScripts/distribution.gradle
View File

@ -394,7 +394,14 @@ task assembleCommon (type: Copy) {
into "Ghidra" into "Ghidra"
filter (ConcatFilter, prepend: buildDateFile) filter (ConcatFilter, prepend: buildDateFile)
} }
////////////////
// Patch Readme
////////////////
from (ROOT_PROJECT_DIR + "/Ghidra/patch") {
into "Ghidra/patch"
}
///////////////// /////////////////
// GLOBALS // GLOBALS
///////////////// /////////////////