From 27c162ee8fb7a3095a8555e8bdda8880529cb2c1 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Thu, 29 Aug 2024 07:00:13 -0400 Subject: [PATCH] GP-0: Skeleton's build.grade was interfering with building natives in a release --- Ghidra/Features/Base/ghidra_scripts/VSCodeProjectScript.java | 4 ++++ .../ghidraprojectcreator/utils/GhidraModuleUtils.java | 5 +++++ GhidraBuild/Skeleton/build.gradle | 5 ++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Ghidra/Features/Base/ghidra_scripts/VSCodeProjectScript.java b/Ghidra/Features/Base/ghidra_scripts/VSCodeProjectScript.java index 5295544354..3ee4ab24e9 100644 --- a/Ghidra/Features/Base/ghidra_scripts/VSCodeProjectScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/VSCodeProjectScript.java @@ -268,7 +268,11 @@ public class VSCodeProjectScript extends GhidraScript { } // Fix Ghidra installation directory path in build.gradle + File buildTemplateGradleFile = new File(projectDir, "buildTemplate.gradle"); File buildGradleFile = new File(projectDir, "build.gradle"); + if (!buildTemplateGradleFile.renameTo(buildGradleFile)) { + throw new IOException("Failed to rename: " + buildTemplateGradleFile); + } String fileData = FileUtils.readFileToString(buildGradleFile, StandardCharsets.UTF_8); fileData = fileData.replaceAll("", FilenameUtils.separatorsToUnix(installDir.getPath())); diff --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.java index f4d93a2297..fefabd83db 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 @@ -177,6 +177,11 @@ public class GhidraModuleUtils { return excludeRegexes.stream().map(r -> Pattern.compile(r)).noneMatch( p -> p.matcher(f.getName()).matches()); }, null); + File buildTemplateGradleFile = new File(projectDir, "buildTemplate.gradle"); + File buildGradleFile = new File(projectDir, "build.gradle"); + if (!buildTemplateGradleFile.renameTo(buildGradleFile)) { + throw new IOException("Failed to rename: " + buildTemplateGradleFile); + } } catch (CancelledException | IOException e) { throw new IOException("Failed to copy skeleton directory: " + projectDir); diff --git a/GhidraBuild/Skeleton/build.gradle b/GhidraBuild/Skeleton/build.gradle index fffa507422..34d2737c3b 100644 --- a/GhidraBuild/Skeleton/build.gradle +++ b/GhidraBuild/Skeleton/build.gradle @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,7 +36,6 @@ rootProject.assembleDistribution { exclude '.classpath' exclude '.project' exclude 'build.gradle' - rename "buildTemplate.gradle", "build.gradle" rename "gitignore", ".gitignore" into "Extensions/Ghidra/Skeleton" }