Kouhei Sutou
null+****@clear*****
Wed Mar 27 12:14:27 JST 2013
Kouhei Sutou 2013-03-27 12:14:27 +0900 (Wed, 27 Mar 2013) New Revision: b243385d5ddde6a1338a60f2072140a46863a545 https://github.com/mroonga/mroonga/commit/b243385d5ddde6a1338a60f2072140a46863a545 Message: travis: we cannot use MRN_BUNDLED before loading config.h! Modified files: tools/travis/script.sh Modified: tools/travis/script.sh (+9 -5) =================================================================== --- tools/travis/script.sh 2013-03-27 12:01:06 +0900 (d39b9bb) +++ tools/travis/script.sh 2013-03-27 12:14:27 +0900 (fbbb1dc) @@ -20,13 +20,17 @@ set -e base_dir="$(cd $(dirname $0); pwd)" -if [ "${MRN_BUNDLED}" = "TRUE" ]; then - mroonga_dir="$base_dir/../../storage/mroonga" +top_dir="${base_dir}/../.." +n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" + +bundled_mroonga_dir="${top_dir}/storage/mroonga" +if [ -f "${bundled_mroonga_dir}/config.sh" ]; then + mroonga_dir="${bundled_mroonga_dir}" + . "${bundled_mroonga_dir}/config.sh" else - mroonga_dir="$base_dir/../.." + mroonga_dir="${top_dir}" + . "${top_dir}/config.sh" fi -n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" -. "${mroonga_dir}/config.sh" build() { -------------- next part -------------- HTML����������������������������...Download