Browse Source

Testing with docker instead.

main
offa 7 years ago
parent
commit
08f1a7bcc5
2 changed files with 29 additions and 23 deletions
  1. +6
    -0
      .travis.yml
  2. +23
    -23
      script/ci_install.sh

+ 6
- 0
.travis.yml View File

@@ -11,6 +11,9 @@ cache:
directories:
- ${DEPENDENCY_DIR}

services:
- docker


matrix:
include:
@@ -31,6 +34,9 @@ matrix:
- libc++-dev
sources: *sources

before_install:
- docker pull jorj/clang5_qt5
- docker run jorj/clang5_qt5 /bin/bash -c "${CXX} --version; cmake --version"

install:
- script/ci_install.sh

+ 23
- 23
script/ci_install.sh View File

@@ -24,29 +24,29 @@ cd ${DEPENDENCY_DIR}


# --- LibC++
if [[ "${CXX}" = clang* ]]
then
if [[ ! -d "${DEPENDENCY_DIR}/llvm-source" ]]
then
LLVM_RELEASE=release_50
git clone --depth=1 -b ${LLVM_RELEASE} https://github.com/llvm-mirror/llvm.git llvm-source
git clone --depth=1 -b ${LLVM_RELEASE} https://github.com/llvm-mirror/libcxx.git llvm-source/projects/libcxx
git clone --depth=1 -b ${LLVM_RELEASE} https://github.com/llvm-mirror/libcxxabi.git llvm-source/projects/libcxxabi
fi
mkdir -p build && cd build
cmake -DCMAKE_C_COMPILER=${CC} \
-DCMAKE_CXX_COMPILER=${CXX} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIBCXX_ABI_UNSTABLE=ON \
../llvm-source
make cxx -j4
sudo make install-cxxabi install-cxx
rm -rf *
fi
#if [[ "${CXX}" = clang* ]]
#then
# if [[ ! -d "${DEPENDENCY_DIR}/llvm-source" ]]
# then
# LLVM_RELEASE=release_50
# git clone --depth=1 -b ${LLVM_RELEASE} https://github.com/llvm-mirror/llvm.git llvm-source
# git clone --depth=1 -b ${LLVM_RELEASE} https://github.com/llvm-mirror/libcxx.git llvm-source/projects/libcxx
# git clone --depth=1 -b ${LLVM_RELEASE} https://github.com/llvm-mirror/libcxxabi.git llvm-source/projects/libcxxabi
# fi
#
# mkdir -p build && cd build
#
# cmake -DCMAKE_C_COMPILER=${CC} \
# -DCMAKE_CXX_COMPILER=${CXX} \
# -DCMAKE_BUILD_TYPE=RelWithDebInfo \
# -DCMAKE_INSTALL_PREFIX=/usr \
# -DLIBCXX_ABI_UNSTABLE=ON \
# ../llvm-source
# make cxx -j4
#
# sudo make install-cxxabi install-cxx
# rm -rf *
#fi


cd ${BUILD_DIR}

Loading…
Cancel
Save