mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove NIGHTLY_BUILD and BINARY_RELEASE options

pull/3726/head
staphen 4 years ago committed by Anders Jenbo
parent
ae1b70ed84
commit
66beceba59
13 changed files with 17 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      .circleci/config.yml
  2. 2
      .github/workflows/Linux_x86.yml
  3. 2
      .github/workflows/Linux_x86_64_SDL1.yml
  4. 2
      .github/workflows/MacOSX.yml
  5. 2
      .github/workflows/Windows_x64.yml
  6. 2
      .github/workflows/Windows_x86.yml
  7. 2
      CMake/platforms/android.cmake
  8. 1
      CMake/platforms/cpigamesh.cmake
  9. 20
      CMakeLists.txt
  10. 4
      CMakeSettings.json
  11. 2
      Packaging/amiga/Dockerfile
  12. 2
      Packaging/switch/build.sh
  13. 2
      appveyor.yml

8
.circleci/config.yml
Unescape View File

@ -10,7 +10,7 @@ jobs:
- run: apt update -y - run: apt update -y
- run: apt install -y g++ libsdl2-dev libbz2-dev git rpm wget smpq - run: apt install -y g++ libsdl2-dev libbz2-dev git rpm wget smpq
- run: apt install -y -t 'stretch-backports*' cmake libsodium-dev libpng-dev - run: apt install -y -t 'stretch-backports*' cmake libsodium-dev libpng-dev
- run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DCMAKE_INSTALL_PREFIX=/usr - run: cmake -S. -Bbuild .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCPACK=ON -DCMAKE_INSTALL_PREFIX=/usr
- run: cmake --build build -j 2 --target package - run: cmake --build build -j 2 --target package
- store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64} - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64}
- run: Packaging/nix/LinuxReleasePackaging.sh - run: Packaging/nix/LinuxReleasePackaging.sh
@ -37,7 +37,7 @@ jobs:
working_directory: ~/repo working_directory: ~/repo
steps: steps:
- checkout - checkout
- run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON - run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild .. -DCMAKE_BUILD_TYPE=RelWithDebInfo
- run: cmake --build build -j 2 - run: cmake --build build -j 2
- store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro} - store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro}
3ds: 3ds:
@ -53,7 +53,7 @@ jobs:
- run: wget https://github.com/jakcron/Project_CTR/releases/download/v0.16/makerom_016_ctrtool.zip - run: wget https://github.com/jakcron/Project_CTR/releases/download/v0.16/makerom_016_ctrtool.zip
- run: unzip -j "makerom_016_ctrtool.zip" "Ubuntu/makerom" -d "/opt/devkitpro/tools/bin" - run: unzip -j "makerom_016_ctrtool.zip" "Ubuntu/makerom" -d "/opt/devkitpro/tools/bin"
- run: sudo chmod +rx /opt/devkitpro/tools/bin/makerom - run: sudo chmod +rx /opt/devkitpro/tools/bin/makerom
- run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake - run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake
- run: cmake --build build -j 2 - run: cmake --build build -j 2
- store_artifacts: {path: ./build/devilutionx.3dsx, destination: devilutionx.3dsx} - store_artifacts: {path: ./build/devilutionx.3dsx, destination: devilutionx.3dsx}
- store_artifacts: {path: ./build/devilutionx.cia, destination: devilutionx.cia} - store_artifacts: {path: ./build/devilutionx.cia, destination: devilutionx.cia}
@ -74,7 +74,7 @@ jobs:
steps: steps:
- checkout - checkout
- run: apk --no-cache add git cmake ninja bash pkgconfig gettext - run: apk --no-cache add git cmake ninja bash pkgconfig gettext
- run: cmake -S. -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DNIGHTLY_BUILD=ON - run: cmake -S. -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
- run: cmake --build build -j 2 - run: cmake --build build -j 2
- store_artifacts: {path: ./build/devilutionx.vpk, destination: devilutionx.vpk} - store_artifacts: {path: ./build/devilutionx.vpk, destination: devilutionx.vpk}

2
.github/workflows/Linux_x86.yml
Unescape View File

@ -32,7 +32,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
shell: bash shell: bash
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/linux_i386.toolchain.cmake run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCPACK=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/linux_i386.toolchain.cmake
- name: Build - name: Build
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}

2
.github/workflows/Linux_x86_64_SDL1.yml
Unescape View File

@ -31,7 +31,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
shell: bash shell: bash
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DUSE_SDL1=ON run: cmake -S. -Bbuild .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCPACK=ON -DUSE_SDL1=ON
- name: Build - name: Build
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}

