eliott/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-04-25 17:25:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-6744_Dan_addTypeCheckPyPackageTask--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-22 12:45:36 -04:00
parent 163c544833 a7b37a14c6
commit 8445d4fe80
6 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
View File

@@ -41,6 +41,10 @@ tasks.assemblePyPackage {
} }
} }
tasks.typeCheckPyPackage {
environment("PYTHONPATH", project(":Debugger-rmi-trace").file("build/pypkg/src"))
}
task buildTlb(type: Exec) { task buildTlb(type: Exec) {
def tmpBatch = file("build/buildTlb.bat") def tmpBatch = file("build/buildTlb.bat")

4
Ghidra/Debug/Debugger-agent-drgn/build.gradle
View File

@@ -26,3 +26,7 @@ dependencies {
// Only for Help :/ // Only for Help :/
api project(':Debugger-rmi-trace') api project(':Debugger-rmi-trace')
} }
tasks.typeCheckPyPackage {
environment("PYTHONPATH", project(":Debugger-rmi-trace").file("build/pypkg/src"))
}

4
Ghidra/Debug/Debugger-agent-gdb/build.gradle
View File

@@ -26,3 +26,7 @@ dependencies {
// Only for Help :/ // Only for Help :/
api project(':Debugger-rmi-trace') api project(':Debugger-rmi-trace')
} }
tasks.typeCheckPyPackage {
environment("PYTHONPATH", project(":Debugger-rmi-trace").file("build/pypkg/src"))
}

4
Ghidra/Debug/Debugger-agent-lldb/build.gradle
View File

@@ -27,3 +27,7 @@ dependencies {
api project(':Debugger-rmi-trace') api project(':Debugger-rmi-trace')
api project(':Debugger-agent-gdb') api project(':Debugger-agent-gdb')
} }
tasks.typeCheckPyPackage {
environment("PYTHONPATH", project(":Debugger-rmi-trace").file("build/pypkg/src"))
}

4
Ghidra/Debug/Debugger-agent-x64dbg/build.gradle
View File

@@ -28,6 +28,6 @@ dependencies {
api project(':Debugger-rmi-trace') api project(':Debugger-rmi-trace')
} }
tasks.assemblePyPackage { tasks.typeCheckPyPackage {
environment("PYTHONPATH", project(":Debugger-rmi-trace").file("build/pypkg/src"))
} }

56
gradle/hasPythonPackage.gradle
View File

@@ -24,16 +24,16 @@ eclipse.project {
} }
ext.findPyDep = { name -> ext.findPyDep = { name ->
File inDeps = file("${DEPS_DIR}/${project.name}/${name}") File inDeps = file("${DEPS_DIR}/${project.name}/${name}")
File inRepo = file("${BIN_REPO}/ExternalPyWheels/${name}") File inRepo = file("${BIN_REPO}/ExternalPyWheels/${name}")
if (inDeps.exists()) { if (inDeps.exists()) {
return inDeps return inDeps
} }
if (inRepo.exists()) { if (inRepo.exists()) {
return inRepo return inRepo
} }
println("Warning: Could not find '${name}' for ${project.name}") println("Warning: Could not find '${name}' for ${project.name}")
return inDeps return inDeps
} }
task assemblePyPackage(type: Copy) { task assemblePyPackage(type: Copy) {
@@ -41,6 +41,26 @@ task assemblePyPackage(type: Copy) {
into "build/pypkg/" into "build/pypkg/"
} }
task typeCheckPyPackage(type: Exec) {
dependsOn assemblePyPackage
inputs.files(assemblePyPackage)
doFirst {
if (rootProject.PYTHON3 == null) {
throw new GradleException("A supported version of Python [${PYTHON_SUPPORTED}] was not found!")
}
file("build/pypkg/src").listFiles().each { pkg ->
if (pkg.isDirectory() && new File(pkg, "__init__.py").isFile()) {
args "-p", pkg.name
}
}
}
workingDir { file("build/pypkg/src") }
commandLine rootProject.PYTHON3
args "-m", "mypy"
}
task buildPyPackage { task buildPyPackage {
dependsOn assemblePyPackage dependsOn assemblePyPackage
ext.dist = { file("build/pypkg/dist") } ext.dist = { file("build/pypkg/dist") }
@@ -95,12 +115,12 @@ ext.distributePyDep = { name ->
wheelFiles = new HashSet<>() wheelFiles = new HashSet<>()
PYTHON_DEPS.put(project, wheelFiles) PYTHON_DEPS.put(project, wheelFiles)
} }
File dep = findPyDep(name) File dep = findPyDep(name)
wheelFiles.add(dep) wheelFiles.add(dep)
def zipPath = getZipPath(project) def zipPath = getZipPath(project)
rootProject.assembleDistribution { rootProject.assembleDistribution {
into ("${zipPath}/pypkg/dist") { into ("${zipPath}/pypkg/dist") {
from dep from dep
} }
} }
} }