From b336930093e8b2957fbfffc56dd66b98eb4e5288 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Sat, 5 Dec 2020 23:56:12 -0800
Subject: [PATCH] [glass] Change basename of glass to Glass (#2915)

Was glassApp, which makes building an extraction setup much harder.
---
 glass/CMakeLists.txt | 8 ++++----
 glass/Info.plist     | 2 +-
 glass/build.gradle   | 1 +
 glass/publish.gradle | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/glass/CMakeLists.txt b/glass/CMakeLists.txt
index f9ab9fae93..4b1a2b6835 100644
--- a/glass/CMakeLists.txt
+++ b/glass/CMakeLists.txt
@@ -51,11 +51,11 @@ install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass")
 
 file(GLOB glass_src src/app/native/cpp/*.cpp)
 
-add_executable(glass ${glass_src})
-wpilib_link_macos_gui(glass)
-target_link_libraries(glass libglassnt libglass)
+add_executable(Glass ${glass_src})
+wpilib_link_macos_gui(Glass)
+target_link_libraries(Glass libglassnt libglass)
 if (WIN32)
-    set_target_properties(glass PROPERTIES WIN32_EXECUTABLE YES)
+    set_target_properties(Glass PROPERTIES WIN32_EXECUTABLE YES)
 endif()
 
 #if (MSVC OR FLAT_INSTALL_WPILIB)
diff --git a/glass/Info.plist b/glass/Info.plist
index 0107192d0a..616eed1f88 100644
--- a/glass/Info.plist
+++ b/glass/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleName</key>
 	<string>Glass</string>
 	<key>CFBundleExecutable</key>
-	<string>glassApp</string>
+	<string>Glass</string>
 	<key>CFBundleDisplayName</key>
 	<string>Glass</string>
 	<key>CFBundleIdentifier</key>
diff --git a/glass/build.gradle b/glass/build.gradle
index c2bd46418f..f1baca4476 100644
--- a/glass/build.gradle
+++ b/glass/build.gradle
@@ -92,6 +92,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra
             // By default, a development executable will be generated. This is to help the case of
             // testing specific functionality of the library.
             "${nativeName}App"(NativeExecutableSpec) {
+                baseName = 'Glass'
                 sources {
                     cpp {
                         source {
diff --git a/glass/publish.gradle b/glass/publish.gradle
index 0f5a705980..b5b45f4e2b 100644
--- a/glass/publish.gradle
+++ b/glass/publish.gradle
@@ -9,7 +9,7 @@ model {
         def tasks = []
         $.components.each { component ->
             component.binaries.each { binary ->
-                if (binary in NativeExecutableBinarySpec && binary.application.name.contains("glassApp")) {
+                if (binary in NativeExecutableBinarySpec && binary.component.name.contains("glassApp")) {
                     if (binary.buildable && binary.name.contains("Release")) {
                         // We are now in the binary that we want.
                         // This is the default application path for the ZIP task.