Merge remote-tracking branch 'origin/Ghidra_12.1'

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);

gradle/distributableGhidraModule.gradle

@@ -177,8 +177,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) {

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....)