From 7d2f1efe4cc2c93fc97a145c7befca8e27779334 Mon Sep 17 00:00:00 2001 From: emteere <47253321+emteere@users.noreply.github.com> Date: Fri, 24 Apr 2026 19:10:01 +0000 Subject: [PATCH 1/2] GP-6690 Minor fix to define in script to parse UEFI header files to handle newer UEFI header files --- .../Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java b/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java index b85ff5034f..07db2763f0 100644 --- a/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java @@ -128,6 +128,7 @@ public class CreateUEFIGDTArchivesScript extends GhidraScript { }; String args[] = { + "-DSTATIC_ASSERT=static_assert" }; parseHeaderFilesToGDT(outputDirectory, "uefi_"+name, languageID, compiler, filenames, includePaths, args); From a0508a571438176c00d5bd32705a1b0cb2f7bfbd Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Tue, 28 Apr 2026 05:54:53 -0400 Subject: [PATCH 2/2] GP-0: Fixing javadoc errors --- gradle/distributableGhidraModule.gradle | 2 -- gradle/support/distributionCommon.gradle | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle/distributableGhidraModule.gradle b/gradle/distributableGhidraModule.gradle index 5a7ab5ffef..fe1a1f1962 100644 --- a/gradle/distributableGhidraModule.gradle +++ b/gradle/distributableGhidraModule.gradle @@ -176,8 +176,6 @@ String getGlobalFilePathSubDirName(File file) { plugins.withType(JavaPlugin) { - // build up a java classpath for javadocs - rootProject.ghidraPath.from(sourceSets.main.compileClasspath) rootProject.assembleSource { from (this.project.zipSourceSubproject) { diff --git a/gradle/support/distributionCommon.gradle b/gradle/support/distributionCommon.gradle index 0356418ab9..39627a490e 100644 --- a/gradle/support/distributionCommon.gradle +++ b/gradle/support/distributionCommon.gradle @@ -21,6 +21,10 @@ tasks.withType(Test).all { } plugins.withType(JavaPlugin) { + + // build up a java classpath for javadocs + rootProject.ghidraPath.from(sourceSets.main.compileClasspath) + task zipSourceSubproject (type: Zip) { t -> // Define some metadata about the zip (name, location, version, etc....)