all gems included in vendor/ glob and add bootstrap for bundler

Fixes #2203
This commit is contained in:
Colin Surprenant 2014-12-08 18:38:23 -08:00 committed by Jordan Sissel
parent 288cb1fc05
commit b086a8cf8d

View file

@ -12,7 +12,7 @@ namespace "artifact" do
"{bin,lib,spec,locales}/{,**/*}", "{bin,lib,spec,locales}/{,**/*}",
"patterns/**/*", "patterns/**/*",
"vendor/??*/**/*", "vendor/??*/**/*",
File.join(LogStash::Environment.gem_home.gsub(Dir.pwd + "/", ""), "{gems,specifications}/**/*"), "build/bootstrap/**/*",
"Rakefile", "Rakefile",
"rakelib/*", "rakelib/*",
] ]
@ -46,7 +46,7 @@ namespace "artifact" do
Rake::FileList[glob].reject { |path| exclude?(path) } Rake::FileList[glob].reject { |path| exclude?(path) }
end.flatten.uniq end.flatten.uniq
end end
desc "Build a tar.gz of logstash with all dependencies" desc "Build a tar.gz of logstash with all dependencies"
task "tar" => ["bootstrap", "plugin:install-defaults"] do task "tar" => ["bootstrap", "plugin:install-defaults"] do
require "zlib" require "zlib"
@ -189,7 +189,7 @@ namespace "artifact" do
# - rpm: https://github.com/elasticsearch/logstash/pull/1290 # - rpm: https://github.com/elasticsearch/logstash/pull/1290
# - rpm: https://github.com/elasticsearch/logstash/issues/1673 # - rpm: https://github.com/elasticsearch/logstash/issues/1673
# - rpm: https://logstash.jira.com/browse/LOGSTASH-1020 # - rpm: https://logstash.jira.com/browse/LOGSTASH-1020
out.attributes[:force?] = true # overwrite the rpm/deb/etc being created out.attributes[:force?] = true # overwrite the rpm/deb/etc being created
begin begin
path = File.join(basedir, "build", out.to_s) path = File.join(basedir, "build", out.to_s)