From 3410dc1ad99bcc0449a993a054a38c2c5670269f Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Fri, 12 Jan 2024 13:29:36 -0500
Subject: [PATCH] GP-4233: The Ghidra Eclipse preferences and formatter files
 are now included in the release (Closes #5999)

---
 GhidraDocs/GhidraCodingStandards.html | 5 ++++-
 gradle/root/distribution.gradle       | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/GhidraDocs/GhidraCodingStandards.html b/GhidraDocs/GhidraCodingStandards.html
index 37345a7b9e..e0e49fe096 100644
--- a/GhidraDocs/GhidraCodingStandards.html
+++ b/GhidraDocs/GhidraCodingStandards.html
@@ -214,7 +214,10 @@
 					</UL>
 
 		<H2> Formatting </H2>
-		<P> Most of these are handled by the eclipse formatter and are here to document the Ghidra formatting style.
+		<P> Most of these are handled by the Eclipse formatter and are here to document the Ghidra 
+		formatting style. The Eclipse formatter can be found in the <I><B>support/eclipse/</B></I>
+		directory of a Ghidra release, or in the <I><B>eclipse/</B><I> directory of the Ghidra
+		source repository.
 			<H3> Line Length </H3>
 				<H4> Java code will have a character limit of 100 characters per line. </H4>
 			<H3> Indenting </H3>
diff --git a/gradle/root/distribution.gradle b/gradle/root/distribution.gradle
index 1005e1b9fc..c63cf0f4f9 100644
--- a/gradle/root/distribution.gradle
+++ b/gradle/root/distribution.gradle
@@ -353,6 +353,14 @@ task assembleDistribution (type: Copy) {
 		include "settings.gradle"
 		into "Ghidra"
 	}
+	
+	/////////////////////////////////
+	// Eclipse formatters
+	/////////////////////////////////
+	from (ROOT_PROJECT_DIR + "/eclipse") {
+		exclude "certification.manifest"
+		into "support/eclipse"
+	}
 
 	//////////////////////////////////////
 	// Software Bill of Materials (SBOM)