Kouhei Sutou
null+****@clear*****
Sun Nov 2 20:48:17 JST 2014
Kouhei Sutou 2014-11-02 20:48:17 +0900 (Sun, 02 Nov 2014) New Revision: 9a80ce18d8fb67dc1efa47e6d92376d1663968f0 https://github.com/groonga/groonga/commit/9a80ce18d8fb67dc1efa47e6d92376d1663968f0 Message: travis: try to use OS X References: * http://docs.travis-ci.com/user/multi-os/ * http://docs.travis-ci.com/user/osx-ci-environment/ Added files: tools/travis-install.sh Modified files: .travis.yml tools/travis-before-script.sh Modified: .travis.yml (+4 -2) =================================================================== --- .travis.yml 2014-11-02 19:47:33 +0900 (47afe43) +++ .travis.yml 2014-11-02 20:48:17 +0900 (0d07a40) @@ -1,6 +1,9 @@ notifications: recipients: - groonga-commit �� lists.sourceforge.jp +os: + - linux + - osx language: cpp compiler: - gcc @@ -11,8 +14,7 @@ env: - BUILD_TOOL=autotools CFLAGS=-funsigned-char CXXFLAGS=-funsigned-char - BUILD_TOOL=cmake install: - - curl --silent --location https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh - - sudo apt-get install -qq -y autotools-dev zlib1g-dev libmsgpack-dev libevent-dev libmecab-dev mecab-naist-jdic cmake + - toosl/travis-install.sh before_script: - rvm use 1.9.3 - tools/travis-before-script.sh Modified: tools/travis-before-script.sh (+12 -1) =================================================================== --- tools/travis-before-script.sh 2014-11-02 19:47:33 +0900 (943f41b) +++ tools/travis-before-script.sh 2014-11-02 20:48:17 +0900 (c35d99f) @@ -29,5 +29,16 @@ case "${BUILD_TOOL}" in ;; esac -n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" +case "$(uname)" in + Linux) + n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" + ;; + Darwin) + n_processors="$(/usr/sbin/sysctl -n hw.ncpu)" + ;; + *) + n_processors="1" + ;; +esac + make -j${n_processors} > /dev/null Added: tools/travis-install.sh (+25 -0) 100755 =================================================================== --- /dev/null +++ tools/travis-install.sh 2014-11-02 20:48:17 +0900 (692e266) @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +case "${TRAVIS_OS_NAME}" in + linux) + curl --silent --location https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh + sudo apt-get install -qq -y \ + autotools-dev \ + zlib1g-dev \ + libmsgpack-dev \ + libevent-dev \ + libmecab-dev \ + mecab-naist-jdic \ + cmake + ;; + osx) + brew install \ + msgpack \ + libevent \ + mecab \ + mecab-ipadic + ;; +esac + -------------- next part -------------- HTML����������������������������...下載
