Skip to content

Commit 7f1b157

Browse files
author
loki
committed
Automatically configure sunshine.service during build
1 parent 58e0ee4 commit 7f1b157

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,11 @@ else()
102102
${X11_INCLUDE_DIR}
103103
/usr/include/libevdev-1.0)
104104

105+
if(NOT DEFINED SUNSHINE_EXECUTABLE_PATH)
106+
set(SUNSHINE_EXECUTABLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/sunshine")
107+
endif()
105108
configure_file(gen-deb.in gen-deb @ONLY)
109+
configure_file(sunshine.service.in sunshine.service @ONLY)
106110
endif()
107111

108112
set(Boost_USE_STATIC_LIBS ON)

appveyor.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,19 @@ before_build:
3030
build_script:
3131
- cmd: set OLDPATH=%PATH%
3232
- cmd: set PATH=C:\msys64\mingw64\bin
33-
- sh: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_ASSETS_DIR=/etc/sunshine ..
33+
- sh: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_EXECUTABLE_PATH=sunshine -DSUNSHINE_ASSETS_DIR=/etc/sunshine ..
3434
- cmd: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPENSSL_ROOT_DIR=C:\OpenSSL-v111-Win64 -DSUNSHINE_STANDALONE=ON -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" ..
3535
- sh: make -j$(nproc)
3636
- cmd: mingw32-make -j2
3737
- cmd: set PATH=%OLDPATH%
3838

3939
after_build:
4040
- sh: ./gen-deb
41-
- cmd: Del ..\assets\apps_linux.json ..\assets\sunshine.service
41+
- cmd: Del ..\assets\apps_linux.json
4242
- cmd: 7z a Sunshine-Windows.zip ..\assets
4343
- cmd: 7z a Sunshine-Windows.zip sunshine.exe
4444
- cmd: 7z a Sunshine-Windows.zip tools\dxgi-info.exe
4545
- cmd: 7z a Sunshine-Windows.zip tools\audio-info.exe
4646
- cmd: appveyor PushArtifact Sunshine-Windows.zip
4747
- sh: appveyor PushArtifact package-deb/sunshine.deb
48+
- sh: appveyor PushArtifact sunshine.service

assets/sunshine.service renamed to sunshine.service.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Environment="DISPLAY=:0"
77
Type=simple
88
# wait for Xorg
99
ExecStartPre=/bin/sh -c 'while ! pgrep Xorg; do sleep 2; done'
10-
ExecStart=/home/%u/Github/sunshine/cmake-build-release/sunshine
10+
ExecStart=@SUNSHINE_EXECUTABLE_PATH@
1111

1212
[Install]
1313
WantedBy=default.target

0 commit comments

Comments
 (0)