From 2cd6e425c204d60f5291090ab32e99975af9ccb5 Mon Sep 17 00:00:00 2001 From: Squareys Date: Tue, 27 Aug 2019 17:34:15 +0200 Subject: [PATCH] package/ci: download basis_universal and pass BASISU_DIR Signed-off-by: Squareys --- package/ci/appveyor-desktop-mingw.bat | 2 +- package/ci/appveyor-desktop.bat | 2 +- package/ci/appveyor-rt.bat | 2 +- package/ci/appveyor.yml | 7 +++++++ package/ci/travis-android-arm.sh | 2 +- package/ci/travis-desktop.sh | 2 +- package/ci/travis-emscripten.sh | 2 +- package/ci/travis-ios-simulator.sh | 2 +- package/ci/travis.yml | 3 +++ 9 files changed, 17 insertions(+), 7 deletions(-) diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat index 3c6ab01c7..29bd70387 100644 --- a/package/ci/appveyor-desktop-mingw.bat +++ b/package/ci/appveyor-desktop-mingw.bat @@ -67,7 +67,7 @@ cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/openal;%APPVEYOR_BUILD_FOLDER%/devil ^ -DWITH_ASSIMPIMPORTER=OFF ^ - -DWITH_BASISIMPORTER=ON ^ + -DWITH_BASISIMPORTER=ON -DBASISU_DIR=%APPVEYOR_BUILD_FOLDER%/basis_universal ^ -DWITH_DDSIMPORTER=ON ^ -DWITH_DEVILIMAGEIMPORTER=ON ^ -DWITH_DRFLACAUDIOIMPORTER=ON ^ diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index 1dbea88a8..b0ad43f86 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -69,7 +69,7 @@ cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/openal;%APPVEYOR_BUILD_FOLDER%/devil;C:/Tools/vcpkg/installed/x64-windows ^ -DWITH_ASSIMPIMPORTER=OFF ^ - -DWITH_BASISIMPORTER=OFF ^ + -DWITH_BASISIMPORTER=OFF -DBASISU_DIR=%APPVEYOR_BUILD_FOLDER%/basis_universal ^ -DWITH_DDSIMPORTER=ON ^ -DWITH_DEVILIMAGEIMPORTER=ON ^ -DWITH_DRFLACAUDIOIMPORTER=ON ^ diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat index 997884cb5..69494019c 100644 --- a/package/ci/appveyor-rt.bat +++ b/package/ci/appveyor-rt.bat @@ -65,7 +65,7 @@ cmake .. ^ -DCMAKE_SYSTEM_VERSION=10.0 ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/deps ^ -DWITH_ASSIMPIMPORTER=OFF ^ - -DWITH_BASISIMPORTER=ON ^ + -DWITH_BASISIMPORTER=ON -DBASISU_DIR=%APPVEYOR_BUILD_FOLDER%/basis_universal ^ -DWITH_DDSIMPORTER=ON ^ -DWITH_DEVILIMAGEIMPORTER=OFF ^ -DWITH_DRFLACAUDIOIMPORTER=OFF ^ diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index b8eafc2b3..97d58a8af 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -22,6 +22,8 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 APPVEYOR_JOB_NAME: windows-rt-msvc2017 + BASIS_VERSION: 600232075851c2fa6bd23f7180434aca7814c93a + notifications: - provider: Webhook url: https://webhooks.gitter.im/e/415ae90928ba0dbd3df4 @@ -43,6 +45,10 @@ install: - 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 - IF NOT "%TARGET%" == "rt" mkdir devil && cd devil && 7z x ..\DevIL-SDK-x64-1.7.8.zip && mkdir lib && move *.lib lib\ && cd .. +# Basis Universal +- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\basis_universal-%BASIS_VERSION%.zip appveyor DownloadFile https://github.com/BinomialLLC/basis_universal/archive/%BASIS_VERSION%.zip +- mkdir basis_universal && cd basis_universal && 7z x ..\basis_universal-%BASIS_VERSION%.zip && mv basis_universal-%BASIS_VERSION% basis_universal + 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 @@ -52,3 +58,4 @@ cache: - openal-soft-1.17.2-bin.zip -> package/ci/appveyor-cache-reset.txt - libjpeg-turbo-1.5.0.tar.gz -> package/ci/appveyor-cache-reset.txt - DevIL-SDK-x64-1.7.8.zip -> package/ci/appveyor-cache-reset.txt +- basis_universal-%BASIS_VERSION%.zip -> package/ci/appveyor-cache-reset.txt diff --git a/package/ci/travis-android-arm.sh b/package/ci/travis-android-arm.sh index a0e281291..e27102036 100755 --- a/package/ci/travis-android-arm.sh +++ b/package/ci/travis-android-arm.sh @@ -79,7 +79,7 @@ cmake .. \ -DCMAKE_PREFIX_PATH=$HOME/deps \ -DCMAKE_FIND_ROOT_PATH=$HOME/deps \ -DWITH_ASSIMPIMPORTER=OFF \ - -DWITH_BASISIMPORTER=ON \ + -DWITH_BASISIMPORTER=ON -DBASISU_DIR=$HOME/basis_universal \ -DWITH_DDSIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=OFF \ -DWITH_DRMP3AUDIOIMPORTER=OFF \ diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index 045bfd908..91a09678b 100755 --- a/package/ci/travis-desktop.sh +++ b/package/ci/travis-desktop.sh @@ -47,7 +47,7 @@ cmake .. \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Debug \ -DWITH_ASSIMPIMPORTER=ON \ - -DWITH_BASISIMPORTER=ON \ + -DWITH_BASISIMPORTER=ON -DBASISU_DIR=$HOME/basis_universal \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh index 420d8c97d..8210a89ab 100755 --- a/package/ci/travis-emscripten.sh +++ b/package/ci/travis-emscripten.sh @@ -85,7 +85,7 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_FIND_ROOT_PATH=$HOME/deps \ -DWITH_ASSIMPIMPORTER=OFF \ - -DWITH_BASISIMPORTER=ON \ + -DWITH_BASISIMPORTER=ON -DBASISU_DIR=$HOME/basis_universal \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=OFF \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh index 137839056..eebf25201 100755 --- a/package/ci/travis-ios-simulator.sh +++ b/package/ci/travis-ios-simulator.sh @@ -70,7 +70,7 @@ cmake .. \ -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DWITH_ASSIMPIMPORTER=OFF \ - -DWITH_BASISIMPORTER=ON \ + -DWITH_BASISIMPORTER=ON -DBASISU_DIR=$HOME/basis_universal \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=OFF \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 447abf679..6364d5877 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -138,6 +138,9 @@ install: # FAAD2, HarfBuzz, Assimp, DevIL - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "desktop" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install faad2 harfbuzz assimp devil; fi +# Basis Universal +- BASIS_VERSION=600232075851c2fa6bd23f7180434aca7814c93a wget -nc https://github.com/BinomialLLC/basis_universal/archive/${BASIS_VERSION}.zip && unzip -q basis_universal-$BASIS_VERSION; mv basis_universal-$BASIS_VERSION basis_universal; fi + script: - if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then ./package/ci/travis-desktop.sh; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ]; then ./package/ci/travis-android-arm.sh; fi