diff options
Diffstat (limited to 'pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch')
| -rw-r--r-- | pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch | 158 |
1 files changed, 115 insertions, 43 deletions
diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch index b3106802bd5c..03ddf76e8ffe 100644 --- a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch +++ b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -1,79 +1,151 @@ -From 913e74b8682f77da94ed7b7d459482b9b23a5d88 Mon Sep 17 00:00:00 2001 -From: roblabla <unfiltered@roblab.la> -Date: Tue, 28 Dec 2021 14:20:30 +0100 -Subject: [PATCH] Use protobuf gradle plugin - ---- - Ghidra/Debug/Debugger-gadp/build.gradle | 76 +++---------------------- - build.gradle | 6 ++ - 2 files changed, 15 insertions(+), 67 deletions(-) - diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle -index 1b4922f66..3d2ef8856 100644 +index f4dbd3cd0..6108e8534 100644 --- a/Ghidra/Debug/Debugger-gadp/build.gradle +++ b/Ghidra/Debug/Debugger-gadp/build.gradle -@@ -23,42 +23,19 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" +@@ -23,42 +23,18 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" apply plugin: 'eclipse' --eclipse.project.name = 'Debug Debugger-gadp' +apply plugin: 'com.google.protobuf' + eclipse.project.name = 'Debug Debugger-gadp' -configurations { - allProtocArtifacts - protocArtifact -} -+eclipse.project.name = 'Debug Debugger-gadp' - +- def platform = getCurrentPlatformName() -dependencies { -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' - - if (isCurrentWindows()) { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe' +- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' - } - if (isCurrentLinux()) { - if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe' +- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' - } - else { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe' +- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' - } - } - if (isCurrentMac()) { - if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe' +- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' +- } +- else { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' +- } ++buildscript { ++ dependencies { ++ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' + } ++} + ++dependencies { + api project(':Framework-AsyncComm') + api project(':Framework-Debugging') + api project(':ProposedUtils') +@@ -73,37 +49,3 @@ dependencies { + } + }*/ + +-task generateProto { +- ext.srcdir = file("src/main/proto") +- ext.src = fileTree(srcdir) { +- include "**/*.proto" +- } +- ext.outdir = file("build/generated/source/proto/main/java") +- outputs.dir(outdir) +- inputs.files(src) +- dependsOn(configurations.protocArtifact) +- doLast { +- def exe = configurations.protocArtifact.first() +- if (!isCurrentWindows()) { +- exe.setExecutable(true) +- } +- exec { +- commandLine exe, "--java_out=$outdir", "-I$srcdir" +- args src +- } +- } +-} +- +-tasks.compileJava.dependsOn(tasks.generateProto) +-tasks.eclipse.dependsOn(tasks.generateProto) +-rootProject.tasks.prepDev.dependsOn(tasks.generateProto) +- +-sourceSets { +- main { +- java { +- srcDir tasks.generateProto.outdir +- } +- } +-} +-zipSourceSubproject.dependsOn generateProto +- +diff --git a/Ghidra/Debug/Debugger-isf/build.gradle b/Ghidra/Debug/Debugger-isf/build.gradle +index 6bf945c2e..3225d095d 100644 +--- a/Ghidra/Debug/Debugger-isf/build.gradle ++++ b/Ghidra/Debug/Debugger-isf/build.gradle +@@ -20,42 +20,18 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" + apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" + + apply plugin: 'eclipse' ++apply plugin: 'com.google.protobuf' + eclipse.project.name = 'Debug Debugger-isf' + +-configurations { +- allProtocArtifacts +- protocArtifact +-} +- + def platform = getCurrentPlatformName() + +-dependencies { +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' +- +- if (isCurrentWindows()) { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' +- } +- if (isCurrentLinux()) { +- if (platform.endsWith("x86_64")) { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' - } - else { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' +- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' - } - } +- if (isCurrentMac()) { +- if (platform.endsWith("x86_64")) { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' +- } +- else { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' +- } +buildscript { -+ dependencies { -+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' -+ } ++ dependencies { ++ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' + } +} +dependencies { - api 'com.google.protobuf:protobuf-java:3.17.3' api project(':Framework-AsyncComm') api project(':Framework-Debugging') -@@ -68,43 +45,8 @@ dependencies { + api project(':ProposedUtils') +@@ -64,40 +40,6 @@ dependencies { testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts') } --/*protobuf { -+protobuf { - protoc { - artifact = 'com.google.protobuf:protoc:3.17.3' - } --}*/ -- -task generateProto { - ext.srcdir = file("src/main/proto") - ext.src = fileTree(srcdir) { @@ -93,7 +165,7 @@ index 1b4922f66..3d2ef8856 100644 - args src - } - } - } +-} - -tasks.compileJava.dependsOn(tasks.generateProto) -tasks.eclipse.dependsOn(tasks.generateProto) @@ -108,11 +180,14 @@ index 1b4922f66..3d2ef8856 100644 -} -zipSourceSubproject.dependsOn generateProto - + // Include buildable native source in distribution + rootProject.assembleDistribution { + from (this.project.projectDir.toString()) { diff --git a/build.gradle b/build.gradle -index dce3a5149..7a2e637ce 100644 +index b0c717fb1..5f56506a5 100644 --- a/build.gradle +++ b/build.gradle -@@ -76,6 +76,12 @@ if (flatRepo.isDirectory()) { +@@ -74,6 +74,12 @@ if (flatRepo.isDirectory()) { jcenter() flatDir name: "flat", dirs:["$flatRepo"] } @@ -125,6 +200,3 @@ index dce3a5149..7a2e637ce 100644 } } else { --- -2.33.1 - |