diff --git a/README.md b/README.md index b74dcb3..7ad0d41 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# juCi++ [![Build Status](https://travis-ci.org/cppit/jucipp.svg?branch=master)](https://travis-ci.org/cppit/jucipp) +# juCi++ [![Build Status](https://travis-ci.org/cppit/jucipp.svg?branch=master)](https://travis-ci.org/cppit/jucipp) [![Build status](https://ci.appveyor.com/api/projects/status/07jsrg16a5bcpods/branch/master?svg=true)](https://ci.appveyor.com/project/zalox/jucipp/branch/master) + ###### a lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version. ## About diff --git a/appveyor.yml b/appveyor.yml index 55abb99..264cbef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,8 @@ platform: - - x86 - x64 + +environment: + MSYSTEM: MSYS before_build: - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman diff --git a/ci/compile.sh b/ci/compile.sh index aac3547..e2bafd6 100755 --- a/ci/compile.sh +++ b/ci/compile.sh @@ -1,13 +1,13 @@ #!/bin/bash if [ "${cmake_command}" == "" ]; then - if [ $APPVEYOR ]; then + if [ "$APPVEYOR" != "" ]; then if [ "$PLATFORM" == "x64" ]; then mingw="mingw64" else mingw="mingw32" fi - cmake_command="cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} .. -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .." + cmake_command="cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .." else cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .." fi @@ -17,7 +17,8 @@ if [ "${make_command}" == "" ]; then make_command="make -j 2" fi -cd jucipp || exit -mkdir -p build && cd build || exit -sh -c "${cmake_command}" || exit +cd jucipp || (echo "Can't cd into jucipp"; return 1) +git submodule update --init --recursive +mkdir -p build && cd build || (echo "Error making build directory"; return 1) +sh -c "${cmake_command}" || (echo "Cmake configuration failed"; return 1) exec sh -c "${make_command}" \ No newline at end of file diff --git a/ci/update_ci.sh b/ci/update_ci.sh index 18cd506..795ac87 100755 --- a/ci/update_ci.sh +++ b/ci/update_ci.sh @@ -32,7 +32,7 @@ function windows () { if [ "$PLATFORM" == "x86" ]; then arch=i686 fi - sh -c "pacman -S git mingw-w64-${arch}-cmake make mingw-w64-${arch}-toolchain mingw-w64-${arch}-clang mingw-w64-${arch}-gtkmm3 mingw-w64-${arch}-gtksourceviewmm3 mingw-w64-${arch}-boost mingw-w64-${arch}-aspell mingw-w64-${arch}-aspell-en" + sh -c "pacman -S --noconfirm git mingw-w64-${arch}-cmake make mingw-w64-${arch}-toolchain mingw-w64-${arch}-clang mingw-w64-${arch}-gtkmm3 mingw-w64-${arch}-gtksourceviewmm3 mingw-w64-${arch}-boost mingw-w64-${arch}-aspell mingw-w64-${arch}-aspell-en" } if [ "$TRAVIS_OS_NAME" == "" ]; then