github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

minor fixes to moving plugins gemfile to tools/

Browse source 
Fixes #2171
This commit is contained in:
Joao Duarte 2014-12-04 11:41:29 +00:00 • committed by Jordan Sissel
parent 796adf4c49
commit 46a4951676
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rakelib/plugin.rake
View file

@ -21,14 +21,15 @@ namespace "plugin" do
::File.join(LogStash::Environment::LOGSTASH_HOME, 'vendor/bundle/jruby/1.9'),
::File.join(LogStash::Environment::LOGSTASH_HOME, 'vendor/jruby/lib/ruby/gems/shared')
].join(":"),
"GEM_HOME" => "vendor/plugins/jruby/1.9"
"GEM_HOME" => "vendor/plugins/jruby/1.9",
"BUNDLE_GEMFILE" => "tools/Gemfile.plugins"
}
if ENV['USE_RUBY'] != '1'
jruby = File.join("vendor", "jruby", "bin", "jruby")
bundle = File.join("build", "bootstrap", "bin", "bundle")
system(env, jruby, "-S", bundle, "install", "--gemfile=tools/Gemfile.plugins")
system(env, jruby, "-S", bundle, "install")
else
system(env, "bundle", "install", "--gemfile=tools/Gemfile.plugins")
system(env, "bundle", "install")
end
ENV['GEM_PATH'] = gem_path
ENV['GEM_HOME'] = gem_home

2
tools/Gemfile.plugins
View file

@ -2,6 +2,6 @@ require 'rakelib/default_plugins'
source 'https://rubygems.org'
gemspec :name => "logstash"
gemspec :name => "logstash", :path => ".."
DEFAULT_PLUGINS.each {|p| gem p}