diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index 27ce89965..2a65040da 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -39,12 +39,17 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=ON + -DBUILD_TESTS=OFF ninja } check() { cd "$_rootdir/build-emscripten" + + # So tests are not even built (takes AGES) when the user doesn't want to + cmake . -DBUILD_TESTS=ON + ninja + CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest } diff --git a/package/archlinux/PKGBUILD-emscripten-noopt b/package/archlinux/PKGBUILD-emscripten-noopt deleted file mode 100644 index 41f2db6ea..000000000 --- a/package/archlinux/PKGBUILD-emscripten-noopt +++ /dev/null @@ -1,56 +0,0 @@ -# Author: mosra -pkgname=emscripten-magnum -pkgver=dev.noopt -pkgrel=1 -pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine (Emscripten, w/o optimizations)" -arch=('any') -url="http://magnum.graphics" -license=('MIT') -depends=('emscripten-corrade') -makedepends=('cmake' 'emscripten' 'corrade' 'ninja') -options=('!strip' '!buildflags') - -_rootdir=$startdir/../../ - -build() { - if [ ! -d "$_rootdir/build-emscripten-noopt" ] ; then - mkdir "$_rootdir/build-emscripten-noopt" - cd "$_rootdir/build-emscripten-noopt" - - cmake .. \ - -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \ - -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system \ - -G Ninja - fi - - cd "$_rootdir/build-emscripten-noopt" - - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ - -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten \ - -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O1" \ - -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \ - -DWITH_AUDIO=ON \ - -DWITH_SDL2APPLICATION=ON \ - -WDITH_WINDOWLESSEGLAPPLICATION=ON \ - -DWITH_MAGNUMFONT=ON \ - -DWITH_OBJIMPORTER=ON \ - -DWITH_TGAIMAGECONVERTER=ON \ - -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON \ - -DWITH_MAGNUMINFO=ON \ - -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=ON - ninja -} - -check() { - cd "$_rootdir/build-emscripten-noopt" - CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest -} - -package() { - cd "$_rootdir/build-emscripten-noopt" - DESTDIR="$pkgdir/" ninja install -} diff --git a/package/archlinux/PKGBUILD-emscripten-noopt-webgl2 b/package/archlinux/PKGBUILD-emscripten-noopt-webgl2 deleted file mode 100644 index af8cec677..000000000 --- a/package/archlinux/PKGBUILD-emscripten-noopt-webgl2 +++ /dev/null @@ -1,57 +0,0 @@ -# Author: mosra -pkgname=emscripten-magnum -pkgver=dev.noopt.webgl2 -pkgrel=1 -pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine (Emscripten WebGL 2.0, w/o optimizations)" -arch=('any') -url="http://magnum.graphics" -license=('MIT') -depends=('emscripten-corrade') -makedepends=('cmake' 'emscripten' 'corrade' 'ninja') -options=('!strip' '!buildflags') - -_rootdir=$startdir/../../ - -build() { - if [ ! -d "$_rootdir/build-emscripten-noopt-webgl2" ] ; then - mkdir "$_rootdir/build-emscripten-noopt-webgl2" - cd "$_rootdir/build-emscripten-noopt-webgl2" - - cmake .. \ - -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \ - -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system \ - -G Ninja - fi - - cd "$_rootdir/build-emscripten-noopt-webgl2" - - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ - -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten-webgl2 \ - -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O1" \ - -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \ - -DTARGET_GLES2=OFF \ - -DWITH_AUDIO=ON \ - -DWITH_SDL2APPLICATION=ON \ - -WDITH_WINDOWLESSEGLAPPLICATION=ON \ - -DWITH_MAGNUMFONT=ON \ - -DWITH_OBJIMPORTER=ON \ - -DWITH_TGAIMAGECONVERTER=ON \ - -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON \ - -DWITH_MAGNUMINFO=ON \ - -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=ON - ninja -} - -check() { - cd "$_rootdir/build-emscripten-noopt-webgl2" - CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest -} - -package() { - cd "$_rootdir/build-emscripten-noopt-webgl2" - DESTDIR="$pkgdir/" ninja install -} diff --git a/package/archlinux/PKGBUILD-emscripten-wasm b/package/archlinux/PKGBUILD-emscripten-wasm index 3bc6adc29..bf4e9d2b6 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm +++ b/package/archlinux/PKGBUILD-emscripten-wasm @@ -39,12 +39,17 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=ON + -DBUILD_TESTS=OFF ninja } check() { cd "$_rootdir/build-emscripten-wasm" + + # So tests are not even built (takes AGES) when the user doesn't want to + cmake . -DBUILD_TESTS=ON + ninja + CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest } diff --git a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 index 0c76de977..50ee2a420 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 @@ -40,12 +40,17 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=ON + -DBUILD_TESTS=OFF ninja } check() { cd "$_rootdir/build-emscripten-wasm-webgl2" + + # So tests are not even built (takes AGES) when the user doesn't want to + cmake . -DBUILD_TESTS=ON + ninja + CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest } diff --git a/package/archlinux/PKGBUILD-emscripten-webgl2 b/package/archlinux/PKGBUILD-emscripten-webgl2 index cdc3bbbd5..a412f6ee6 100644 --- a/package/archlinux/PKGBUILD-emscripten-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-webgl2 @@ -40,12 +40,17 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=ON + -DBUILD_TESTS=OFF ninja } check() { cd "$_rootdir/build-emscripten-webgl2" + + # So tests are not even built (takes AGES) when the user doesn't want to + cmake . -DBUILD_TESTS=ON + ninja + CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest }