From 14dffd62d004e27c38062792457fbed618142604 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Tue, 18 Jun 2024 15:49:09 -0500
Subject: [PATCH] screw it

---
 .github/workflows/build.yml | 17 ++++++++---------
 CMakeLists.txt              | 10 +---------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 571cb37e0..c5e3c630d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -235,19 +235,18 @@ jobs:
       run: |
         pushd build
 
+        echo "preparing bundle"
+        mkdir -p Furnace.app/Resources
+        cp -v -r po/locale Furnace.app/Resources/locale
+        cp -v ../res/icon.icns Furnace.app/Resources
+
+        codesign -s - Furnace.app
+
         echo "making dirs"
         mkdir new
 
-        make DESTDIR=final install
-
-        find Furnace.app
-
-        ls final/usr
-
-        echo "TODO: code sign..."
-
         echo "copying"
-        cp -v -r final/usr/Applications/furnace.app new/furnace.app
+        cp -v -r Furnace.app new/Furnace.app
         echo "synchronizing"
         sync
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98f324db9..a454998cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,6 @@ else()
   endif()
 endif()
 
-# until ready
 set(WITH_LOCALE_DEFAULT ON)
 
 try_compile(HAVE_SETLOCALE ${CMAKE_BINARY_DIR}/check SOURCES ${CMAKE_SOURCE_DIR}/src/check/check_setlocale.c)
@@ -1183,11 +1182,6 @@ if (WIN32 AND CONSOLE_SUBSYSTEM)
   list(APPEND DEPENDENCIES_DEFINES "TA_SUBSYSTEM_CONSOLE")
 endif()
 
-if (MAKE_BUNDLE AND NOT FORCE_APPLE_BIN)
-  file(GLOB_RECURSE LOCALE_FILES po/locale)
-  list(APPEND USED_SOURCES ${LOCALE_FILES})
-endif()
-
 if (MAKE_BUNDLE)
   set(FURNACE Furnace)
 else()
@@ -1205,9 +1199,7 @@ endif()
 if (MAKE_BUNDLE AND NOT FORCE_APPLE_BIN)
   set_target_properties(${FURNACE} PROPERTIES
     MACOSX_BUNDLE True
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/Info.plist
-    RESOURCE "${LOCALE_FILES}")
-  set_source_files_properties("${LOCALE_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/Info.plist)
 endif()
 
 target_include_directories(${FURNACE} SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS})