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

move plugins gemfile to tools

Browse source 
Fixes #2171
This commit is contained in:
Joao Duarte 2014-12-04 11:27:23 +00:00 • committed by Jordan Sissel
parent 456bb91547
commit 04d6a51261
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rakelib/plugin.rake
View file

@ -15,15 +15,20 @@ namespace "plugin" do
gem_path = ENV['GEM_PATH']
gem_home = ENV['GEM_HOME']
env = {
"GEM_PATH" => "#{ENV['GEM_PATH']}:vendor/bundle/jruby/1.9",
"GEM_PATH" => [
ENV['GEM_PATH'],
::File.join(LogStash::Environment::LOGSTASH_HOME, 'build/bootstrap'),
::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"
}
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")
system(env, jruby, "-S", bundle, "install", "--gemfile=tools/Gemfile.plugins")
else
system(env, "bundle", "install")
system(env, "bundle", "install", "--gemfile=tools/Gemfile.plugins")
end
ENV['GEM_PATH'] = gem_path
ENV['GEM_HOME'] = gem_home

0
Gemfile → tools/Gemfile.plugins
View file