mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-09-28 17:11:11 -09:00
Merge remote-tracking branch
'origin/GP-1106_ryanmkurtz_PR-3197_ryanmkurtz_platforms' (Closes #3197)
This commit is contained in:
@@ -28,11 +28,11 @@ rootProject.assembleDistribution {
|
||||
}
|
||||
}
|
||||
|
||||
rootProject.OS_NAMES.each { platform ->
|
||||
rootProject.tasks.findAll {it.name == "assembleDistribution_$platform"}.each { t ->
|
||||
rootProject.PLATFORMS.each { platform ->
|
||||
rootProject.tasks.findAll {it.name == "assembleDistribution_${platform.name}"}.each { t ->
|
||||
def p = this.project
|
||||
|
||||
if (isLinux(platform) || isMac(platform)) {
|
||||
if (isLinux(platform.name) || isMac(platform.name)) {
|
||||
t.from ("${p.projectDir}/Linux/support") {
|
||||
into "support"
|
||||
}
|
||||
@@ -42,7 +42,7 @@ rootProject.OS_NAMES.each { platform ->
|
||||
t.from (p.file("Linux/ghidraRun"))
|
||||
}
|
||||
|
||||
if (isWindows(platform)) {
|
||||
if (isWindows(platform.name)) {
|
||||
t.from ("${p.projectDir}/Windows/support") {
|
||||
into "support"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user