Browse Source

Add debug messages for build script. Set --noconfirm on msys packages

merge-requests/365/head
Jørgen Lien Sellæg 10 years ago
parent
commit
df42e13166
  1. 3
      README.md
  2. 4
      appveyor.yml
  3. 11
      ci/compile.sh
  4. 2
      ci/update_ci.sh

3
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. ###### a lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version.
<!--<img src="https://github.com/cppit/jucipp/blob/master/docs/images/screenshot3.png"/>--> <!--<img src="https://github.com/cppit/jucipp/blob/master/docs/images/screenshot3.png"/>-->
## About ## About

4
appveyor.yml

@ -1,7 +1,9 @@
platform: platform:
- x86
- x64 - x64
environment:
MSYSTEM: MSYS
before_build: before_build:
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git

11
ci/compile.sh

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
if [ "${cmake_command}" == "" ]; then if [ "${cmake_command}" == "" ]; then
if [ $APPVEYOR ]; then if [ "$APPVEYOR" != "" ]; then
if [ "$PLATFORM" == "x64" ]; then if [ "$PLATFORM" == "x64" ]; then
mingw="mingw64" mingw="mingw64"
else else
mingw="mingw32" mingw="mingw32"
fi 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 else
cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .." cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
fi fi
@ -17,7 +17,8 @@ if [ "${make_command}" == "" ]; then
make_command="make -j 2" make_command="make -j 2"
fi fi
cd jucipp || exit cd jucipp || (echo "Can't cd into jucipp"; return 1)
mkdir -p build && cd build || exit git submodule update --init --recursive
sh -c "${cmake_command}" || exit 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}" exec sh -c "${make_command}"

2
ci/update_ci.sh

@ -32,7 +32,7 @@ function windows () {
if [ "$PLATFORM" == "x86" ]; then if [ "$PLATFORM" == "x86" ]; then
arch=i686 arch=i686
fi 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 if [ "$TRAVIS_OS_NAME" == "" ]; then

Loading…
Cancel
Save