From af058711eccda87d7c800c675df5c1288dc888de Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Fri, 18 Jul 2025 00:21:12 -0500 Subject: [PATCH] Revert because you just don't use macos icons for cli --- .github/workflows/macos.yml | 23 +++-------------------- CMakeLists.txt | 20 +------------------- 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c5ca853..8d73d0e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -65,23 +65,6 @@ jobs: echo "OPENSSL_INCLUDE_DIR=/opt/homebrew/opt/openssl@3/include" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=/opt/homebrew/opt/openssl@3/lib/pkgconfig" >> $GITHUB_ENV - - name: Convert PNG to ICNS - run: | - mkdir -p build/icon.iconset - # Generate required icon sizes - sips -z 16 16 src/macos/icon.png --out build/icon.iconset/icon_16x16.png - sips -z 32 32 src/macos/icon.png --out build/icon.iconset/icon_16x16@2x.png - sips -z 32 32 src/macos/icon.png --out build/icon.iconset/icon_32x32.png - sips -z 64 64 src/macos/icon.png --out build/icon.iconset/icon_32x32@2x.png - sips -z 128 128 src/macos/icon.png --out build/icon.iconset/icon_128x128.png - sips -z 256 256 src/macos/icon.png --out build/icon.iconset/icon_128x128@2x.png - sips -z 256 256 src/macos/icon.png --out build/icon.iconset/icon_256x256.png - sips -z 512 512 src/macos/icon.png --out build/icon.iconset/icon_256x256@2x.png - sips -z 512 512 src/macos/icon.png --out build/icon.iconset/icon_512x512.png - sips -z 1024 1024 src/macos/icon.png --out build/icon.iconset/icon_512x512@2x.png - # Convert to icns - iconutil -c icns build/icon.iconset -o build/umskt.icns - - name: Configure and build UMSKT run: | cd build @@ -97,15 +80,15 @@ jobs: run: | ls -a build mkdir -p build/actions_upload - mv build/umskt.app build/actions_upload/umskt.app + mv build/umskt build/actions_upload/umskt - name: Run tests run: | cd build/actions_upload echo Test 1 - generating key - open -a ./umskt.app --args -b 2C -c 365 -s 069420 -v + ./umskt -b 2C -c 365 -s 069420 -v echo Test 2 - generating confid - open -a ./umskt.app --args -i 253286028742154311079061239762245184619981623171292574 + ./umskt -i 253286028742154311079061239762245184619981623171292574 - name: Upload platform-specific build uses: actions/upload-artifact@v4.6.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 166eb45..b703b23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,26 +252,8 @@ ELSE() TARGET_LINK_DIRECTORIES(_umskt PUBLIC ${UMSKT_LINK_DIRS}) TARGET_LINK_LIBRARIES(_umskt ${OPENSSL_CRYPTO_LIBRARIES} fmt ${UMSKT_LINK_LIBS}) - # Set up macOS bundle icon - if(APPLE) - set(MACOSX_BUNDLE_ICON_FILE umskt.icns) - set(APP_ICON_MACOSX ${CMAKE_BINARY_DIR}/umskt.icns) - set_source_files_properties(${APP_ICON_MACOSX} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") - endif() - ### UMSKT executable compilation - ADD_EXECUTABLE(umskt src/main.cpp src/cli.cpp ${UMSKT_EXE_WINDOWS_EXTRA} ${APP_ICON_MACOSX}) - if(APPLE) - set_target_properties(umskt PROPERTIES - MACOSX_BUNDLE TRUE - MACOSX_BUNDLE_BUNDLE_NAME "UMSKT" - MACOSX_BUNDLE_GUI_IDENTIFIER "com.umskt.app" - MACOSX_BUNDLE_ICON_FILE "umskt.icns" - MACOSX_BUNDLE_INFO_STRING "UMSKT" - MACOSX_BUNDLE_LONG_VERSION_STRING "1.0.0" - MACOSX_BUNDLE_SHORT_VERSION_STRING "1.0" - MACOSX_BUNDLE_BUNDLE_VERSION "1.0.0" - ) + ADD_EXECUTABLE(umskt src/main.cpp src/cli.cpp ${UMSKT_EXE_WINDOWS_EXTRA} endif() TARGET_INCLUDE_DIRECTORIES(umskt PUBLIC ${OPENSSL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(umskt _umskt ${OPENSSL_CRYPTO_LIBRARIES} ${ZLIB_LIBRARIES} fmt nlohmann_json::nlohmann_json umskt::rc ${UMSKT_LINK_LIBS})