Kouhei Sutou
null+****@clear*****
Tue Feb 23 09:26:30 JST 2016
Kouhei Sutou 2016-02-23 09:26:30 +0900 (Tue, 23 Feb 2016) New Revision: d286e8e0507b7d3a4ead0ef731fcb6104a35a03f https://github.com/groonga/heroku-buildpack-rroonga/commit/d286e8e0507b7d3a4ead0ef731fcb6104a35a03f Message: Remove needless code Modified files: bin/compile Modified: bin/compile (+1 -72) =================================================================== --- bin/compile 2016-02-23 09:08:06 +0900 (25c268a) +++ bin/compile 2016-02-23 09:26:30 +0900 (c896d9e) @@ -24,25 +24,6 @@ def sh(*command_line) system(env, *command_line, spawn_options) or exit(false) end -def merge_environment_variables(variables) - variables = variables.dup - target_paths = [ - "PATH", - "LD_LIBRARY_PATH", - "PKG_CONFIG_PATH", - ] - target_paths.each do |target_path| - all_paths = [ - ENV[target_path], - variables[target_path], - ] - variables[target_path] = all_paths.compact.join(File::PATH_SEPARATOR) - end - variables["GROONGA_BASE_PATH"] = ENV["GROONGA_BASE_PATH"] - variables["GROONGA_DATABASE_PATH"] = ENV["GROONGA_DATABASE_PATH"] - variables -end - class Arguments < Struct.new(:build_dir, :cache_dir, :env_dir) def environment_variables return {} if env_dir.nil? @@ -57,49 +38,6 @@ class Arguments < Struct.new(:build_dir, :cache_dir, :env_dir) end end -def prepend_path_to_environment_variable(name, *paths) - new_paths = paths + [ENV[name]] - ENV[name] = new_paths.compact.join(File::PATH_SEPARATOR) -end - -def setup_groonga_environment_variables(build_dir) - prefix = File.join(build_dir, "vendor", "groonga") - mecab_prefix = File.join(build_dir, "vendor", "mecab") - - prepend_path_to_environment_variable("PATH", - File.join(prefix, "bin"), - File.join(prefix, "sbin")) - - prepend_path_to_environment_variable("LD_LIBRARY_PATH", - File.join(mecab_prefix, "lib")) - prepend_path_to_environment_variable("LD_LIBRARY_PATH", - File.join(prefix, "lib")) - - prepend_path_to_environment_variable("PKG_CONFIG_PATH", - File.join(prefix, "lib", "pkgconfig")) - - ENV["MECABRC"] = File.join(mecab_prefix, "etc", "mecabrc") - - ENV["GRN_PLUGINS_DIR"] = File.join(prefix, "lib", "groonga", "plugins") - ENV["GRN_RUBY_SCRIPTS_DIR"] = - File.join(prefix, "lib", "groonga", "scripts", "ruby") -end - -def setup_ruby_environment_variables(build_dir) - ruby_paths = [ - File.join(build_dir, "bin"), - File.join(build_dir, "vendor", "bundle", "bin") - ] - bundle_bin_glob = File.join(build_dir, "vendor", "bundle", "ruby", "*", "bin") - ruby_paths += Dir.glob(bundle_bin_glob) - prepend_path_to_environment_variable("PATH", ruby_paths) - - gem_paths = [] - bundle_gem_glob = File.join(build_dir, "vendor", "bundle", "ruby", "*") - gem_paths += Dir.glob(bundle_gem_glob) - prepend_path_to_environment_variable("GEM_PATH", gem_paths) -end - def update_mecabrc(mecabrc, prefix) sh("sed", "-i.bak", "-e", "s,/app,#{prefix},g", mecabrc) begin @@ -111,19 +49,10 @@ end arguments = Arguments.new(*ARGV) -groonga_base_path = File.join(arguments.build_dir, "groonga") -ENV["GROONGA_BASE_PATH"] = groonga_base_path -groonga_database_path = File.join(groonga_base_path, "data", "db") -mkdir_p(File.dirname(groonga_database_path)) -ENV["GROONGA_DATABASE_PATH"] = groonga_database_path - -setup_groonga_environment_variables(arguments.build_dir) -setup_ruby_environment_variables(arguments.build_dir) - puts("-----> Initializing database") Dir.chdir(arguments.build_dir) do update_mecabrc(ENV["MECABRC"], arguments.build_dir) do - sh(merge_environment_variables(arguments.environment_variables), + sh(ENV.merge(arguments.environment_variables), "bundle", "exec", "ruby", File.join("groonga", "init.rb")) end end -------------- next part -------------- HTML����������������������������...Download
