Kouhei Sutou
null+****@clear*****
Tue Oct 20 23:11:35 JST 2015
Kouhei Sutou 2015-10-20 23:11:35 +0900 (Tue, 20 Oct 2015) New Revision: 1ba929a8e70218d3b75bf024127ac31a6b7ca45b https://github.com/groonga/groonga/commit/1ba929a8e70218d3b75bf024127ac31a6b7ca45b Message: cmake: install license files Modified files: .gitignore CMakeLists.txt vendor/mecab/CMakeLists.txt vendor/mruby/CMakeLists.txt vendor/mruby/built_sources.am vendor/mruby/mruby_build.rb vendor/onigmo/CMakeLists.txt Modified: .gitignore (+1 -0) =================================================================== --- .gitignore 2015-10-20 22:25:39 +0900 (1ca6af6) +++ .gitignore 2015-10-20 23:11:35 +0900 (f38129f) @@ -38,6 +38,7 @@ cmake_install.cmake /data/groonga-httpd.conf /data/scripts/groonga-httpd-restart /vendor/nginx-*/objs +/vendor/mruby/LEGAL /vendor/mruby/mrblib.c /vendor/mruby/mrbgems_init.c /vendor/mruby/mruby-compiler/ Modified: CMakeLists.txt (+5 -0) =================================================================== --- CMakeLists.txt 2015-10-20 22:25:39 +0900 (8835832) +++ CMakeLists.txt 2015-10-20 23:11:35 +0900 (50e1330) @@ -627,4 +627,9 @@ if(NOT GRN_EMBED) DESTINATION "${LIB_DIR}/pkgconfig/") endif() +install(FILES + "COPYING" + "README.md" + DESTINATION "${GRN_DATA_DIR}") + add_subdirectory(vendor/plugins) Modified: vendor/mecab/CMakeLists.txt (+14 -0) =================================================================== --- vendor/mecab/CMakeLists.txt 2015-10-20 22:25:39 +0900 (fda9064) +++ vendor/mecab/CMakeLists.txt 2015-10-20 23:11:35 +0900 (a0a720d) @@ -201,5 +201,19 @@ if(GRN_WITH_BUNDLED_MECAB) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mecabrc" DESTINATION "${CONFIG_DIR}") + install(FILES + "${MECAB_NAIST_JDIC_SOURCE_DIR}/AUTHORS" + "${MECAB_NAIST_JDIC_SOURCE_DIR}/COPYING" + "${MECAB_NAIST_JDIC_SOURCE_DIR}/README" + DESTINATION "${GRN_DATA_DIR}/mecab-naist-jdic") + install(FILES + "${MECAB_SOURCE_DIR}/AUTHORS" + "${MECAB_SOURCE_DIR}/BSD" + "${MECAB_SOURCE_DIR}/COPYING" + "${MECAB_SOURCE_DIR}/GPL" + "${MECAB_SOURCE_DIR}/LGPL" + "${MECAB_SOURCE_DIR}/README" + DESTINATION "${GRN_DATA_DIR}/mecab") + configure_file(config.h.cmake "${MECAB_BINARY_DIR}/config.h") endif() Modified: vendor/mruby/CMakeLists.txt (+12 -4) =================================================================== --- vendor/mruby/CMakeLists.txt 2015-10-20 22:25:39 +0900 (55a2eaa) +++ vendor/mruby/CMakeLists.txt 2015-10-20 23:11:35 +0900 (d2c6856) @@ -14,10 +14,12 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if(GRN_WITH_MRUBY) + set(MRUBY_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../mruby-source") + include_directories( - "${CMAKE_CURRENT_SOURCE_DIR}/../mruby-source/include" - "${CMAKE_CURRENT_SOURCE_DIR}/../mruby-source/src" - "${CMAKE_CURRENT_SOURCE_DIR}/../mruby-source/mrbgems/mruby-compiler/core" + "${MRUBY_SOURCE_DIR}/include" + "${MRUBY_SOURCE_DIR}/src" + "${MRUBY_SOURCE_DIR}/mrbgems/mruby-compiler/core" "${CMAKE_CURRENT_SOURCE_DIR}/../onigmo-source" ) @@ -30,6 +32,7 @@ if(GRN_WITH_MRUBY) set(mruby_pre_build_timestamp "${CMAKE_CURRENT_SOURCE_DIR}/mruby_build.timestamp") if(EXISTS "${mruby_pre_build_timestamp}") + set(MRUBY_LEGAL_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LEGAL") string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_SOURCE_DIR}/\\1" MRUBY_BUILT_SOURCES "${MRUBY_BUILT_SOURCES}") include_directories( @@ -44,7 +47,7 @@ if(GRN_WITH_MRUBY) "${RUBY}" "${CMAKE_CURRENT_SOURCE_DIR}/mruby_build.rb" "${CMAKE_CURRENT_SOURCE_DIR}/build_config.rb" - "${CMAKE_CURRENT_SOURCE_DIR}/../mruby-source" + "${MRUBY_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/../mruby-build" "${CMAKE_CURRENT_SOURCE_DIR}/../onigmo-source" "${mruby_build_timestamp}" @@ -55,6 +58,7 @@ if(GRN_WITH_MRUBY) message(FATAL_ERROR "Failed to build mruby files") endif() endif() + set(MRUBY_LEGAL_FILE "${CMAKE_CURRENT_BINARY_DIR}/LEGAL") string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_BINARY_DIR}/\\1" MRUBY_BUILT_SOURCES "${MRUBY_BUILT_SOURCES}") include_directories( @@ -82,4 +86,8 @@ if(GRN_WITH_MRUBY) set_source_files_properties(${MRUBY_ALL_SOURCES} PROPERTIES COMPILE_FLAGS "${MRUBY_C_COMPILE_FLAGS}") + + install(FILES + "${MRUBY_LEGAL_FILE}" + DESTINATION "${GRN_DATA_DIR}/mruby") endif() Modified: vendor/mruby/built_sources.am (+1 -0) =================================================================== --- vendor/mruby/built_sources.am 2015-10-20 22:25:39 +0900 (73726cd) +++ vendor/mruby/built_sources.am 2015-10-20 23:11:35 +0900 (1322762) @@ -1,4 +1,5 @@ BUILT_SOURCES = \ + LEGAL \ mrblib.c \ mrbgems_init.c \ mruby-compiler/core/parse.c \ Modified: vendor/mruby/mruby_build.rb (+2 -0) =================================================================== --- vendor/mruby/mruby_build.rb 2015-10-20 22:25:39 +0900 (e2e8d68) +++ vendor/mruby/mruby_build.rb 2015-10-20 23:11:35 +0900 (c446c62) @@ -28,6 +28,8 @@ end FileUtils.touch(timestamp_file) +FileUtils.cp("#{mruby_build_dir}/host/LEGAL", "./") + FileUtils.cp("#{mruby_build_dir}/host/mrblib/mrblib.c", "./") File.open("mrbgems_init.c", "w") do |mrbgems_init| Modified: vendor/onigmo/CMakeLists.txt (+6 -0) =================================================================== --- vendor/onigmo/CMakeLists.txt 2015-10-20 22:25:39 +0900 (2e89ea0) +++ vendor/onigmo/CMakeLists.txt 2015-10-20 23:11:35 +0900 (8312a12) @@ -125,4 +125,10 @@ if(GRN_WITH_ONIGMO) POSITION_INDEPENDENT_CODE ON) configure_file(config.h.cmake "${ONIGMO_BINARY_DIR}/config.h") + + install(FILES + "${ONIGMO_SOURCE_DIR}/AUTHORS" + "${ONIGMO_SOURCE_DIR}/COPYING" + "${ONIGMO_SOURCE_DIR}/README" + DESTINATION "${GRN_DATA_DIR}/onigmo") endif() -------------- next part -------------- HTML����������������������������...Download