diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index 300b926bd..833551c50 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -28,20 +28,20 @@ jobs: - name: Setup SSH env: - SSH_AUTH_SOCK: C:\ssh_agent.sock - shell: msys2 {0} + SSH_AUTH_SOCK: /tmp/ssh_agent.sock + shell: bash run: | ssh-agent -a $SSH_AUTH_SOCK > /dev/null ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - name: Set date - shell: msys2 {0} + shell: bash run: | export TZ=CET-1CEST echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV - name: Deploy env: - SSH_AUTH_SOCK: C:\ssh_agent.sock - shell: msys2 {0} + SSH_AUTH_SOCK: /tmp/ssh_agent.sock + shell: bash run: | mkdir -p upload/snapshots/windows/${{ matrix.platform }}/${{ matrix.config }} mkdir -p upload/snapshots/latest/windows/${{ matrix.platform }}/${{ matrix.config }} diff --git a/BUILD.md b/BUILD.md index 4be9c6e93..b33d35fec 100644 --- a/BUILD.md +++ b/BUILD.md @@ -19,8 +19,7 @@ dependency is not installed. Check the output to see if it matches your expectat in regard to optional dependencies. When configure phase passes, the build phase will produce a dynamically linked binary. -For convenience this binary is copied to the top project directory, but can otherwise -be found in the build directory at `build/ezquake-linux-x86_64`. +The resulting binary can be found in the build directory at `build/ezquake-linux-x86_64`. The default mode of compilation is to not show the full command line, only errors and warnings. To enable verbose mode, set `CMAKE_VERBOSE_MAKEFILE` to `ON`. diff --git a/CMakeLists.txt b/CMakeLists.txt index bef90ca40..32d25bea1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -891,14 +891,6 @@ endif() set_target_properties(ezquake PROPERTIES OUTPUT_NAME ${EXECUTABLE_NAME}) -# Make executable easy to find in project root, strip if release (macOS does this on its own). -# If CMake was invoked with an installation prefix, don't override with project root. -if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(INSTALL_DESTINATION "${PROJECT_SOURCE_DIR}" CACHE PATH "Installation Directory" FORCE) - - install(TARGETS ezquake DESTINATION ${INSTALL_DESTINATION}) -endif() - if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") get_target_property(version git_version GIT_DESCRIBE) diff --git a/misc/appimage/appimage-manual_creation.sh b/misc/appimage/appimage-manual_creation.sh index 2fbbb0b92..8b8204241 100755 --- a/misc/appimage/appimage-manual_creation.sh +++ b/misc/appimage/appimage-manual_creation.sh @@ -93,7 +93,7 @@ echo "$TESTPROGRAM" > "$DIR/test.c" || exit 2 gcc "$DIR/test.c" -o "$DIR/AppDir/usr/bin/test" -lcurl || exit 2 rm -f "$DIR/AppDir/test.c" || exit 2 -cp -f ezquake-linux-$ARCH "$DIR/AppDir/usr/bin/." || exit 4 +cp -f build-dynamic/Release/ezquake-linux-$ARCH "$DIR/AppDir/usr/bin/." || exit 4 rm -f "$DIR/AppDir/AppRun" echo "$QUAKE_SCRIPT" > "$DIR/AppDir/AppRun" || exit 4 chmod +x "$DIR/AppDir/AppRun" || exit 4