Merge remote-tracking branch 'origin/GP-5307_ryanmkurtz_tlb'

This commit is contained in:
Ryan Kurtz 2025-01-24 05:44:26 -05:00
commit a3a727272f
2 changed files with 13 additions and 5 deletions

View file

@ -67,17 +67,19 @@ else if (file(tlb).exists()) {
} }
} }
else { else {
def prebuiltTlb = new File(rootProject.BIN_REPO + '/' + getGhidraRelativePath(project) + "/os/win_x86_64/dbgmodel.tlb") def depsFile = file("${DEPS_DIR}/Debugger-agent-dbgeng/dbgmodel.tlb")
if (prebuiltTlb.exists()) { def binRepoFile = file("${BIN_REPO}/${getGhidraRelativePath(project)}/os/win_x86_64/dbgmodel.tlb")
println "Copying prebuilt dbgmodel.tlb" def prebuiltTlb = depsFile.exists() ? depsFile : (binRepoFile.exists() ? binRepoFile : null)
if (prebuiltTlb) {
tasks.assemblePyPackage { tasks.assemblePyPackage {
from(rootProject.BIN_REPO + '/' + getGhidraRelativePath(project) + "/os/win_x86_64/dbgmodel.tlb") { from(prebuiltTlb) {
into("src/ghidradbg/dbgmodel/tlb") into("src/ghidradbg/dbgmodel/tlb")
} }
} }
} }
else { else {
println "WARNING: dbgmodel.tlb omitted from ghidradbg python package" println "****WARNING:**** dbgmodel.tlb omitted from ghidradbg python package"
} }
} }

View file

@ -67,6 +67,12 @@ ext.deps = [
sha256: "7f736566494756d271aa5e4b1af6c89dc50d074ab1c6374a47df822264226b01", sha256: "7f736566494756d271aa5e4b1af6c89dc50d074ab1c6374a47df822264226b01",
destination: FLAT_REPO_DIR destination: FLAT_REPO_DIR
], ],
[
name: "dbgmodel.tlb",
url: "https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${RELEASE_VERSION}/Debugger/dbgmodel.tlb",
sha256: "8cf5f3a2eb81160aa349056a5ca4c2c726b1b6e98bf3097cd4135147163343c7",
destination: file("${DEPS_DIR}/Debugger-agent-dbgeng/")
],
[ [
name: "AXMLPrinter2.jar", name: "AXMLPrinter2.jar",
url: "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar", url: "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar",