diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-09-12 17:56:29 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-09-12 17:56:29 +0200 |
| commit | cde7423958e9c233233c79399553787cf0931714 (patch) | |
| tree | 3b3c8d2b8d13fb54da85f6f7b800400520eac2f1 /tools/travis-ci/run.sh | |
| parent | 6c157b60f2478f2b6776e5a94495103f46d9d500 (diff) | |
Travis add mingw
Diffstat (limited to 'tools/travis-ci/run.sh')
| -rwxr-xr-x | tools/travis-ci/run.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh index 67bf9af1..7d056100 100755 --- a/tools/travis-ci/run.sh +++ b/tools/travis-ci/run.sh @@ -52,9 +52,16 @@ elif [ "${TRAVIS_OS_NAME}" == "linux" ]; then if which lsb_release > /dev/null; then OPJ_OS_NAME=$(lsb_release -si)$(lsb_release -sr | sed 's/\([^0-9]*\.[0-9]*\).*/\1/') fi - if [ "${CC}" == "gcc" ]; then - OPJ_CC_VERSION=gcc$(${CC} --version | head -1 | sed 's/.*\ \([0-9.]*[0-9]\)/\1/') - elif [ "${CC}" == "clang" ]; then + if [ -z "${CC##*gcc*}" ]; then + OPJ_CC_VERSION=$(${CC} --version | head -1 | sed 's/.*\ \([0-9.]*[0-9]\)/\1/') + if [ -z "${CC##*mingw*}" ]; then + OPJ_CC_VERSION=mingw${OPJ_CC_VERSION} + # disable testing for now + export OPJ_CI_SKIP_TESTS=1 + else + OPJ_CC_VERSION=gcc${OPJ_CC_VERSION} + fi + elif [ -z "${CC##*clang*}" ]; then OPJ_CC_VERSION=clang$(${CC} --version | grep version | sed 's/.*version \([^0-9.]*[0-9.]*\).*/\1/') else echo "Compiler not supported: ${CC}"; exit 1 |