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

GP-3140: Ghidra can now run from development/repository mode using Gradle's compiled classes/jars, instead of just relying on Eclipse's compilation output

Browse source
This commit is contained in:
Ryan Kurtz 2023-03-03 16:02:58 -05:00
parent 59371bfb36
commit 0069538469
7 changed files with 61 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
View file

@ -140,7 +140,14 @@ public class GhidraLauncher {
Map<String, GModule> modules = getOrderedModules(layout);
if (SystemUtilities.isInDevelopmentMode()) {
// First add Eclipse's module "bin" paths. If we didn't find any, assume Ghidra was
// compiled with Gradle, and add the module jars Gradle built.
addModuleBinPaths(classpathList, modules);
if (classpathList.isEmpty()) {
addModuleJarPaths(classpathList, modules);
}
addExternalJarPaths(classpathList, layout.getApplicationRootDirs());
}
else {

26
Ghidra/Framework/Utility/src/main/java/utility/module/ModuleUtilities.java
View file

@ -208,23 +208,27 @@ public class ModuleUtilities {
}
/**
* Gets the "lib" directories from the given modules.
* Gets the library directories from the given modules.
* <p>
* In {@link SystemUtilities#isInReleaseMode() release mode}, we expect these directories to
* be in each module's <code>lib</code> subdirectory.
* <p>
* If not in release mode (i.e., {@link SystemUtilities#isInDevelopmentMode() development mode},
* {@link SystemUtilities#isInTestingMode() testing mode}, etc), we expect these directories to
* be in each module's <code>build/libs</code> subdirectory.
* <p>
* NOTE: If Eclipse is being used this method may still return jars built by Gradle. It is up
* to the caller of this method to determine if they should be used instead of the classes
* compiled by Eclipse.
*
* @param modules The modules to get the lib directories of.
* @return A collection of lib directories from the given modules.
* @param modules The modules to get the library directories of.
* @return A collection of library directories from the given modules.
*/
public static Collection<ResourceFile> getModuleLibDirectories(Map<String, GModule> modules) {
List<ResourceFile> libraryDirectories = new ArrayList<>();
for (GModule module : modules.values()) {
module.collectExistingModuleDirs(libraryDirectories, "lib");
// In testing mode, we run out of an intermediate build state...the module jars
// live in a build/libs directory. We only want to look in here when testing because
// other run modes (such as a Ghidra release launched from a user's Eclipse) may contain
// build remnants that could cause problems if discovered.
if (SystemUtilities.isInTestingMode()) {
module.collectExistingModuleDirs(libraryDirectories, "libs");
}
module.collectExistingModuleDirs(libraryDirectories, "libs");
}
return libraryDirectories;
}