2
.github/workflows/MacOSX.yml
Unescape View File

@ -39,7 +39,7 @@ jobs:
# access regardless of the host operating system # access regardless of the host operating system
shell: bash shell: bash
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: cmake -S. -Bbuild run: cmake -S. -Bbuild -DMACOSX_STANDALONE_APP_BUNDLE=ON
- name: Build - name: Build
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}

2
.github/workflows/Windows_x64.yml
Unescape View File

@ -25,7 +25,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
shell: bash shell: bash
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/mingwcc64.toolchain.cmake -DDEVILUTIONX_SYSTEM_BZIP2=OFF run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCPACK=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/mingwcc64.toolchain.cmake -DDEVILUTIONX_SYSTEM_BZIP2=OFF
- name: Build - name: Build
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}

2
.github/workflows/Windows_x86.yml
Unescape View File

@ -25,7 +25,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
shell: bash shell: bash
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/mingwcc.toolchain.cmake -DDEVILUTIONX_SYSTEM_BZIP2=OFF run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCPACK=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/mingwcc.toolchain.cmake -DDEVILUTIONX_SYSTEM_BZIP2=OFF
- name: Build - name: Build
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}

2
CMake/platforms/android.cmake
Unescape View File

@ -23,7 +23,7 @@ set(DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/android-pro
set(ASAN OFF) set(ASAN OFF)
set(UBSAN OFF) set(UBSAN OFF)
if(BINARY_RELEASE OR CMAKE_BUILD_TYPE STREQUAL "Release") if(CMAKE_BUILD_TYPE STREQUAL "Release")
# Work around a linker bug in clang: https://github.com/android/ndk/issues/721 # Work around a linker bug in clang: https://github.com/android/ndk/issues/721
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto=full") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto=full")
endif() endif()

1
CMake/platforms/cpigamesh.cmake
Unescape View File

@ -1,7 +1,6 @@
set(NONET ON) set(NONET ON)
set(PREFILL_PLAYER_NAME ON) set(PREFILL_PLAYER_NAME ON)
set(HAS_KBCTRL 1) set(HAS_KBCTRL 1)
set(BINARY_RELEASE ON)
set(LTO ON) set(LTO ON)
set(DIST ON) set(DIST ON)
set(DEBUG OFF) set(DEBUG OFF)

20
CMakeLists.txt
Unescape View File

