changeset 31:e84d1f4fe2bf

logstash manifest depends on results of elasticsearch build
author Carl Byington <carl@five-ten-sg.com>
date Sat, 11 May 2013 09:38:59 -0700
parents f2691b83bafa
children 082f7a76fa48
files Makefile logstash.manifest
diffstat 2 files changed, 19 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri May 10 15:01:48 2013 -0700
+++ b/Makefile	Sat May 11 09:38:59 2013 -0700
@@ -26,12 +26,14 @@
 	[ -f $(k) ] || curl http://logstash.objects.dreamhost.com/maxmind/$(k) >$(k)
 	[ -f $(l) ] || curl https://nodeload.github.com/rashidkpc/Kibana/tar.gz/$(lcc) >$(l)
 
-srpm: download
+logstash.manifest:
 	# build the classpath in a manifest file
 	echo "Class-Path: /usr/share/jruby.jar /usr/share/graphtastic-client.jar " >logstash.manifest
-	for i in /usr/share/elasticsearch/{elasticsearch,jna,jts,log4j,lucene-{core,analyzers,highlighter,memory,queries},snappy-java,spatial4j}.jar; do \
+	for i in /usr/share/elasticsearch/{lucene-{core,analyzers-common,codecs,queries,memory,highlighter,queryparser,sandbox,suggest,join,grouping,spatial},spatial4j,jts,log4j,jna,elasticsearch}.jar; do \
 		echo "  $$i" >>logstash.manifest; \
 	done
+
+srpm: logstash.manifest
 	# build the source rpms
 	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs Kibana.spec
 	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs jruby.spec
--- a/logstash.manifest	Fri May 10 15:01:48 2013 -0700
+++ b/logstash.manifest	Sat May 11 09:38:59 2013 -0700
@@ -1,12 +1,18 @@
 Class-Path: /usr/share/jruby.jar /usr/share/graphtastic-client.jar 
-  /usr/share/elasticsearch/elasticsearch.jar
-  /usr/share/elasticsearch/jna.jar
+  /usr/share/elasticsearch/lucene-core.jar
+  /usr/share/elasticsearch/lucene-analyzers-common.jar
+  /usr/share/elasticsearch/lucene-codecs.jar
+  /usr/share/elasticsearch/lucene-queries.jar
+  /usr/share/elasticsearch/lucene-memory.jar
+  /usr/share/elasticsearch/lucene-highlighter.jar
+  /usr/share/elasticsearch/lucene-queryparser.jar
+  /usr/share/elasticsearch/lucene-sandbox.jar
+  /usr/share/elasticsearch/lucene-suggest.jar
+  /usr/share/elasticsearch/lucene-join.jar
+  /usr/share/elasticsearch/lucene-grouping.jar
+  /usr/share/elasticsearch/lucene-spatial.jar
+  /usr/share/elasticsearch/spatial4j.jar
   /usr/share/elasticsearch/jts.jar
   /usr/share/elasticsearch/log4j.jar
-  /usr/share/elasticsearch/lucene-core.jar
-  /usr/share/elasticsearch/lucene-analyzers.jar
-  /usr/share/elasticsearch/lucene-highlighter.jar
-  /usr/share/elasticsearch/lucene-memory.jar
-  /usr/share/elasticsearch/lucene-queries.jar
-  /usr/share/elasticsearch/snappy-java.jar
-  /usr/share/elasticsearch/spatial4j.jar
+  /usr/share/elasticsearch/jna.jar
+  /usr/share/elasticsearch/elasticsearch.jar