From cfe860d8ddb89c53eb2c231292c8de6693bfa393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Thu, 17 Sep 2020 14:27:30 -0600 Subject: [PATCH] Install with XEUS on all platforms Add the necessary dependencies. --- .gitlab-ci.yml | 2 +- appveyor.yml | 2 +- ci/azure_install_macos.sh | 2 +- ci/build.xsh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 295ffe1eec..ba0e534f57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,7 +222,7 @@ build.xsh: - export PATH="$HOME/conda_root/bin:$PATH" - sudo apt-get update - sudo apt-get install -yq --no-install-recommends zlib1g-dev git - - conda install -c conda-forge llvmdev=9.0.1 toml + - conda install -c conda-forge llvmdev=9.0.1 toml pytest jupyter xeus xtl nlohmann_json cppzmq jupyter_kernel_test - export LFORTRAN_CMAKE_GENERATOR="Unix Makefiles" - export WIN=0 - export MACOS=0 diff --git a/appveyor.yml b/appveyor.yml index 00c7fc41b1..e680680f4e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ build_script: - call conda config --set always_yes yes --set changeps1 no - call conda info -a - call conda update -q conda -- call conda install -c conda-forge python=3.7 re2c m2-bison xonsh scikit-build llvmdev=8.0.0 +- call conda install -c conda-forge python=3.7 re2c m2-bison xonsh scikit-build llvmdev=8.0.0 jupyter xeus xtl nlohmann_json cppzmq jupyter_kernel_test pytest - set CONDA_PREFIX=C:\\Miniconda37-x64 - set WIN=1 - set MACOS=0 diff --git a/ci/azure_install_macos.sh b/ci/azure_install_macos.sh index 0004db6f31..39f84f4240 100755 --- a/ci/azure_install_macos.sh +++ b/ci/azure_install_macos.sh @@ -5,7 +5,7 @@ set -ex conda config --set always_yes yes --set changeps1 no conda info -a conda update -q conda -conda install -c conda-forge python=3.7 re2c bison m4 xonsh scikit-build llvmdev=9.0.1 toml cmake=3.17.0 +conda install -c conda-forge python=3.7 re2c bison m4 xonsh scikit-build llvmdev=9.0.1 toml cmake=3.17.0 jupyter pytest xeus xtl nlohmann_json cppzmq jupyter_kernel_test export MACOSX_DEPLOYMENT_TARGET="10.9" export CONDA_PREFIX=/usr/local/miniconda export LFORTRAN_CMAKE_GENERATOR="Unix Makefiles" diff --git a/ci/build.xsh b/ci/build.xsh index f7bf600300..6c7d4432f7 100755 --- a/ci/build.xsh +++ b/ci/build.xsh @@ -50,7 +50,7 @@ cd test-bld # compiled in Release mode and we get link failures if we mix and match build # modes: BUILD_TYPE = "Release" -cmake -G $LFORTRAN_CMAKE_GENERATOR -DCMAKE_VERBOSE_MAKEFILE=ON -DWITH_LLVM=yes -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=@(BUILD_TYPE) .. +cmake -G $LFORTRAN_CMAKE_GENERATOR -DCMAKE_VERBOSE_MAKEFILE=ON -DWITH_LLVM=yes -DWITH_XEUS=yes -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=@(BUILD_TYPE) .. cmake --build . ./src/lfortran/tests/test_llvm -s ./src/bin/lfortran < ../src/bin/example_input.txt