Kouhei Sutou
null+****@clear*****
Mon Mar 30 13:03:27 JST 2015
Kouhei Sutou 2015-03-30 13:03:27 +0900 (Mon, 30 Mar 2015) New Revision: e38eb094b5d8f3b2401f0a112c4d8b83545eed80 https://github.com/groonga/groonga/commit/e38eb094b5d8f3b2401f0a112c4d8b83545eed80 Message: cmake: fix wrong install location of mruby files Added files: lib/mrb/scripts/command_line/Makefile.am lib/mrb/scripts/command_line/sources.am lib/mrb/scripts/context/Makefile.am lib/mrb/scripts/context/sources.am lib/mrb/scripts/initialize/Makefile.am lib/mrb/scripts/initialize/sources.am lib/mrb/scripts/logger/Makefile.am lib/mrb/scripts/logger/sources.am Modified files: configure.ac lib/CMakeLists.txt lib/mrb/scripts/Makefile.am Modified: configure.ac (+4 -0) =================================================================== --- configure.ac 2015-03-30 12:29:45 +0900 (9b8fdc2) +++ configure.ac 2015-03-30 13:03:27 +0900 (dd906b6) @@ -226,6 +226,10 @@ AC_CONFIG_FILES([ lib/dat/Makefile lib/mrb/Makefile lib/mrb/scripts/Makefile + lib/mrb/scripts/command_line/Makefile + lib/mrb/scripts/context/Makefile + lib/mrb/scripts/initialize/Makefile + lib/mrb/scripts/logger/Makefile include/Makefile include/groonga/Makefile plugins/Makefile Modified: lib/CMakeLists.txt (+32 -0) =================================================================== --- lib/CMakeLists.txt 2015-03-30 12:29:45 +0900 (3f9c9bb) +++ lib/CMakeLists.txt 2015-03-30 13:03:27 +0900 (7c5505d) @@ -87,4 +87,36 @@ if(GRN_WITH_MRUBY AND NOT GRN_EMBED) install( FILES ${RUBY_SCRIPTS} DESTINATION "${GRN_RELATIVE_RUBY_SCRIPTS_DIR}") + + read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/mrb/scripts/command_line/sources.am + RUBY_SCRIPTS) + string(REGEX REPLACE "([^;]+)" "mrb/scripts/\\1" + RUBY_SCRIPTS "${RUBY_SCRIPTS}") + install( + FILES ${RUBY_SCRIPTS} + DESTINATION "${GRN_RELATIVE_RUBY_SCRIPTS_DIR}/command_line") + + read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/mrb/scripts/context/sources.am + RUBY_SCRIPTS) + string(REGEX REPLACE "([^;]+)" "mrb/scripts/\\1" + RUBY_SCRIPTS "${RUBY_SCRIPTS}") + install( + FILES ${RUBY_SCRIPTS} + DESTINATION "${GRN_RELATIVE_RUBY_SCRIPTS_DIR}/context") + + read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/mrb/scripts/initialize/sources.am + RUBY_SCRIPTS) + string(REGEX REPLACE "([^;]+)" "mrb/scripts/\\1" + RUBY_SCRIPTS "${RUBY_SCRIPTS}") + install( + FILES ${RUBY_SCRIPTS} + DESTINATION "${GRN_RELATIVE_RUBY_SCRIPTS_DIR}/initialize") + + read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/mrb/scripts/logger/sources.am + RUBY_SCRIPTS) + string(REGEX REPLACE "([^;]+)" "mrb/scripts/\\1" + RUBY_SCRIPTS "${RUBY_SCRIPTS}") + install( + FILES ${RUBY_SCRIPTS} + DESTINATION "${GRN_RELATIVE_RUBY_SCRIPTS_DIR}/logger") endif() Modified: lib/mrb/scripts/Makefile.am (+7 -1) =================================================================== --- lib/mrb/scripts/Makefile.am 2015-03-30 12:29:45 +0900 (631923e) +++ lib/mrb/scripts/Makefile.am 2015-03-30 13:03:27 +0900 (9b6acf8) @@ -1,3 +1,9 @@ +SUBDIRS = \ + command_line \ + context \ + initialize \ + logger + include sources.am EXTRA_DIST = \ @@ -5,5 +11,5 @@ EXTRA_DIST = \ $(RUBY_SCRIPT_FILES) if WITH_MRUBY -nobase_ruby_scripts_DATA = $(RUBY_SCRIPT_FILES) +ruby_scripts_DATA = $(RUBY_SCRIPT_FILES) endif Added: lib/mrb/scripts/command_line/Makefile.am (+9 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/command_line/Makefile.am 2015-03-30 13:03:27 +0900 (8d58081) @@ -0,0 +1,9 @@ +include sources.am + +EXTRA_DIST = \ + $(RUBY_SCRIPT_FILES) + +if WITH_MRUBY +ruby_scripts_command_linedir = $(ruby_scriptsdir)/command_line +ruby_scripts_command_line_DATA = $(RUBY_SCRIPT_FILES) +endif Added: lib/mrb/scripts/command_line/sources.am (+2 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/command_line/sources.am 2015-03-30 13:03:27 +0900 (759948e) @@ -0,0 +1,2 @@ +RUBY_SCRIPT_FILES = \ + grndb.rb Added: lib/mrb/scripts/context/Makefile.am (+9 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/context/Makefile.am 2015-03-30 13:03:27 +0900 (8d86208) @@ -0,0 +1,9 @@ +include sources.am + +EXTRA_DIST = \ + $(RUBY_SCRIPT_FILES) + +if WITH_MRUBY +ruby_scripts_contextdir = $(ruby_scriptsdir)/context +ruby_scripts_context_DATA = $(RUBY_SCRIPT_FILES) +endif Added: lib/mrb/scripts/context/sources.am (+3 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/context/sources.am 2015-03-30 13:03:27 +0900 (1f0d162) @@ -0,0 +1,3 @@ +RUBY_SCRIPT_FILES = \ + error_level.rb \ + rc.rb Added: lib/mrb/scripts/initialize/Makefile.am (+9 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/initialize/Makefile.am 2015-03-30 13:03:27 +0900 (e7531fd) @@ -0,0 +1,9 @@ +include sources.am + +EXTRA_DIST = \ + $(RUBY_SCRIPT_FILES) + +if WITH_MRUBY +ruby_scripts_initializedir = $(ruby_scriptsdir)/initialize +ruby_scripts_initialize_DATA = $(RUBY_SCRIPT_FILES) +endif Added: lib/mrb/scripts/initialize/sources.am (+3 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/initialize/sources.am 2015-03-30 13:03:27 +0900 (3c26e19) @@ -0,0 +1,3 @@ +RUBY_SCRIPT_FILES = \ + pre.rb \ + post.rb Added: lib/mrb/scripts/logger/Makefile.am (+9 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/logger/Makefile.am 2015-03-30 13:03:27 +0900 (448e72c) @@ -0,0 +1,9 @@ +include sources.am + +EXTRA_DIST = \ + $(RUBY_SCRIPT_FILES) + +if WITH_MRUBY +ruby_scripts_loggerdir = $(ruby_scriptsdir)/logger +ruby_scripts_logger_DATA = $(RUBY_SCRIPT_FILES) +endif Added: lib/mrb/scripts/logger/sources.am (+2 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/logger/sources.am 2015-03-30 13:03:27 +0900 (7231ee4) @@ -0,0 +1,2 @@ +RUBY_SCRIPT_FILES = \ + level.rb -------------- next part -------------- HTML����������������������������...Download