Kouhei Sutou
null+****@clear*****
Mon Jul 7 23:45:25 JST 2014
Kouhei Sutou 2014-07-07 23:45:25 +0900 (Mon, 07 Jul 2014) New Revision: df594c86905128733dd84128e4d1dd07de331513 https://github.com/groonga/heroku-buildpack-groonga/commit/df594c86905128733dd84128e4d1dd07de331513 Message: Add a method for common codes Modified files: bin/compile Modified: bin/compile (+11 -12) =================================================================== --- bin/compile 2014-07-07 23:41:49 +0900 (713dd5a) +++ bin/compile 2014-07-07 23:45:25 +0900 (1b0ee2b) @@ -33,6 +33,10 @@ def load_environment_variables(env_dir) variables end +def build_path_environment_value(paths) + paths.compact.join(File::PATH_SEPARATOR) +end + def remove_needless_files(prefix) rm(Dir.glob("#{prefix}/lib/**/*.a")) rm_r("#{prefix}/share/groonga/examples") @@ -85,14 +89,14 @@ Dir.chdir(build_dir) do environment_variables["PATH"], ENV["PATH"], ] - ENV["PATH"] = paths.compact.join(File::PATH_SEPARATOR) + ENV["PATH"] = build_path_environment_value(paths) lib_dir = "#{absolete_prefix}/lib" - ld_library_paths = [ - lib_dir, + base_ld_library_paths = [ environment_variables["LD_LIBRARY_PATH"], ENV["LD_LIBRARY_PATH"], ] - ENV["LD_LIBRARY_PATH"] = ld_library_paths.compact.join(File::PATH_SEPARATOR) + ld_library_paths = [lib_dir] + base_ld_library_paths + ENV["LD_LIBRARY_PATH"] = build_path_environment_value(ld_library_paths) sh("groonga", "-n", database_path, "quit") puts("-----> Loading data") @@ -111,20 +115,15 @@ Dir.chdir(build_dir) do environment_variables["PKG_CONFIG_PATH"], ENV["PKG_CONFIG_PATH"] ] - pkg_config_path = pkg_config_paths.compact.join(File::PATH_SEPARATOR) - env_file.write(pkg_config_path) + env_file.write(build_path_environment_value(pkg_config_paths)) end app_dir = ENV["HOME"] profile_dir="#{build_dir}/.profile.d" FileUtils.mkdir_p(profile_dir) open("#{profile_dir}/groonga.sh", "w") do |env_file| - ld_library_paths = [ - "#{app_dir}/#{prefix}/lib", - environment_variables["LD_LIBRARY_PATH"], - ENV["LD_LIBRARY_PATH"] - ] - ld_library_path = ld_library_paths.compact.join(File::PATH_SEPARATOR) + ld_library_paths = ["#{app_dir}/#{prefix}/lib"] + base_ld_library_paths + ld_library_path = build_path_environment_value(ld_library_paths) env_file.write("export LD_LIBRARY_PATH=#{ld_library_path}") end end -------------- next part -------------- HTML����������������������������...Download