Merge remote-tracking branch 'origin/GP-2647_ghizard_add_modify_system_properties_for_PDB'

This commit is contained in:
Ryan Kurtz 2022-10-05 00:50:55 -04:00
commit b7cea8247e
3 changed files with 12 additions and 9 deletions

View file

@ -32,7 +32,7 @@ public class PdbLog {
private static Writer nullWriter;
private static Writer fileWriter;
private static final boolean SYSTEM_LOGGING_ENABLED = Boolean.getBoolean("pdb.logging");
private static final boolean SYSTEM_LOGGING_ENABLED = Boolean.getBoolean("ghidra.pdb.logging");
private static boolean enabled = SYSTEM_LOGGING_ENABLED;
/**

View file

@ -31,8 +31,8 @@ import ghidra.util.exception.AssertException;
*/
public class PdbApplicatorOptions {
// Developer turn on/off options that are in still in development.
private static final boolean developerMode = false;
// Developer turn on/off options that are in still in development. See launch.properties.
private static final boolean DEVELOPER_MODE = Boolean.getBoolean("ghidra.pdb.developerMode");
// Applicator Control.
private static final String OPTION_NAME_PROCESSING_CONTROL = "Control";
@ -181,13 +181,13 @@ public class PdbApplicatorOptions {
private void registerOptions(Options options, boolean enableControl) {
HelpLocation help = null;
if (developerMode || enableControl) {
if (DEVELOPER_MODE || enableControl) {
options.registerOption(OPTION_NAME_PROCESSING_CONTROL, PdbApplicatorControl.ALL, help,
OPTION_DESCRIPTION_PROCESSING_CONTROL);
}
// PdbApplicatorOptions
if (developerMode) {
if (DEVELOPER_MODE) {
options.registerOption(OPTION_NAME_APPLY_CODE_SCOPE_BLOCK_COMMENTS,
applyCodeScopeBlockComments, help,
@ -232,12 +232,12 @@ public class PdbApplicatorOptions {
private void loadOptions(Options options, boolean enableControl) {
if (developerMode || enableControl) {
if (DEVELOPER_MODE || enableControl) {
control = options.getEnum(OPTION_NAME_PROCESSING_CONTROL, PdbApplicatorControl.ALL);
}
// PdbApplicatorOptions
if (developerMode) {
if (DEVELOPER_MODE) {
applyCodeScopeBlockComments = options.getBoolean(
OPTION_NAME_APPLY_CODE_SCOPE_BLOCK_COMMENTS, applyCodeScopeBlockComments);

View file

@ -91,5 +91,8 @@ VMARGS=--add-opens=java.desktop/sun.awt.image=ALL-UNNAMED
# Limit on XML parsing. See https://docs.oracle.com/javase/tutorial/jaxp/limits/limits.html
#VMARGS=-Djdk.xml.totalEntitySizeLimit=50000000
# Enables Pdb debug logging during import and analysis to .ghidra/.ghidra_ver/pdb.analyzer.log
#VMARGS=-Dpdb.logging=true
# Enables PDB debug logging during import and analysis to .ghidra/.ghidra_ver/pdb.analyzer.log
#VMARGS=-Dghidra.pdb.logging=true
# Enables PDB developer mode
#VMARGS=-Dghidra.pdb.developerMode=true