From a18d4ff154fb221a89130e310c5a59fd37f21e89 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 29 May 2022 22:09:00 -0700 Subject: [PATCH] [build] Fix tools not being copied when built with -Ponly* (#4276) --- datalogtool/publish.gradle | 2 +- glass/publish.gradle | 2 +- outlineviewer/publish.gradle | 2 +- roborioteamnumbersetter/publish.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/datalogtool/publish.gradle b/datalogtool/publish.gradle index 131009cfc6..2130d0449a 100644 --- a/datalogtool/publish.gradle +++ b/datalogtool/publish.gradle @@ -23,7 +23,7 @@ model { $.components.each { component -> component.binaries.each { binary -> if (binary in NativeExecutableBinarySpec && binary.component.name.contains("datalogtool")) { - if (binary.buildable && binary.name.contains("Release")) { + if (binary.buildable && (binary.name.contains('Release') || binary.name.contains('release'))) { // We are now in the binary that we want. // This is the default application path for the ZIP task. def applicationPath = binary.executable.file diff --git a/glass/publish.gradle b/glass/publish.gradle index f2e3da7161..4dce506947 100644 --- a/glass/publish.gradle +++ b/glass/publish.gradle @@ -77,7 +77,7 @@ model { $.components.each { component -> component.binaries.each { binary -> if (binary in NativeExecutableBinarySpec && binary.component.name.contains("glassApp")) { - if (binary.buildable && binary.name.contains("Release")) { + if (binary.buildable && (binary.name.contains('Release') || binary.name.contains('release'))) { // We are now in the binary that we want. // This is the default application path for the ZIP task. def applicationPath = binary.executable.file diff --git a/outlineviewer/publish.gradle b/outlineviewer/publish.gradle index aa350098ba..78f044fa6e 100644 --- a/outlineviewer/publish.gradle +++ b/outlineviewer/publish.gradle @@ -23,7 +23,7 @@ model { $.components.each { component -> component.binaries.each { binary -> if (binary in NativeExecutableBinarySpec && binary.component.name.contains("outlineviewer")) { - if (binary.buildable && binary.name.contains("Release")) { + if (binary.buildable && (binary.name.contains('Release') || binary.name.contains('release'))) { // We are now in the binary that we want. // This is the default application path for the ZIP task. def applicationPath = binary.executable.file diff --git a/roborioteamnumbersetter/publish.gradle b/roborioteamnumbersetter/publish.gradle index 3e8e6c3055..478f3d39a0 100644 --- a/roborioteamnumbersetter/publish.gradle +++ b/roborioteamnumbersetter/publish.gradle @@ -23,7 +23,7 @@ model { $.components.each { component -> component.binaries.each { binary -> if (binary in NativeExecutableBinarySpec && binary.component.name.contains("roborioteamnumbersetter")) { - if (binary.buildable && binary.name.contains("Release")) { + if (binary.buildable && (binary.name.contains('Release') || binary.name.contains('release'))) { // We are now in the binary that we want. // This is the default application path for the ZIP task. def applicationPath = binary.executable.file