Ghidra is a software reverse engineering (SRE) framework
GP-6679: Fixing .gitignore not making its way from Skeleton to new GhidraDev module project
Ryan Kurtzef8deea66cde
diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/README.md b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/README.mdindex 2d503e6f36..c8cefb4007 100644--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/README.md+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/README.md@@ -32,7 +32,8 @@ change with future releases.## Change History__5.1.0:__-* Added a PyGhidra Headless run configuration+* Added a PyGhidra Headless run configuration.+* New Ghidra module projects now contain a default .gitignore file (requires Ghidra 12.2 or later).__5.0.1:__* Fixed a bug that prevented Ghidra from discovering the Ghidra module project when launched withdiff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraModuleUtils.java b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraModuleUtils.javaindex 8394bb62ac..a2068e88be 100644--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraModuleUtils.java+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraModuleUtils.java@@ -173,6 +173,11 @@ public class GhidraModuleUtils {if (!buildTemplateGradleFile.renameTo(buildGradleFile)) {throw new IOException("Failed to rename: " + buildTemplateGradleFile);}+ File gitIgnoreFile = new File(projectDir, "gitignore");+ File dotGitIgnoreFile = new File(projectDir, ".gitignore");+ if (gitIgnoreFile.exists() && !gitIgnoreFile.renameTo(dotGitIgnoreFile)) {+ throw new IOException("Failed to rename: " + gitIgnoreFile);+ }}catch (CancelledException | IOException e) {throw new IOException("Failed to copy skeleton directory: " + projectDir);diff --git a/GhidraBuild/Skeleton/build.gradle b/GhidraBuild/Skeleton/build.gradleindex 34d2737c3b..932334ba88 100644--- a/GhidraBuild/Skeleton/build.gradle+++ b/GhidraBuild/Skeleton/build.gradle@@ -36,7 +36,6 @@ rootProject.assembleDistribution {exclude '.classpath'exclude '.project'exclude 'build.gradle'- rename "gitignore", ".gitignore"into "Extensions/Ghidra/Skeleton"}}diff --git a/GhidraBuild/Skeleton/gitignore b/GhidraBuild/Skeleton/gitignoreindex 07bec394fa..fd11506243 100644--- a/GhidraBuild/Skeleton/gitignore+++ b/GhidraBuild/Skeleton/gitignore@@ -1,5 +1,6 @@.project.pyproject+.pydevproject.classpath.settings/.gradle/