Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 02:30:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Review Tool - 4.3 - Updated the generic layout to add the application root dir as a module to fix data directory finding for stand alone tools

Browse Source
This commit is contained in:
dragonmacher
2023-03-10 17:02:28 -05:00
parent 10c7d641f0
commit 6ed606e173
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Generic/src/main/java/generic/application/GenericApplicationLayout.java
+15 -5
View File
@@ -42,7 +42,7 @@ public class GenericApplicationLayout extends ApplicationLayout {
/** /**
* System property that allows specification of additional application root dirs. This is used * System property that allows specification of additional application root dirs. This is used
* for clients that build plugins external to an installation. The property will be parsed * for clients that build plugins external to an installation. The property will be parsed
* using {@link File#pathSeparator}, allowing for multiple values. * using {@link File#pathSeparator}, allowing for multiple values.
*/ */
private static final String ADDITIONAL_APPLICATION_ROOT_DIRS = private static final String ADDITIONAL_APPLICATION_ROOT_DIRS =
@@ -103,8 +103,18 @@ public class GenericApplicationLayout extends ApplicationLayout {
// Modules // Modules
Collection<ResourceFile> moduleRoots = Collection<ResourceFile> moduleRoots =
ModuleUtilities.findModuleRootDirectories(applicationRootDirs); ModuleUtilities.findModuleRootDirectories(applicationRootDirs);
modules =
Map<String, GModule> allModules = new HashMap<>();
Map<String, GModule> discoveredModules =
ModuleUtilities.findModules(applicationRootDirs, moduleRoots, new ClasspathFilter()); ModuleUtilities.findModules(applicationRootDirs, moduleRoots, new ClasspathFilter());
allModules.putAll(discoveredModules);
for (ResourceFile root : applicationRootDirs) {
GModule rootModule = new GModule(applicationRootDirs, root);
allModules.put(rootModule.getName(), rootModule);
}
modules = Collections.unmodifiableMap(allModules);
// User directories // User directories
userTempDir = ApplicationUtilities.getDefaultUserTempDir(applicationProperties); userTempDir = ApplicationUtilities.getDefaultUserTempDir(applicationProperties);
@@ -160,9 +170,9 @@ public class GenericApplicationLayout extends ApplicationLayout {
} }
/** /**
* Get the default list of Application directories. In repo-based development mode this * Get the default list of Application directories. In repo-based development mode this
* includes the root Ghidra directory within each repo. When not in development mode, the * includes the root Ghidra directory within each repo. When not in development mode, the
* requirement is that the current working directory correspond to the installation root. The * requirement is that the current working directory correspond to the installation root. The
* first entry will be the primary root in both cases. * first entry will be the primary root in both cases.
* @return root directories * @return root directories
*/ */