Kouhei Sutou
null+****@clear*****
Fri Oct 4 12:32:08 JST 2013
Kouhei Sutou 2013-10-04 12:32:08 +0900 (Fri, 04 Oct 2013) New Revision: 288f14e5bac0cc8d335505d7c106c0435e179126 https://github.com/groonga/groonga/commit/288f14e5bac0cc8d335505d7c106c0435e179126 Message: travis: add CMake build Modified files: .travis.yml tools/travis-before-script.sh Modified: .travis.yml (+5 -2) =================================================================== --- .travis.yml 2013-10-04 12:27:27 +0900 (9745a88) +++ .travis.yml 2013-10-04 12:32:08 +0900 (f9aa11f) @@ -5,14 +5,17 @@ language: cpp compiler: - gcc - clang +env: + - BUILD_TOOL=autotools + - BUILD_TOOL=cmake install: - curl https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh - - sudo apt-get install -qq -y autotools-dev zlib1g-dev liblzo2-dev libmsgpack-dev libevent-dev libmecab-dev mecab-naist-jdic + - sudo apt-get install -qq -y autotools-dev zlib1g-dev liblzo2-dev libmsgpack-dev libevent-dev libmecab-dev mecab-naist-jdic cmake before_script: - rvm use 1.9.3 - tools/travis-before-script.sh script: - - NO_RUBY=yes test/unit/run-test.sh + - [ ${BUILD_TOOL} == "autotools" ] && NO_RUBY=yes test/unit/run-test.sh - test/command/run-test.sh # - test/command/run-test.sh --interface http # - test/command/run-test.sh --interface http --testee groonga-httpd Modified: tools/travis-before-script.sh (+7 -0) =================================================================== --- tools/travis-before-script.sh 2013-10-04 12:27:27 +0900 (250f47e) +++ tools/travis-before-script.sh 2013-10-04 12:32:08 +0900 (9907e58) @@ -2,6 +2,8 @@ set -e +case "${BUILD_TOOLS}" in + autotools) ./autogen.sh configure_args="" @@ -10,3 +12,8 @@ configure_args="" #fi ./configure --with-ruby19 ${configure_args} +;; + cmake) + cmake . -DGRN_WITH_DEBUG=yes -DGRN_WITH_MRUBY=yes + ;; +esac -------------- next part -------------- HTML����������������������������...Download