package/ci: we don't need to build for various GL editions anymore.

The code is fully independent of target GL platform.
mosra · Mar 7, 2019 · e6f8792 · e6f8792
1 parent c16a028
commit e6f8792
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 318 deletions.
diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat
diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat
@@ -45,21 +45,22 @@ cmake .. ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/openal ^
     -DWITH_AUDIO=ON ^
     -DWITH_DEBUGTOOLS=ON ^
+    -DWITH_GL=OFF ^
     -DWITH_MESHTOOLS=OFF ^
     -DWITH_PRIMITIVES=OFF ^
     -DWITH_SCENEGRAPH=OFF ^
     -DWITH_SHADERS=OFF ^
     -DWITH_SHAPES=OFF ^
     -DWITH_TEXT=ON ^
     -DWITH_TEXTURETOOLS=ON ^
-    -DWITH_OPENGLTESTER=ON ^
     -DWITH_ANYIMAGEIMPORTER=ON ^
     -G Ninja || exit /b
 cmake --build . || exit /b
 cmake --build . --target install || exit /b
 cd .. && cd ..
 
-rem Build
+rem Build. BUILD_GL_TESTS is enabled just to be sure, it should not be needed
+rem by any plugin.
 mkdir build && cd build || exit /b
 cmake .. ^
     -DCMAKE_CXX_FLAGS="--coverage" ^
@@ -93,7 +94,7 @@ cmake --build . --target install || exit /b
 
 rem Test
 set CORRADE_TEST_COLOR=ON
-ctest -V -E GLTest || exit /b
+ctest -V || exit /b
 
 rem Coverage upload
 set PATH=C:\msys64\usr\bin;%PATH%

diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat
@@ -72,21 +72,22 @@ cmake .. ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/openal ^
     -DWITH_AUDIO=ON ^
     -DWITH_DEBUGTOOLS=ON ^
+    -DWITH_GL=OFF ^
     -DWITH_MESHTOOLS=OFF ^
     -DWITH_PRIMITIVES=OFF ^
     -DWITH_SCENEGRAPH=OFF ^
     -DWITH_SHADERS=OFF ^
     -DWITH_SHAPES=OFF ^
     -DWITH_TEXT=ON ^
     -DWITH_TEXTURETOOLS=ON ^
-    -DWITH_OPENGLTESTER=ON ^
     -DWITH_ANYIMAGEIMPORTER=ON ^
     -G Ninja || exit /b
 cmake --build . || exit /b
 cmake --build . --target install || exit /b
 cd .. && cd ..
 
-rem Build
+rem Build. BUILD_GL_TESTS is enabled just to be sure, it should not be needed
+rem by any plugin.
 mkdir build && cd build || exit /b
 cmake .. ^
     -DCMAKE_BUILD_TYPE=Debug ^
@@ -119,4 +120,4 @@ cmake --build . --target install || exit /b
 
 rem Test
 set CORRADE_TEST_COLOR=ON
-ctest -V -E GLTest || exit /b
+ctest -V || exit /b
diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat
@@ -55,6 +55,7 @@ cmake .. ^
     -DOPENGLES3_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/angle/include ^
     -DWITH_AUDIO=OFF ^
     -DWITH_DEBUGTOOLS=OFF ^
+    -DWITH_GL=OFF ^
     -DWITH_MESHTOOLS=OFF ^
     -DWITH_PRIMITIVES=OFF ^
     -DWITH_SCENEGRAPH=OFF ^
@@ -63,13 +64,13 @@ cmake .. ^
     -DWITH_TEXT=ON ^
     -DWITH_TEXTURETOOLS=ON ^
     -DWITH_ANYIMAGEIMPORTER=ON ^
-    -DTARGET_GLES2=%TARGET_GLES2% ^
     -DBUILD_STATIC=ON ^
     -G "%GENERATOR%" -A x64 || exit /b
 cmake --build . --config Release --target install -- /m /v:m || exit /b
 cd .. && cd ..
 
-rem Crosscompile
+rem Crosscompile. BUILD_GL_TESTS is enabled just to be sure, it should not be
+rem needed by any plugin.
 mkdir build-rt && cd build-rt || exit /b
 cmake .. ^
     -DCMAKE_BUILD_TYPE=Release ^

diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml
@@ -5,47 +5,21 @@ environment:
   - TARGET: desktop
     COMPILER: msvc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-gl-msvc2015
