Kouhei Sutou
null+****@clear*****
Tue Feb 23 09:03:31 JST 2016
Kouhei Sutou 2016-02-23 09:03:31 +0900 (Tue, 23 Feb 2016) New Revision: 2f6eb0a99cdcdeee441de3d3288482d489f127f2 https://github.com/groonga/heroku-buildpack-groonga/commit/2f6eb0a99cdcdeee441de3d3288482d489f127f2 Message: Create export file for multi buildpack Modified files: bin/compile Modified: bin/compile (+20 -6) =================================================================== --- bin/compile 2016-02-23 00:33:54 +0900 (3b58885) +++ bin/compile 2016-02-23 09:03:31 +0900 (3029d76) @@ -125,8 +125,8 @@ Dir.chdir(build_dir) do lib_dir, "#{build_dir}/vendor/mecab/lib", ] - ld_library_paths += base_ld_library_paths - ENV["LD_LIBRARY_PATH"] = build_path_environment_value(ld_library_paths) + ENV["LD_LIBRARY_PATH"] = + build_path_environment_value(ld_library_paths + base_ld_library_paths) ENV["GRN_PLUGINS_DIR"] = "#{absolete_prefix}/lib/groonga/plugins" ENV["GRN_RUBY_SCRIPTS_DIR"] = "#{absolete_prefix}/lib/groonga/scripts/ruby" ENV["MECABRC"] = "#{build_dir}/vendor/mecab/etc/mecabrc" @@ -158,12 +158,26 @@ Dir.chdir(build_dir) do profile_dir="#{build_dir}/.profile.d" FileUtils.mkdir_p(profile_dir) File.open("#{profile_dir}/groonga.sh", "w") do |env_file| - ld_library_paths = [ + app_ld_library_path = [ "#{app_dir}/#{prefix}/lib", "#{app_dir}/vendor/mecab/lib", + ].join(File::PATH_SEPARATOR) + env_file.puts(<<-GROONGA_SH) +export LD_LIBRARY_PATH="#{app_ld_library_path}:$LD_LIBRARY_PATH" + GROONGA_SH + end + + export_path = File.join(File.dirname(__FILE__), "..", "export") + File.open(export_path, "a") do |export| + pkg_config_paths = [ + "#{absolete_prefix}/lib/pkgconfig", ] - ld_library_paths += base_ld_library_paths - ld_library_path = build_path_environment_value(ld_library_paths) - env_file.puts("export LD_LIBRARY_PATH=#{ld_library_path}") + export.puts(<<-EXPORT) +LD_LIBRARY_PATH="#{ld_library_paths.join(File::PATH_SEPARATOR)}:$LD_LIBRARY_PATH" +PKG_CONFIG_PATH="#{pkg_config_paths.join(File::PATH_SEPARATOR)}:$PKG_CONFIG_PATH" +GRN_PLUGINS_DIR="#{ENV["GRN_PLUGINS_DIR"]}" +GRN_RUBY_SCRIPTS_DIR="#{ENV["GRN_RUBY_SCRIPTS_DIR"]}" +MECABRC="#{ENV["MECABRC"]}" + EXPORT end end -------------- next part -------------- HTML����������������������������...Download
