Compare commits
3 Commits
a62ffc41ad
...
be3a50d42a
Author | SHA1 | Date |
---|---|---|
|
be3a50d42a | |
|
aa734cf45a | |
|
cbc96614d0 |
|
@ -50,14 +50,15 @@ jobs:
|
||||||
|
|
||||||
- name: Download linuxdeploy
|
- name: Download linuxdeploy
|
||||||
run: |
|
run: |
|
||||||
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
|
wget "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
|
||||||
chmod +x linuxdeploy-x86_64.AppImage
|
wget "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
|
||||||
|
chmod +x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-gtk.sh
|
||||||
sudo mv linuxdeploy-x86_64.AppImage /usr/local/bin/linuxdeploy
|
sudo mv linuxdeploy-x86_64.AppImage /usr/local/bin/linuxdeploy
|
||||||
|
|
||||||
- name: Create AppImage
|
- name: Create AppImage
|
||||||
run: |
|
run: |
|
||||||
cp -r build/PlayerLink linux/AppDir/usr/bin/
|
cp -r build/PlayerLink linux/AppDir/usr/bin/
|
||||||
linuxdeploy --appdir=linux/AppDir --output appimage
|
linuxdeploy --appdir=linux/AppDir --plugin gtk --output appimage
|
||||||
|
|
||||||
- name: Upload AppImage artifact
|
- name: Upload AppImage artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
@ -126,27 +127,17 @@ jobs:
|
||||||
path: PlayerLink.dmg
|
path: PlayerLink.dmg
|
||||||
|
|
||||||
create-release:
|
create-release:
|
||||||
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
needs: [build-linux, build-windows, build-macos]
|
needs: [build-linux, build-windows, build-macos]
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Download AppImage artifact
|
- name: Download artifacts
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: PlayerLink-AppImage
|
|
||||||
path: ./release-assets
|
path: ./release-assets
|
||||||
|
merge-multiple: true
|
||||||
- name: Download Windows artifact
|
- name: Display structure of downloaded files
|
||||||
uses: actions/download-artifact@v4
|
run: ls -R ./release-assets
|
||||||
with:
|
|
||||||
name: PlayerLink-Windows-Executable
|
|
||||||
path: ./release-assets
|
|
||||||
|
|
||||||
- name: Download macOS DMG artifact
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: PlayerLink-macOS-DMG
|
|
||||||
path: ./release-assets
|
|
||||||
|
|
||||||
- name: Create GitHub Release
|
- name: Create GitHub Release
|
||||||
uses: actions/create-release@v1
|
uses: actions/create-release@v1
|
||||||
id: create_release
|
id: create_release
|
||||||
|
@ -163,8 +154,8 @@ jobs:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: ./release-assets/*.AppImage
|
asset_path: ./release-assets/PlayerLink-x86_64.AppImage
|
||||||
asset_name: PlayerLink.AppImage
|
asset_name: PlayerLink-x86_64.AppImage
|
||||||
asset_content_type: application/octet-stream
|
asset_content_type: application/octet-stream
|
||||||
|
|
||||||
- name: Upload Windows Executable
|
- name: Upload Windows Executable
|
||||||
|
@ -173,8 +164,8 @@ jobs:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: path_to_your_windows_executable
|
asset_path: ./release-assets/PlayerLink.exe
|
||||||
asset_name: ./release-assets/*.exe
|
asset_name: PlayerLink.exe
|
||||||
asset_content_type: application/octet-stream
|
asset_content_type: application/octet-stream
|
||||||
|
|
||||||
- name: Upload macOS DMG
|
- name: Upload macOS DMG
|
||||||
|
@ -183,6 +174,6 @@ jobs:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
asset_path: ./release-assets/*.dmg
|
asset_path: ./release-assets/PlayerLink.dmg
|
||||||
asset_name: PlayerLink.dmg
|
asset_name: PlayerLink.dmg
|
||||||
asset_content_type: application/octet-stream
|
asset_content_type: application/octet-stream
|
||||||
|
|
BIN
img/linux.png
BIN
img/linux.png
Binary file not shown.
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 42 KiB |
BIN
img/macos.png
BIN
img/macos.png
Binary file not shown.
Before Width: | Height: | Size: 248 KiB After Width: | Height: | Size: 135 KiB |
BIN
img/windows.png
BIN
img/windows.png
Binary file not shown.
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 53 KiB |
|
@ -12,6 +12,9 @@
|
||||||
DBusConnection* conn = nullptr;
|
DBusConnection* conn = nullptr;
|
||||||
|
|
||||||
std::string getExecutablePath() {
|
std::string getExecutablePath() {
|
||||||
|
if (const char* appImagePath = std::getenv("APPIMAGE"))
|
||||||
|
return std::string(appImagePath);
|
||||||
|
|
||||||
char result[PATH_MAX]{};
|
char result[PATH_MAX]{};
|
||||||
ssize_t count = readlink("/proc/self/exe", result, PATH_MAX);
|
ssize_t count = readlink("/proc/self/exe", result, PATH_MAX);
|
||||||
return (count != -1) ? std::string(result, count) : std::string();
|
return (count != -1) ? std::string(result, count) : std::string();
|
||||||
|
|
|
@ -11,9 +11,10 @@ SET(BUILD_STATIC_LIBS ON)
|
||||||
SET(BUILD_SHARED_LIBS OFF)
|
SET(BUILD_SHARED_LIBS OFF)
|
||||||
SET(BUILD_CURL_EXE OFF)
|
SET(BUILD_CURL_EXE OFF)
|
||||||
SET(MBEDTLS_INCLUDE_DIRS ../mbedtls/include)
|
SET(MBEDTLS_INCLUDE_DIRS ../mbedtls/include)
|
||||||
file(REMOVE curl/CMake/FindMbedTLS.cmake) #replace curls FindMbedTLS that expects mbedtls to be prebuilt with a dummy
|
file(RENAME curl/CMake/FindMbedTLS.cmake curl/CMake/FindMbedTLS.cmake.bak) #replace curls FindMbedTLS that expects mbedtls to be prebuilt with a dummy
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dummy ${CMAKE_MODULE_PATH})
|
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dummy ${CMAKE_MODULE_PATH})
|
||||||
add_subdirectory("curl")
|
add_subdirectory("curl")
|
||||||
|
file(RENAME curl/CMake/FindMbedTLS.cmake.bak curl/CMake/FindMbedTLS.cmake)
|
||||||
set(wxBUILD_SHARED OFF)
|
set(wxBUILD_SHARED OFF)
|
||||||
set(wxBUILD_MONOLITHIC ON)
|
set(wxBUILD_MONOLITHIC ON)
|
||||||
set(wxUSE_GUI ON)
|
set(wxUSE_GUI ON)
|
||||||
|
|
Loading…
Reference in New Issue