+    APPVEYOR_JOB_NAME: windows-msvc2015
   - TARGET: desktop
     COMPILER: msvc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-gl-msvc2017
+    APPVEYOR_JOB_NAME: windows-msvc2017
   - TARGET: desktop
     COMPILER: mingw
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-gl-mingw
-  - TARGET: desktop-gles
-    TARGET_GLES2: ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-gles2-msvc2015
-  - TARGET: desktop-gles
-    TARGET_GLES2: ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-gles2-msvc2017
-  - TARGET: desktop-gles
-    TARGET_GLES2: OFF
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-gles3-msvc2015
-  - TARGET: desktop-gles
-    TARGET_GLES2: OFF
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-gles3-msvc2017
-  - TARGET: rt
-    TARGET_GLES2: ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-rt-gles2-msvc2015
-  - TARGET: rt
-    TARGET_GLES2: ON
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-rt-gles2-msvc2017
+    APPVEYOR_JOB_NAME: windows-mingw
   - TARGET: rt
-    TARGET_GLES2: OFF
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-rt-gles3-msvc2015
+    APPVEYOR_JOB_NAME: windows-rt-msvc2015
   - TARGET: rt
-    TARGET_GLES2: OFF
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-rt-gles3-msvc2017
+    APPVEYOR_JOB_NAME: windows-rt-msvc2017
 
 notifications:
 - provider: Webhook
@@ -63,7 +37,6 @@ install:
 - IF NOT "%TARGET%" == "rt" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\openal-soft-1.17.2-bin.zip appveyor DownloadFile http://kcat.strangesoft.net/openal-binaries/openal-soft-1.17.2-bin.zip
 - IF NOT "%TARGET%" == "rt" 7z x openal-soft-1.17.2-bin.zip && ren openal-soft-1.17.2-bin openal && echo [General] > %APPDATA%/alsoft.ini & echo drivers=null >> %APPDATA%/alsoft.ini
 - IF "%TARGET%" == "desktop" ren openal\bin\Win64\soft_oal.dll OpenAL32.dll
-- IF "%TARGET%" == "desktop-gles" ren openal\bin\Win64\soft_oal.dll OpenAL32.dll
 
 # DevIL
 - IF NOT "%TARGET%" == "rt" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\DevIL-SDK-x64-1.7.8.zip appveyor DownloadFile http://downloads.sourceforge.net/openil/DevIL-SDK-x64-1.7.8.zip
@@ -72,7 +45,6 @@ install:
 build_script:
 - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "msvc" call package\ci\appveyor-desktop.bat
 - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" call package\ci\appveyor-desktop-mingw.bat
-- IF "%TARGET%" == "desktop-gles" call package\ci\appveyor-desktop-gles.bat
 - IF "%TARGET%" == "rt" call package\ci\appveyor-rt.bat
 
 cache:

diff --git a/package/ci/travis-android-arm.sh b/package/ci/travis-android-arm.sh
@@ -52,21 +52,21 @@ cmake .. \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_AUDIO=OFF \
     -DWITH_DEBUGTOOLS=ON \
+    -DWITH_GL=OFF \
     -DWITH_MESHTOOLS=OFF \
     -DWITH_PRIMITIVES=OFF \
     -DWITH_SCENEGRAPH=OFF \
     -DWITH_SHADERS=OFF \
     -DWITH_SHAPES=OFF \
     -DWITH_TEXT=ON \
     -DWITH_TEXTURETOOLS=ON \
-    -DWITH_OPENGLTESTER=ON \
     -DWITH_ANYIMAGEIMPORTER=ON \
-    -DTARGET_GLES2=$TARGET_GLES2 \
     -G Ninja
 ninja install
 cd ../..
 
-# Crosscompile
+# Crosscompile. BUILD_GL_TESTS is enabled just to be sure, it should not be
+# needed by any plugin.
 mkdir build-android-arm && cd build-android-arm
 cmake .. \
     -DCMAKE_ANDROID_NDK=$TRAVIS_BUILD_DIR/android-ndk-r16b \
@@ -107,4 +107,4 @@ ninja -j4
 echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
 emulator -avd test -no-audio -no-window &
 android-wait-for-emulator
-CORRADE_TEST_COLOR=ON ctest -V -E GLTest
+CORRADE_TEST_COLOR=ON ctest -V
diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh