Browse Source

package/ci: build w/ deprecated APIs enabled by default.

And have a dedicated non-deprecated build instead. Because that's the
default, and that's more important to have working, especially
given the recently discovered MSVC warts in
1c80a7a6f2.
next
Vladimír Vondruš 2 years ago
parent
commit
d5ffa81fe2
  1. 2
      package/ci/appveyor-desktop-gles.bat
  2. 2
      package/ci/appveyor-desktop.bat
  3. 28
      package/ci/circleci.yml
  4. 2
      package/ci/unix-desktop-gles.sh
  5. 4
      package/ci/unix-desktop.sh

2
package/ci/appveyor-desktop-gles.bat

@ -21,7 +21,6 @@ mkdir build && cd build || exit /b
cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DCORRADE_BUILD_DEPRECATED=OFF ^
-DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^
-DCORRADE_WITH_INTERCONNECT=OFF ^
-DCORRADE_WITH_PLUGINMANAGER=ON ^
@ -39,7 +38,6 @@ mkdir build && cd build || exit /b
cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DMAGNUM_BUILD_DEPRECATED=OFF ^
-DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^
-DMAGNUM_TARGET_GLES=ON ^
-DMAGNUM_TARGET_GLES2=%TARGET_GLES2% ^

2
package/ci/appveyor-desktop.bat

@ -33,7 +33,6 @@ mkdir build && cd build || exit /b
cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DCORRADE_BUILD_DEPRECATED=OFF ^
-DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^
-DCORRADE_WITH_INTERCONNECT=OFF ^
-DCORRADE_WITH_PLUGINMANAGER=ON ^
@ -52,7 +51,6 @@ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
-DMAGNUM_BUILD_DEPRECATED=OFF ^
-DMAGNUM_BUILD_STATIC=%BUILD_STATIC% %STATIC_PLUGIN_PATH% ^
-DMAGNUM_WITH_AUDIO=OFF ^
-DMAGNUM_WITH_DEBUGTOOLS=OFF ^

28
package/ci/circleci.yml

@ -329,6 +329,29 @@ jobs:
script: unix-desktop.sh
- lcov
linux-nondeprecated:
executor: ubuntu-18_04
environment:
# STUPID yml interprets unquoted OFF as a boolean
BUILD_DEPRECATED: "OFF"
CMAKE_CXX_FLAGS: --coverage
LCOV_EXTRA_OPTS: --gcov-tool /usr/bin/gcov-4.8
PLATFORM_GL_API: GLX
# It crashes (OOM, probably) with the default setting
NINJA_JOBS: -j2
steps:
- install-base-linux:
extra: libgl1-mesa-dev libsdl2-dev libglfw3-dev
- install-gcc-4_8
- install-cmake:
version: "3.5.2"
- install-python-3_6
- install-pybind11
- install-meshoptimizer
- build:
script: unix-desktop.sh
- lcov
macos-gl:
executor: xcode-13_4
environment:
@ -384,18 +407,23 @@ workflows:
# dependencies especially for the macOS jobs that take the most credits.
jobs:
- linux-gl
- linux-nondeprecated
- linux-gles2:
requires:
- linux-gl
- linux-nondeprecated
- linux-gles3:
requires:
- linux-gl
- linux-nondeprecated
- linux-static:
requires:
- linux-gl
- linux-nondeprecated
- macos-gl:
requires:
- linux-gl
- linux-nondeprecated
- macos-gles3:
requires:
- linux-gles3

2
package/ci/unix-desktop-gles.sh

@ -9,7 +9,6 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Release \
-DCORRADE_BUILD_DEPRECATED=OFF \
-DCORRADE_WITH_INTERCONNECT=OFF \
-DCORRADE_WITH_PLUGINMANAGER=ON \
-DCORRADE_WITH_TESTSUITE=ON \
@ -26,7 +25,6 @@ cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \
-DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \
-DMAGNUM_BUILD_DEPRECATED=OFF \
-DMAGNUM_TARGET_GLES=ON \
-DMAGNUM_TARGET_GLES2=$TARGET_GLES2 \
-DMAGNUM_WITH_AUDIO=OFF \

4
package/ci/unix-desktop.sh

@ -9,7 +9,7 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Release \
-DCORRADE_BUILD_DEPRECATED=OFF \
-DMAGNUM_BUILD_DEPRECATED=$BUILD_DEPRECATED \
-DCORRADE_BUILD_STATIC=$BUILD_STATIC \
-DCORRADE_WITH_INTERCONNECT=OFF \
-DCORRADE_WITH_PLUGINMANAGER=ON \
@ -26,7 +26,7 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Release \
-DMAGNUM_BUILD_DEPRECATED=OFF \
-DMAGNUM_BUILD_DEPRECATED=$BUILD_DEPRECATED \
-DMAGNUM_BUILD_STATIC=$BUILD_STATIC \
-DMAGNUM_WITH_AUDIO=OFF \
-DMAGNUM_WITH_DEBUGTOOLS=OFF \

Loading…
Cancel
Save