From 717b50155ad7e8886e6162423315459d6bed51b9 Mon Sep 17 00:00:00 2001 From: nmzik Date: Fri, 16 Oct 2026 12:55:03 +0200 Subject: [PATCH] launcher: rename executable to kyty_launcher --- .github/workflows/build.yml | 10 +++++----- .vscode/launch.json | 4 ++-- README.md | 10 +++++----- src/launcher/CMakeLists.txt | 11 ++++++++++- src/launcher/src/updateChecker.cpp | 4 ++-- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c820aed70..c74ae64e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -407,12 +407,12 @@ jobs: - name: Verify artifacts shell: bash run: | - file _Build/linux/install/launcher + file _Build/linux/install/kyty_launcher file _Build/linux/install/kyty_emulator test -x _Build/linux/install/kyty_updater file _Build/linux/install/kyty_emulator | grep -q "ELF 64-bit LSB .*x86-64" ldd _Build/linux/install/kyty_emulator > /dev/null - readelf -d _Build/linux/install/launcher | grep -q 'RPATH.*\$ORIGIN/lib' + readelf -d _Build/linux/install/kyty_launcher | grep -q 'RPATH.*\$ORIGIN/lib' while IFS= read -r -d '' binary; do while read -r dependency; do test -e "_Build/linux/install/lib/$dependency" @@ -421,8 +421,8 @@ jobs: sed -n 's/.*Shared library: \[\(libQt6[^]]*\|libicu[^]]*\)\].*/\1/p' ) done < <( - find _Build/linux/install/launcher _Build/linux/install/plugins \ - -type f \( -name launcher -o -name '*.so' \) -print0 + find _Build/linux/install/kyty_launcher _Build/linux/install/plugins \ + -type f \( -name kyty_launcher -o -name '*.so' \) -print0 ) _Build/linux/install/kyty_emulator --help > /dev/null @@ -497,7 +497,7 @@ jobs: linux_dir="artifacts/KytyPS5-Linux-x86_64" test -d "$linux_dir" chmod a+x \ - "$linux_dir/launcher" \ + "$linux_dir/kyty_launcher" \ "$linux_dir/kyty_emulator" \ "$linux_dir/kyty_updater" tar -C "$linux_dir" -czf \ diff --git a/.vscode/launch.json b/.vscode/launch.json index 1a9086167..558355cf5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,7 @@ "name": "Debug launcher UI", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}\\_Build\\vscode-clang\\launcher\\launcher.exe", + "program": "${workspaceFolder}\\_Build\\vscode-clang\\launcher\\kyty_launcher.exe", "args": [], "stopAtEntry": false, "cwd": "${workspaceFolder}\\_Build\\vscode-clang\\launcher", @@ -13,7 +13,7 @@ "externalConsole": false, "linux": { "type": "cppdbg", - "program": "${workspaceFolder}/_Build/vscode-clang/launcher/launcher", + "program": "${workspaceFolder}/_Build/vscode-clang/launcher/kyty_launcher", "cwd": "${workspaceFolder}/_Build/vscode-clang/launcher", "MIMode": "gdb", "miDebuggerPath": "/usr/bin/gdb" diff --git a/README.md b/README.md index 2fb02387b..eb8659acb 100644 --- a/README.md +++ b/README.md @@ -275,11 +275,11 @@ From the repository root, follow the launcher configure, build and install steps [Building on Linux](#building-on-linux), omitting `-DCMAKE_PREFIX_PATH="$Qt6_DIR"`; CMake finds Fedora's packaged Qt 6 automatically. -Run `./_Build/linux/install/launcher` on regular Fedora or inside the container. To launch a +Run `./_Build/linux/install/kyty_launcher` on regular Fedora or inside the container. To launch a container build from the host, leave the container with `exit`, then run from the repository root: ```bash -distrobox enter kyty-build -- ./_Build/linux/install/launcher +distrobox enter kyty-build -- ./_Build/linux/install/kyty_launcher ``` Qt libraries and plugins are bundled. You can also launch directly on a Fedora Atomic host @@ -345,7 +345,7 @@ Use `_Build/linux` instead of `_Build/windows` for a Linux build. A ready-made Visual Studio Code setup is included in [`.vscode`](.vscode). It configures CMake Tools to build the project with Ninja and `clang-cl` and provides launch profiles for both -`launcher.exe` and `kyty_emulator.exe`. It is Windows-only: VS Code settings cannot select a +`kyty_launcher.exe` and `kyty_emulator.exe`. It is Windows-only: VS Code settings cannot select a compiler per platform, so on Linux configure from the command line as shown above. Before using it: @@ -365,11 +365,11 @@ Update your graphics driver before reporting rendering problems. To use the graphical launcher: ```powershell -.\_Build\windows\install\launcher.exe +.\_Build\windows\install\kyty_launcher.exe ``` ```bash -./_Build/linux/install/launcher +./_Build/linux/install/kyty_launcher ``` ```bash diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt index 78b482b21..4f0622a46 100644 --- a/src/launcher/CMakeLists.txt +++ b/src/launcher/CMakeLists.txt @@ -76,7 +76,7 @@ if(WIN32) ) endif() -set(launcher_name "launcher") +set(launcher_name "kyty_launcher") if(APPLE) set(launcher_name "KytyPS5") endif() @@ -101,6 +101,15 @@ install(TARGETS launcher BUNDLE DESTINATION . RUNTIME DESTINATION .) +if(NOT APPLE) + # Older releases require the previous executable name when validating updates. + install(CODE " + file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}\" + TYPE PROGRAM RENAME \"launcher${CMAKE_EXECUTABLE_SUFFIX}\" + FILES \"\${CMAKE_INSTALL_PREFIX}/${launcher_name}${CMAKE_EXECUTABLE_SUFFIX}\") + ") +endif() + if(APPLE) install(TARGETS kyty_emulator DESTINATION "KytyPS5.app/Contents/MacOS") install(TARGETS kyty_updater DESTINATION "KytyPS5.app/Contents/MacOS") diff --git a/src/launcher/src/updateChecker.cpp b/src/launcher/src/updateChecker.cpp index 04c62e913..e7d6680dd 100644 --- a/src/launcher/src/updateChecker.cpp +++ b/src/launcher/src/updateChecker.cpp @@ -21,11 +21,11 @@ constexpr qint64 MAX_METADATA_SIZE = 2 * 1024 * 1024; QString LauncherRelativePath() { #if defined(_WIN32) - return QStringLiteral("launcher.exe"); + return QStringLiteral("kyty_launcher.exe"); #elif defined(__APPLE__) return QStringLiteral("KytyPS5.app/Contents/MacOS/KytyPS5"); #else - return QStringLiteral("launcher"); + return QStringLiteral("kyty_launcher"); #endif }