From 4c7c6015d9b7046d17a1d838af0c93d2955972cc Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Mon, 8 Jul 2024 10:27:31 -0400 Subject: [PATCH] GP-0: Moving hasPythonPackage.gradle and hasProtobuf.gradle. They are generic and non-debugger things want to use them. --- Ghidra/Debug/Debugger-agent-dbgeng/build.gradle | 3 +-- Ghidra/Debug/Debugger-agent-gdb/build.gradle | 3 +-- Ghidra/Debug/Debugger-agent-lldb/build.gradle | 3 +-- Ghidra/Debug/Debugger-gadp/build.gradle | 2 +- Ghidra/Debug/Debugger-isf/build.gradle | 2 +- Ghidra/Debug/Debugger-rmi-trace/build.gradle | 4 ++-- gradle/{debugger => }/hasProtobuf.gradle | 0 gradle/{debugger => }/hasPythonPackage.gradle | 0 8 files changed, 7 insertions(+), 10 deletions(-) rename gradle/{debugger => }/hasProtobuf.gradle (100%) rename gradle/{debugger => }/hasPythonPackage.gradle (100%) diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle index 005ed11231..1c3a47f546 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle +++ b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle @@ -18,9 +18,8 @@ apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle" apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle" apply from: "$rootProject.projectDir/gradle/nativeProject.gradle" apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle" - +apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle" apply from: "$rootProject.projectDir/gradle/debugger/hasNodepJar.gradle" -apply from: "$rootProject.projectDir/gradle/debugger/hasPythonPackage.gradle" apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-agent-dbgeng' diff --git a/Ghidra/Debug/Debugger-agent-gdb/build.gradle b/Ghidra/Debug/Debugger-agent-gdb/build.gradle index 875e0d1285..a1cb88c35f 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/build.gradle +++ b/Ghidra/Debug/Debugger-agent-gdb/build.gradle @@ -18,9 +18,8 @@ apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle" apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle" apply from: "$rootProject.projectDir/gradle/nativeProject.gradle" apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle" - +apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle" apply from: "$rootProject.projectDir/gradle/debugger/hasExecutableJar.gradle" -apply from: "$rootProject.projectDir/gradle/debugger/hasPythonPackage.gradle" apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-agent-gdb' diff --git a/Ghidra/Debug/Debugger-agent-lldb/build.gradle b/Ghidra/Debug/Debugger-agent-lldb/build.gradle index 3811c8d33d..c7b695badc 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/build.gradle +++ b/Ghidra/Debug/Debugger-agent-lldb/build.gradle @@ -18,9 +18,8 @@ apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle" apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle" apply from: "$rootProject.projectDir/gradle/nativeProject.gradle" apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle" - +apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle" apply from: "$rootProject.projectDir/gradle/debugger/hasExecutableJar.gradle" -apply from: "$rootProject.projectDir/gradle/debugger/hasPythonPackage.gradle" apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-agent-lldb' diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle index 9e1c57fafe..5d3f5c61d6 100644 --- a/Ghidra/Debug/Debugger-gadp/build.gradle +++ b/Ghidra/Debug/Debugger-gadp/build.gradle @@ -18,7 +18,7 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" -apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" +apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-gadp' diff --git a/Ghidra/Debug/Debugger-isf/build.gradle b/Ghidra/Debug/Debugger-isf/build.gradle index d135294a0a..bbf74efa55 100644 --- a/Ghidra/Debug/Debugger-isf/build.gradle +++ b/Ghidra/Debug/Debugger-isf/build.gradle @@ -18,7 +18,7 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" -apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" +apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-isf' diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle index 90cfde5a91..af516f96e7 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle +++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle @@ -19,8 +19,8 @@ apply from: "${rootProject.projectDir}/gradle/helpProject.gradle" apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" -apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" -apply from: "${rootProject.projectDir}/gradle/debugger/hasPythonPackage.gradle" +apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle" +apply from: "${rootProject.projectDir}/gradle/hasPythonPackage.gradle" apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-rmi-trace' diff --git a/gradle/debugger/hasProtobuf.gradle b/gradle/hasProtobuf.gradle similarity index 100% rename from gradle/debugger/hasProtobuf.gradle rename to gradle/hasProtobuf.gradle diff --git a/gradle/debugger/hasPythonPackage.gradle b/gradle/hasPythonPackage.gradle similarity index 100% rename from gradle/debugger/hasPythonPackage.gradle rename to gradle/hasPythonPackage.gradle