diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-20 17:39:11 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-20 17:39:11 +0100 |
| commit | 4e2973b48effee11d2b7f2ec99e2f448b494f2e6 (patch) | |
| tree | 52632190f001a2442008f865fedb4bafa5779a78 /storage/mroonga | |
| parent | 87b75b7719ad65f7d5f07499a08f0246a84bf32a (diff) | |
| parent | 903d145f4d16641da23dcf1bafcdde1e78cbe5af (diff) | |
| download | mariadb-git-4e2973b48effee11d2b7f2ec99e2f448b494f2e6.tar.gz | |
10.0-mroonga
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/CMakeLists.txt | 14 | ||||
| -rwxr-xr-x | storage/mroonga/vendor/groonga/vendor/update_nginx.sh | 33 |
2 files changed, 6 insertions, 41 deletions
diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt index c68f61a40b5..faad871fa95 100644 --- a/storage/mroonga/CMakeLists.txt +++ b/storage/mroonga/CMakeLists.txt @@ -243,25 +243,23 @@ if(MRN_BUNDLED) mysql_add_plugin(mroonga "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" STORAGE_ENGINE MODULE_ONLY - LINK_LIBRARIES ${GROONGA_LIBRARIES} - MODULE_OUTPUT_NAME "ha_mroonga") + LINK_LIBRARIES ${GROONGA_LIBRARIES}) else() mysql_add_plugin(mroonga "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" STORAGE_ENGINE MODULE_ONLY - LINK_LIBRARIES ${GROONGA_LIBRARIES} - MODULE_OUTPUT_NAME "ha_mroonga") + LINK_LIBRARIES ${GROONGA_LIBRARIES}) endif() else() else() - add_library(ha_mroonga MODULE + add_library(mroonga MODULE ${MROONGA_SOURCES} ${MRN_UDF_SOURCES} ${LIBMRN_NO_MYSQL_SOURCES} ${LIBMRN_NEED_MYSQL_SOURCES}) set(MYSQL_LIBRARIES "mysqlservices") - target_link_libraries(ha_mroonga ${GROONGA_LIBRARIES} ${MYSQL_LIBRARIES}) + target_link_libraries(mroonga ${GROONGA_LIBRARIES} ${MYSQL_LIBRARIES}) option(WITH_DEBUG "Enable debug options" OFF) if(WITH_DEBUG) @@ -315,11 +313,11 @@ else() COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS}") set_property(TARGET mroonga APPEND PROPERTY COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN") - set_target_properties(ha_mroonga PROPERTIES + set_target_properties(mroonga PROPERTIES PREFIX "" OUTPUT_NAME "ha_mroonga") - install(TARGETS ha_mroonga DESTINATION "${MYSQL_PLUGIN_DIR}") + install(TARGETS mroonga DESTINATION "${MYSQL_PLUGIN_DIR}") endif() if(GROONGA_NORMALIZER_MYSQL_FOUND) diff --git a/storage/mroonga/vendor/groonga/vendor/update_nginx.sh b/storage/mroonga/vendor/groonga/vendor/update_nginx.sh deleted file mode 100755 index 4dbbec3602d..00000000000 --- a/storage/mroonga/vendor/groonga/vendor/update_nginx.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -u -set -e -set -x - -if [ $# != 1 ]; then - echo "Usage: $0 VERSION" - echo " e.g.: $0 1.2.6" - exit 1 -fi - -new_nginx_version="$1" - -base_dir="$(dirname "$0")" -top_src_dir="${base_dir}/.." - -nginx_version_file="${top_src_dir}/nginx_version" -current_nginx_version=$(cat "${nginx_version_file}") - -current_nginx_dir="${base_dir}/nginx-${current_nginx_version}" - -new_nginx_base_name="nginx-${new_nginx_version}" -new_nginx_tar_gz="${new_nginx_base_name}.tar.gz" -wget "http://nginx.org/download/${new_nginx_tar_gz}" - -tar xzf "${new_nginx_tar_gz}" -rm "${new_nginx_tar_gz}" - -echo "${new_nginx_version}" > "${nginx_version_file}" - -git add "${new_nginx_base_name}" -git rm -rf "${current_nginx_dir}" || : |