feat: update CMake configuration for Sparkle integration and enhance plist generation

Author: mfisher31

CMakeLists.txt

@@ -7,7 +7,7 @@ set(PROJECT_VERSION_SUFFIX "b2")
 set(PROJECT_VERSION_FULL "${PROJECT_VERSION}${PROJECT_VERSION_SUFFIX}")
 
 include(cmake/Element.cmake)
-if(ELEMENT_ENABLE_UPDATER)
+if(APPLE AND ELEMENT_ENABLE_UPDATER)
     include(cmake/FindSparkle.cmake)
 endif()
 include(cmake/FindJack.cmake)
@@ -59,25 +59,6 @@ else()
     set(ELEMENT_STANDALONE_PRODUCT_NAME "Element")
 endif()
 
-set(SPARKLE_FEED_URL "https://kushview.net/element/appcast.xml")
-set(SPARKLE_PUBLIC_KEY "xxx")
-set(ELEMENT_APP_PLIST_TO_MERGE "")
-
-if(APPLE AND ELEMENT_ENABLE_UPDATER)
-    message(STATUS "PLIST UPDATED")
-    string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-                        <!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-                        <plist version=\"1.0\">
-                        <dict>")
-    
-    string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<key>SUFeedURL</key>")
-    string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<string>${SPARKLE_FEED_URL}</string>")
-    string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<key>SUPublicEDKey</key>")
-    string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<string>${SPARKLE_PUBLIC_KEY}</string>")
-
-    string(APPEND ELEMENT_APP_PLIST_TO_MERGE "</dict></plist>")
-endif()
-
 juce_add_gui_app(element_app
     PRODUCT_NAME            "${ELEMENT_STANDALONE_PRODUCT_NAME}"
     BUILD_VERSION           "${ELEMENT_BUILD_NUMBER}"
@@ -104,7 +85,8 @@ if(NOT APPLE)
     install(TARGETS element_app DESTINATION ${CMAKE_INSTALL_BINDIR})
 else()
     if(ELEMENT_ENABLE_UPDATER)
-        target_link_libraries(element_app PRIVATE ${SPARKLE_FRAMEWORK})
+        target_compile_options(element_app PRIVATE "-F${sparkle_SOURCE_DIR}")
+        target_link_options(element_app PRIVATE "-F${sparkle_SOURCE_DIR}" -framework Sparkle)
         target_sources(element_app PRIVATE src/sparkle.mm)
         add_custom_command(TARGET element_app POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E rm -rf

cmake/Element.cmake

@@ -7,6 +7,8 @@ option(ELEMENT_ENABLE_VST2 "Build with VST2 support" OFF)
 option(ELEMENT_ENABLE_LTO "Build with Link Time Optimization" OFF)
 option(ELEMENT_ENABLE_UPDATER "Build with updater support" OFF)
 
+set(ELEMENT_APP_PLIST_TO_MERGE "")
+
 if(APPLE)
     enable_language(OBJC)
     enable_language(OBJCXX)

cmake/FindSparkle.cmake

@@ -1,18 +1,31 @@
-if(APPLE)    
-    set(SPARKLE_VERSION "2.8.1" CACHE STRING "Sparkle version to download")
-    
-    FetchContent_Declare(
-        sparkle
-        URL https://github.com/Sparkle-project/Sparkle/releases/download/${SPARKLE_VERSION}/Sparkle-${SPARKLE_VERSION}.tar.xz
-        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    )
-    
-    FetchContent_MakeAvailable(sparkle)
-    message(STATUS "Searching for Sparkle in: ${sparkle_SOURCE_DIR}")
-    find_library(SPARKLE_FRAMEWORK Sparkle HINTS ${sparkle_SOURCE_DIR})
-    if(SPARKLE_FRAMEWORK)
-        message(STATUS "Found Sparkle: ${SPARKLE_FRAMEWORK}")
-    else()
-        message(FATAL_ERROR "Sparkle framework not found")
-    endif()
+set(SPARKLE_VERSION "2.8.1" CACHE STRING "Sparkle version to download")
+set(SPARKLE_FEED_URL "http://localhost:8000/appcast.xml")
+set(SPARKLE_PUBLIC_KEY "+3pPKr274O3KL4lTWaEs/ukVk3Ayvnc7BkdS45zOnE4=")
+
+FetchContent_Declare(
+    sparkle
+    URL https://github.com/Sparkle-project/Sparkle/releases/download/${SPARKLE_VERSION}/Sparkle-${SPARKLE_VERSION}.tar.xz
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+)
+
+FetchContent_MakeAvailable(sparkle)
+message(STATUS "Searching for Sparkle in: ${sparkle_SOURCE_DIR}")
+find_library(SPARKLE_FRAMEWORK Sparkle HINTS ${sparkle_SOURCE_DIR})
+
+if(SPARKLE_FRAMEWORK)
+    message(STATUS "Found Sparkle: ${SPARKLE_FRAMEWORK}")
+else()
+    message(FATAL_ERROR "Sparkle framework not found")
 endif()
+
+string(APPEND ELEMENT_APP_PLIST_TO_MERGE 
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+    <!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+    <plist version=\"1.0\">
+    <dict>
+")
+string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<key>SUFeedURL</key>")
+string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<string>${SPARKLE_FEED_URL}</string>")
+string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<key>SUPublicEDKey</key>")
+string(APPEND ELEMENT_APP_PLIST_TO_MERGE "<string>${SPARKLE_PUBLIC_KEY}</string>")
+string(APPEND ELEMENT_APP_PLIST_TO_MERGE "</dict></plist>")

src/sparkle.mm

@@ -1,10 +1,12 @@
 // SPDX-FileCopyrightText: Copyright (C) Kushview, LLC.
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+#import <Foundation/Foundation.h>
 #import <Sparkle/Sparkle.h>
+
 #include <memory>
-#include "juce_core/juce_core.h"
 
+#include <element/juce/core.hpp>
 #include <element/ui/updater.hpp>
 
 // An updater delegate class that mainly takes care of updating the check for updates menu item's state