@ -40,9 +40,7 @@ option(GPERF "Build with GPerfTools profiler" OFF)
cmake_dependent_option(GPERF_HEAP_FIRST_GAME_ITERATION "Save heap profile of the first game iteration" OFF "GPERF" OFF) cmake_dependent_option(GPERF_HEAP_FIRST_GAME_ITERATION "Save heap profile of the first game iteration" OFF "GPERF" OFF)
option(DISABLE_LTO "Disable link-time optimization (by default enabled in release mode)" OFF) option(DISABLE_LTO "Disable link-time optimization (by default enabled in release mode)" OFF)
option(PIE "Generate position-independent code" OFF) option(PIE "Generate position-independent code" OFF)
option(DIST "Dynamically link only glibc and SDL2" OFF) option(MACOSX_STANDALONE_APP_BUNDLE "Generate a portable app bundle to use on other devices (requires sudo)" OFF)
option(BINARY_RELEASE "Enable options for binary release" OFF)
option(NIGHTLY_BUILD "Enable options for nightly build" OFF)
option(USE_SDL1 "Use SDL1.2 instead of SDL2" OFF) option(USE_SDL1 "Use SDL1.2 instead of SDL2" OFF)
option(NONET "Disable network support" OFF) option(NONET "Disable network support" OFF)
cmake_dependent_option(DISABLE_TCP "Disable TCP multiplayer option" OFF "NOT NONET" ON) cmake_dependent_option(DISABLE_TCP "Disable TCP multiplayer option" OFF "NOT NONET" ON)
@ -129,20 +127,6 @@ if(NONET)
set(PACKET_ENCRYPTION OFF) set(PACKET_ENCRYPTION OFF)
endif() endif()
if(BINARY_RELEASE OR CMAKE_BUILD_TYPE STREQUAL "Release")
set(BINARY_RELEASE ON)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
set(DIST ON)
set(CPACK ON)
endif()
if(NIGHTLY_BUILD OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
set(NIGHTLY_BUILD ON)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "")
set(DIST ON)
set(CPACK ON)
endif()
find_program(CCACHE_PROGRAM ccache) find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM) if(CCACHE_PROGRAM)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
@ -975,7 +959,7 @@ if(APPLE)
install (TARGETS ${BIN_TARGET} DESTINATION ./) install (TARGETS ${BIN_TARGET} DESTINATION ./)
if(DIST) if(MACOSX_STANDALONE_APP_BUNDLE)
install(CODE " install(CODE "
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(${CMAKE_BINARY_DIR}/${MACOSX_BUNDLE_BUNDLE_NAME}.app \"\" \"\") fixup_bundle(${CMAKE_BINARY_DIR}/${MACOSX_BUNDLE_BUNDLE_NAME}.app \"\" \"\")

4
CMakeSettings.json
Unescape View File

@ -38,7 +38,7 @@
"configurationType": "Release", "configurationType": "Release",
"buildRoot": "${workspaceRoot}\\build\\${name}", "buildRoot": "${workspaceRoot}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "-DBINARY_RELEASE=ON", "cmakeCommandArgs": "-DCPACK=ON",
"inheritEnvironments": [ "msvc_x64" ], "inheritEnvironments": [ "msvc_x64" ],
"intelliSenseMode": "windows-msvc-x64", "intelliSenseMode": "windows-msvc-x64",
"enableClangTidyCodeAnalysis": true "enableClangTidyCodeAnalysis": true
@ -70,7 +70,7 @@
"configurationType": "Release", "configurationType": "Release",
"buildRoot": "${workspaceRoot}\\build\\${name}", "buildRoot": "${workspaceRoot}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "-DBINARY_RELEASE=ON", "cmakeCommandArgs": "-DCPACK=ON",
"inheritEnvironments": [ "msvc_x86" ], "inheritEnvironments": [ "msvc_x86" ],
"intelliSenseMode": "windows-msvc-x86", "intelliSenseMode": "windows-msvc-x86",
"enableClangTidyCodeAnalysis": true "enableClangTidyCodeAnalysis": true

2
Packaging/amiga/Dockerfile
Unescape View File

@ -6,6 +6,6 @@ COPY Packaging/amiga/prep.sh /devilutionx-deps-build/prep.sh
RUN cd /devilutionx-deps-build && ./prep.sh RUN cd /devilutionx-deps-build && ./prep.sh
CMD PKG_CONFIG_PATH=/opt/m68k-amigaos/usr/lib/pkgconfig/:/opt/m68k-amigaos/usr/share/pkgconfig/ \ CMD PKG_CONFIG_PATH=/opt/m68k-amigaos/usr/lib/pkgconfig/:/opt/m68k-amigaos/usr/share/pkgconfig/ \
cmake -S. -Bbuild-amiga -DBINARY_RELEASE=ON -DM68K_CPU=68040 -DM68K_FPU=hard \ cmake -S. -Bbuild-amiga -DCMAKE_BUILD_TYPE=Release -DCPACK=ON -DM68K_CPU=68040 -DM68K_FPU=hard \
-DM68K_COMMON="-s -ffast-math -O3 -noixemul -D__BIG_ENDIAN__ -D__AMIGA__ -fpermissive" && \ -DM68K_COMMON="-s -ffast-math -O3 -noixemul -D__BIG_ENDIAN__ -D__AMIGA__ -fpermissive" && \
cmake --build build-amiga -j $(nproc) cmake --build build-amiga -j $(nproc)

2
Packaging/switch/build.sh
Unescape View File

@ -18,7 +18,7 @@ build() {
mkdir -p ../../build mkdir -p ../../build
cd ../../build cd ../../build
rm -f CMakeCache.txt rm -f CMakeCache.txt
DEVKITPRO="$DEVKITPRO" cmake .. -DBINARY_RELEASE=ON \ DEVKITPRO="$DEVKITPRO" cmake .. -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TOOLCHAIN_FILE=../CMake/switch/devkita64-libnx.cmake -DCMAKE_TOOLCHAIN_FILE=../CMake/switch/devkita64-libnx.cmake
DEVKITPRO="$DEVKITPRO" make -j "$(getconf _NPROCESSORS_ONLN)" DEVKITPRO="$DEVKITPRO" make -j "$(getconf _NPROCESSORS_ONLN)"
cd - cd -

2
appveyor.yml
Unescape View File

@ -12,7 +12,7 @@ install:
- cd %APPVEYOR_BUILD_FOLDER% - cd %APPVEYOR_BUILD_FOLDER%
before_build: before_build:
- cmake -G "Visual Studio 17 2022" -A x64 -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake . - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake .
build: build:
project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln

Write Preview
Loading…
Cancel
Save