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

- add update-flatjar target

Browse source 
- make update-jar target invoke a few other steps
This commit is contained in:
Jordan Sissel 2013-04-07 23:16:49 -07:00
parent e17593f06f
commit 5d3dca8955
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -2,8 +2,8 @@
# rsync # rsync
# wget or curl # wget or curl
# #
JRUBY_VERSION=1.7.2 JRUBY_VERSION=1.7.3
ELASTICSEARCH_VERSION=0.20.2 ELASTICSEARCH_VERSION=0.20.5
#VERSION=$(shell ruby -r./lib/logstash/version -e 'puts LOGSTASH_VERSION') #VERSION=$(shell ruby -r./lib/logstash/version -e 'puts LOGSTASH_VERSION')
VERSION=$(shell awk -F\" '/LOGSTASH_VERSION/ {print $$2}' lib/logstash/version.rb) VERSION=$(shell awk -F\" '/LOGSTASH_VERSION/ {print $$2}' lib/logstash/version.rb)
@ -234,9 +234,12 @@ build/logstash-$(VERSION)-flatjar.jar: | build/jar
$(QUIET)jar i $@ $(QUIET)jar i $@
@echo "Created $@" @echo "Created $@"
update-jar: copy-ruby-files update-jar: copy-ruby-files compile build/ruby/logstash/runner.class
$(QUIET)jar uf build/logstash-$(VERSION)-monolithic.jar -C build/ruby . $(QUIET)jar uf build/logstash-$(VERSION)-monolithic.jar -C build/ruby .
update-flatjar: copy-ruby-files compile build/ruby/logstash/runner.class
$(QUIET)jar uf build/logstash-$(VERSION)-flatjar.jar -C build/ruby .
.PHONY: test .PHONY: test
test: | $(JRUBY) vendor-elasticsearch test: | $(JRUBY) vendor-elasticsearch
@#$(JRUBY_CMD) bin/logstash test @#$(JRUBY_CMD) bin/logstash test
@ -328,4 +331,4 @@ JIRA_VERSION_ID=10820
releaseNote: releaseNote:
-$(QUIET)rm releaseNote.html -$(QUIET)rm releaseNote.html
$(QUIET)curl -si "https://logstash.jira.com/secure/ReleaseNote.jspa?version=$(JIRA_VERSION_ID)&projectId=10020" | sed -n '/<textarea.*>/,/<\/textarea>/p' | grep textarea -v >> releaseNote.html $(QUIET)curl -si "https://logstash.jira.com/secure/ReleaseNote.jspa?version=$(JIRA_VERSION_ID)&projectId=10020" | sed -n '/<textarea.*>/,/<\/textarea>/p' | grep textarea -v >> releaseNote.html
$(QUIET)ruby pull_release_note.rb $(QUIET)ruby pull_release_note.rb