Mercurial > logstash
diff logstash.Makefile @ 33:0faebb0b0fa4
update to kibana 3, logstash 1.2.1, es 0.90.5
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Mon, 23 Sep 2013 11:50:21 -0700 |
| parents | f2691b83bafa |
| children |
line wrap: on
line diff
--- a/logstash.Makefile Wed May 29 11:37:41 2013 -0700 +++ b/logstash.Makefile Mon Sep 23 11:50:21 2013 -0700 @@ -16,8 +16,9 @@ all: # compile-grammer - touch lib/logstash/config/grammar.rl # force rebuild - make -C lib/logstash/config grammar.rb + # use the prebuild one, since we don't have tt command from treetop (yet?) + #touch lib/logstash/config/grammar.treetop # force rebuild + #make -C lib/logstash/config grammar.rb # compile-runner mkdir -p build/ruby cd lib; $(JRUBYC) -t ../build/ruby logstash/runner.rb @@ -39,8 +40,11 @@ # build-monolith mkdir -p build/monolith/openssl mkdir -p build/monolith/jopenssl + mkdir -p build/monolith/META-INF/services # unpack all jars find $$PWD/vendor/bundle -name '*.jar' | (cd build/monolith; xargs -n1 jar xf) + # Merge all service file in all 3rdparty jars + find $$PWD/vendor/bundle $$PWD/vendor/jar -name '*.jar' | xargs $(JRUBY_CMD) extract_services.rb -o build/monolith/META-INF/services # copy openssl/lib/shared folders/files to root of jar - need this for openssl to work with JRuby cp -r vendor/bundle/jruby/1.9/gems/jruby-openss*/lib/shared/openssl/* build/monolith/openssl cp -r vendor/bundle/jruby/1.9/gems/jruby-openss*/lib/shared/jopenssl/* build/monolith/jopenssl @@ -63,8 +67,6 @@ -C build/monolith . \ -C vendor/bundle/jruby/1.9 gems \ -C vendor/bundle/jruby/1.9 specifications \ - -C lib logstash/web/public \ -C lib logstash/certs \ - -C lib logstash/web/views \ patterns