mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

10.0-mroonga

Browse source
This commit is contained in:
Sergei Golubchik 2014-11-20 17:39:11 +01:00
commit 4e2973b48e
2 changed files with 6 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
storage/mroonga/CMakeLists.txt
View file

@ -243,25 +243,23 @@ if(MRN_BUNDLED)
mysql_add_plugin(mroonga mysql_add_plugin(mroonga
"${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}"
STORAGE_ENGINE MODULE_ONLY STORAGE_ENGINE MODULE_ONLY
LINK_LIBRARIES ${GROONGA_LIBRARIES} LINK_LIBRARIES ${GROONGA_LIBRARIES})
MODULE_OUTPUT_NAME "ha_mroonga")
else() else()
mysql_add_plugin(mroonga mysql_add_plugin(mroonga
"${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}"
STORAGE_ENGINE MODULE_ONLY STORAGE_ENGINE MODULE_ONLY
LINK_LIBRARIES ${GROONGA_LIBRARIES} LINK_LIBRARIES ${GROONGA_LIBRARIES})
MODULE_OUTPUT_NAME "ha_mroonga")
endif() endif()
else() else()
else() else()
add_library(ha_mroonga MODULE add_library(mroonga MODULE
${MROONGA_SOURCES} ${MROONGA_SOURCES}
${MRN_UDF_SOURCES} ${MRN_UDF_SOURCES}
${LIBMRN_NO_MYSQL_SOURCES} ${LIBMRN_NO_MYSQL_SOURCES}
${LIBMRN_NEED_MYSQL_SOURCES}) ${LIBMRN_NEED_MYSQL_SOURCES})
set(MYSQL_LIBRARIES "mysqlservices") 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) option(WITH_DEBUG "Enable debug options" OFF)
if(WITH_DEBUG) if(WITH_DEBUG)
@ -315,11 +313,11 @@ else()
COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS}") COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS}")
set_property(TARGET mroonga APPEND PROPERTY set_property(TARGET mroonga APPEND PROPERTY
COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN") COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
set_target_properties(ha_mroonga PROPERTIES set_target_properties(mroonga PROPERTIES
PREFIX "" PREFIX ""
OUTPUT_NAME "ha_mroonga") OUTPUT_NAME "ha_mroonga")
install(TARGETS ha_mroonga DESTINATION "${MYSQL_PLUGIN_DIR}") install(TARGETS mroonga DESTINATION "${MYSQL_PLUGIN_DIR}")
endif() endif()
if(GROONGA_NORMALIZER_MYSQL_FOUND) if(GROONGA_NORMALIZER_MYSQL_FOUND)

33
storage/mroonga/vendor/groonga/vendor/update_nginx.sh vendored
View file

@ -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}" || :