mirror of
https://github.com/KytyPS5/KytyPS5.git
synced 2026-10-19 18:36:53 +02:00
launcher: rename executable to kyty_launcher
This commit is contained in:
@@ -407,12 +407,12 @@ jobs:
|
|||||||
- name: Verify artifacts
|
- name: Verify artifacts
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
file _Build/linux/install/launcher
|
file _Build/linux/install/kyty_launcher
|
||||||
file _Build/linux/install/kyty_emulator
|
file _Build/linux/install/kyty_emulator
|
||||||
test -x _Build/linux/install/kyty_updater
|
test -x _Build/linux/install/kyty_updater
|
||||||
file _Build/linux/install/kyty_emulator | grep -q "ELF 64-bit LSB .*x86-64"
|
file _Build/linux/install/kyty_emulator | grep -q "ELF 64-bit LSB .*x86-64"
|
||||||
ldd _Build/linux/install/kyty_emulator > /dev/null
|
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 IFS= read -r -d '' binary; do
|
||||||
while read -r dependency; do
|
while read -r dependency; do
|
||||||
test -e "_Build/linux/install/lib/$dependency"
|
test -e "_Build/linux/install/lib/$dependency"
|
||||||
@@ -421,8 +421,8 @@ jobs:
|
|||||||
sed -n 's/.*Shared library: \[\(libQt6[^]]*\|libicu[^]]*\)\].*/\1/p'
|
sed -n 's/.*Shared library: \[\(libQt6[^]]*\|libicu[^]]*\)\].*/\1/p'
|
||||||
)
|
)
|
||||||
done < <(
|
done < <(
|
||||||
find _Build/linux/install/launcher _Build/linux/install/plugins \
|
find _Build/linux/install/kyty_launcher _Build/linux/install/plugins \
|
||||||
-type f \( -name launcher -o -name '*.so' \) -print0
|
-type f \( -name kyty_launcher -o -name '*.so' \) -print0
|
||||||
)
|
)
|
||||||
_Build/linux/install/kyty_emulator --help > /dev/null
|
_Build/linux/install/kyty_emulator --help > /dev/null
|
||||||
|
|
||||||
@@ -497,7 +497,7 @@ jobs:
|
|||||||
linux_dir="artifacts/KytyPS5-Linux-x86_64"
|
linux_dir="artifacts/KytyPS5-Linux-x86_64"
|
||||||
test -d "$linux_dir"
|
test -d "$linux_dir"
|
||||||
chmod a+x \
|
chmod a+x \
|
||||||
"$linux_dir/launcher" \
|
"$linux_dir/kyty_launcher" \
|
||||||
"$linux_dir/kyty_emulator" \
|
"$linux_dir/kyty_emulator" \
|
||||||
"$linux_dir/kyty_updater"
|
"$linux_dir/kyty_updater"
|
||||||
tar -C "$linux_dir" -czf \
|
tar -C "$linux_dir" -czf \
|
||||||
|
|||||||
Vendored
+2
-2
@@ -5,7 +5,7 @@
|
|||||||
"name": "Debug launcher UI",
|
"name": "Debug launcher UI",
|
||||||
"type": "cppvsdbg",
|
"type": "cppvsdbg",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"program": "${workspaceFolder}\\_Build\\vscode-clang\\launcher\\launcher.exe",
|
"program": "${workspaceFolder}\\_Build\\vscode-clang\\launcher\\kyty_launcher.exe",
|
||||||
"args": [],
|
"args": [],
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"cwd": "${workspaceFolder}\\_Build\\vscode-clang\\launcher",
|
"cwd": "${workspaceFolder}\\_Build\\vscode-clang\\launcher",
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
"externalConsole": false,
|
"externalConsole": false,
|
||||||
"linux": {
|
"linux": {
|
||||||
"type": "cppdbg",
|
"type": "cppdbg",
|
||||||
"program": "${workspaceFolder}/_Build/vscode-clang/launcher/launcher",
|
"program": "${workspaceFolder}/_Build/vscode-clang/launcher/kyty_launcher",
|
||||||
"cwd": "${workspaceFolder}/_Build/vscode-clang/launcher",
|
"cwd": "${workspaceFolder}/_Build/vscode-clang/launcher",
|
||||||
"MIMode": "gdb",
|
"MIMode": "gdb",
|
||||||
"miDebuggerPath": "/usr/bin/gdb"
|
"miDebuggerPath": "/usr/bin/gdb"
|
||||||
|
|||||||
@@ -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
|
[Building on Linux](#building-on-linux), omitting `-DCMAKE_PREFIX_PATH="$Qt6_DIR"`; CMake finds
|
||||||
Fedora's packaged Qt 6 automatically.
|
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:
|
container build from the host, leave the container with `exit`, then run from the repository root:
|
||||||
|
|
||||||
```bash
|
```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
|
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
|
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
|
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.
|
compiler per platform, so on Linux configure from the command line as shown above.
|
||||||
|
|
||||||
Before using it:
|
Before using it:
|
||||||
@@ -365,11 +365,11 @@ Update your graphics driver before reporting rendering problems.
|
|||||||
To use the graphical launcher:
|
To use the graphical launcher:
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
.\_Build\windows\install\launcher.exe
|
.\_Build\windows\install\kyty_launcher.exe
|
||||||
```
|
```
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./_Build/linux/install/launcher
|
./_Build/linux/install/kyty_launcher
|
||||||
```
|
```
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ if(WIN32)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(launcher_name "launcher")
|
set(launcher_name "kyty_launcher")
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set(launcher_name "KytyPS5")
|
set(launcher_name "KytyPS5")
|
||||||
endif()
|
endif()
|
||||||
@@ -101,6 +101,15 @@ install(TARGETS launcher
|
|||||||
BUNDLE DESTINATION .
|
BUNDLE DESTINATION .
|
||||||
RUNTIME 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)
|
if(APPLE)
|
||||||
install(TARGETS kyty_emulator DESTINATION "KytyPS5.app/Contents/MacOS")
|
install(TARGETS kyty_emulator DESTINATION "KytyPS5.app/Contents/MacOS")
|
||||||
install(TARGETS kyty_updater DESTINATION "KytyPS5.app/Contents/MacOS")
|
install(TARGETS kyty_updater DESTINATION "KytyPS5.app/Contents/MacOS")
|
||||||
|
|||||||
@@ -21,11 +21,11 @@ constexpr qint64 MAX_METADATA_SIZE = 2 * 1024 * 1024;
|
|||||||
|
|
||||||
QString LauncherRelativePath() {
|
QString LauncherRelativePath() {
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
return QStringLiteral("launcher.exe");
|
return QStringLiteral("kyty_launcher.exe");
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
return QStringLiteral("KytyPS5.app/Contents/MacOS/KytyPS5");
|
return QStringLiteral("KytyPS5.app/Contents/MacOS/KytyPS5");
|
||||||
#else
|
#else
|
||||||
return QStringLiteral("launcher");
|
return QStringLiteral("kyty_launcher");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user