Skip to content

Commit 6e2de06

Browse files
jordansisseljordansissel
committed
Merge pull request elastic#1089 from jordansissel/link-to-tarball
Link to tarball
2 parents 5e17988 + 25d5f91 commit 6e2de06

File tree

9 files changed

+39
-40
lines changed

9 files changed

+39
-40
lines changed

‎CHANGELOG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1.4.0 (???)
1+
1.4.0 beta1 (Feb 20, 2014)
22
# general
33
- Elasticsearch 1.0 libraries are now included. See the Elasticsearch
44
release notes for details: http://www.elasticsearch.org/downloads/1-0-0/

‎Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ build/flatgems: | build vendor/bundle
288288
$(QUIET)rsync -a $(VENDOR_DIR)/gems/user_agent_parser-*/vendor/ua-parser $@/vendor
289289
$(QUIET)rsync -a $(VENDOR_DIR)/gems/aws-sdk-*/ca-bundle.crt $@/root/
290290
@# A lame hack to work around the aws-sdk bug (LOGSTASH-1718)
291-
sed -i "" -e "s@SRC = ROOT + '/lib/aws'@SRC = ROOT + 'aws'@" $@/lib/aws/core.rb
291+
sed -i -e "s@SRC = ROOT + '/lib/aws'@SRC = ROOT + 'aws'@" $@/lib/aws/core.rb
292292

293293

294294
flatjar-test:
@@ -351,19 +351,19 @@ build/docs/tutorials/getting-started-with-logstash.xml: docs/tutorials/getting-s
351351
# bluecloth gem doesn't work on jruby. Use ruby.
352352
build/docs/inputs/%.html: lib/logstash/inputs/%.rb docs/docgen.rb docs/plugin-doc.html.erb | build/docs/inputs
353353
$(QUIET)ruby docs/docgen.rb -o build/docs $<
354-
$(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@
355-
$(QUIET)sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@
354+
$(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@
355+
$(QUIET)sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@
356356
build/docs/filters/%.html: lib/logstash/filters/%.rb docs/docgen.rb docs/plugin-doc.html.erb | build/docs/filters
357357
$(QUIET)ruby docs/docgen.rb -o build/docs $<
358-
$(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@
359-
$(QUIET)sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@
358+
$(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@
359+
$(QUIET)sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@
360360
build/docs/outputs/%.html: lib/logstash/outputs/%.rb docs/docgen.rb docs/plugin-doc.html.erb | build/docs/outputs
361361
$(QUIET)ruby docs/docgen.rb -o build/docs $<
362-
$(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@
363-
$(QUIET)sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@
362+
$(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@
363+
$(QUIET)sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@
364364
build/docs/codecs/%.html: lib/logstash/codecs/%.rb docs/docgen.rb docs/plugin-doc.html.erb | build/docs/codecs
365365
$(QUIET)ruby docs/docgen.rb -o build/docs $<
366-
$(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@
366+
$(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@
367367

368368
build/docs/%: docs/% lib/logstash/version.rb Makefile
369369
@echo "Copying $< (to $@)"
@@ -372,17 +372,17 @@ build/docs/%: docs/% lib/logstash/version.rb Makefile
372372
$(QUIET)case "$(suffix $<)" in \
373373
.gz|.bz2|.png|.jpg) ;; \
374374
*) \
375-
sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@ ; \
376-
sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ ; \
375+
sed -i -e 's/%VERSION%/$(VERSION)/g' $@ ; \
376+
sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@ ; \
377377
;; \
378378
esac
379379

380380
build/docs/index.html: $(addprefix build/docs/,$(subst lib/logstash/,,$(subst .rb,.html,$(PLUGIN_FILES))))
381381
build/docs/index.html: docs/generate_index.rb lib/logstash/version.rb docs/index.html.erb Makefile
382382
@echo "Building documentation index.html"
383383
$(QUIET)ruby $< build/docs > $@
384-
$(QUIET)sed -i "" -e 's/%VERSION%/$(VERSION)/g' $@
385-
$(QUIET)sed -i "" -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@
384+
$(QUIET)sed -i -e 's/%VERSION%/$(VERSION)/g' $@
385+
$(QUIET)sed -i -e 's/%ELASTICSEARCH_VERSION%/$(ELASTICSEARCH_VERSION)/g' $@
386386

387387
.PHONY: patterns
388388
patterns:
@@ -453,8 +453,8 @@ prepare-tarball:
453453
@echo "=> Preparing tarball"
454454
$(QUIET)$(MAKE) $(WORKDIR)
455455
$(QUIET)rsync -a --relative bin lib spec locales patterns vendor/bundle/jruby vendor/geoip vendor/jar vendor/kibana vendor/ua-parser vendor/collectd LICENSE README.md --exclude 'vendor/bundle/jruby/1.9/cache' --exclude 'vendor/bundle/jruby/1.9/gems/*/doc' --exclude 'vendor/jar/elasticsearch-$(ELASTICSEARCH_VERSION).tar.gz' $(WORKDIR)
456-
$(QUIET)sed -i "" -e 's/^LOGSTASH_VERSION = .*/LOGSTASH_VERSION = "$(VERSION)"/' $(WORKDIR)/lib/logstash/version.rb
457-
$(QUIET)sed -i "" -e 's/%JRUBY_VERSION%/$(JRUBY_VERSION)/' $(WORKDIR)/bin/logstash.bat
456+
$(QUIET)sed -i -e 's/^LOGSTASH_VERSION = .*/LOGSTASH_VERSION = "$(VERSION)"/' $(WORKDIR)/lib/logstash/version.rb
457+
$(QUIET)sed -i -e 's/%JRUBY_VERSION%/$(JRUBY_VERSION)/' $(WORKDIR)/bin/logstash.bat
458458

459459
.PHONY: tarball
460460
tarball: | build/logstash-$(VERSION).tar.gz

‎docs/extending/example-add-a-new-filter.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,27 +91,14 @@ plugin.
9191
You can use the agent flag --pluginpath flag to specify where the root of your
9292
plugin tree is. In our case, it's the current directory.
9393

94-
% logstash --pluginpath . -f example.conf
95-
96-
If you use the jar release of logstash, you have an additional option - you can
97-
include the plugin right in the jar file.
98-
99-
# This command will take your 'logstash/filters/foo.rb' file
100-
# and add it into the jar file.
101-
% jar -uf logstash-%VERSION%-flatjar.jar logstash/filters/foo.rb
102-
103-
# Verify it's in the right location in the jar!
104-
% jar tf logstash-%VERSION%-flatjar.jar | grep foo.rb
105-
logstash/filters/foo.rb
106-
107-
% java -jar logstash-%VERSION%-flatjar.jar agent -f example.conf
94+
% bin/logstash --pluginpath your/plugin/root -f example.conf
10895

10996
## Example running
11097

11198
In the example below, I typed in "the quick brown fox" after running the java
11299
command.
113100

114-
% java -jar logstash-%VERSION%-flatjar.jar agent -f example.conf
101+
% bin/logstash -f example.conf
115102
the quick brown fox
116103
2011-05-12T01:05:09.495000Z stdin://snack.home/: Hello world!
117104

‎docs/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ layout: content_right
66

77
<h3> For Users </h3>
88
<ul>
9-
<li> <a href="https://download.elasticsearch.org/logstash/logstash/logstash-%VERSION%-flatjar.jar"> download logstash %VERSION% </a> </li>
9+
<li> <a href="https://download.elasticsearch.org/logstash/logstash/logstash-%VERSION%.tar.gz"> download logstash %VERSION% </a> </li>
1010
<li> <a href="repositories"> package repositories</a> </li>
1111
<li> <a href="configuration"> configuration file overview </a> </li>
1212
<li> <a href="configuration#conditionals">conditionals</a> </li>

‎docs/learn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ for such things, that works for me, too.)
3838

3939
## Download It
4040

41-
[Download logstash-%VERSION%](https://download.elasticsearch.org/logstash/logstash/logstash-%VERSION%-flatjar.jar)
41+
[Download logstash-%VERSION%](https://download.elasticsearch.org/logstash/logstash/logstash-%VERSION%.tar.gz)
4242

4343
## What's next?
4444

‎docs/release-engineering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ right? ;)
2424

2525
* Make sure all tests pass (make test)
2626
* `ruby bin/logstash test`
27-
* `java -jar logstash-x.y.z-flatjar.jar test`
27+
* `java -jar logstash-x.y.z.tar.gz test`
2828
* Update VERSION.rb
2929
* VERSION=$(ruby -r./VERSION -e 'puts LOGSTASH_VERSION')
3030
* Ensure CHANGELOG is up-to-date

‎docs/tutorials/10-minute-walkthrough/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ layout: content_right
88

99
### Download logstash:
1010

11-
* [logstash-%VERSION%-flatjar.jar](https://download.elasticsearch.org/logstash/logstash/logstash-%VERSION%-flatjar.jar)
11+
* [logstash-%VERSION%.tar.gz](https://download.elasticsearch.org/logstash/logstash/logstash-%VERSION%.tar.gz)
1212

1313
### Requirements:
1414

‎docs/tutorials/getting-started-with-logstash.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ Once you have verified the existence of Java on your system, we can move on!
2828
=== Logstash in two commands
2929
First, we're going to download the pre-built logstash binary and run it with a very simple configuration.
3030
----
31-
curl -O https://download.elasticsearch.org/logstash/logstash/logstash-%VERSION%-flatjar.jar
31+
curl -O https://download.elasticsearch.org/logstash/logstash/logstash-%VERSION%.tar.gz
3232
----
33-
Now you should have the file named 'logstash-%VERSION%-flatjar.jar' on your local filesystem. Let's run it:
33+
Now you should have the file named 'logstash-%VERSION%.tar.gz' on your local filesystem. Let's run it:
3434
----
3535
bin/logstash -e 'input { stdin { } } output { stdout {} }'
3636
----

‎tools/release.sh

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ prepare() {
2525
rm -f $logstash/.VERSION.mk
2626
make -C $logstash .VERSION.mk
2727
cp $logstash/.VERSION.mk $workdir
28+
rm -f $workdir/build/pkg
29+
rm -f $workdir/build/*.{zip,rpm,gz,deb} || true
2830
}
2931

3032
docs() {
@@ -34,17 +36,27 @@ docs() {
3436
}
3537

3638
tests() {
37-
make -C $workdir test
38-
make -C $workdir tarball test
39+
USE_JRUBY=1 make -C $logstash test QUIET=
40+
USE_JRUBY=1 make -C $logstash tarball test QUIET=
3941
}
4042

4143
packages() {
4244
for path in $logstash $contrib ; do
4345
rm -f $path/build/*.tar.gz
4446
rm -f $path/build/*.zip
4547
echo "Building packages: $path"
46-
make -C $path tarball package
47-
(cd $path/build; cp *.gz *.rpm *.deb *.zip $workdir/build)
48+
make -C $path tarball
49+
[ "$path" = "$logstash" ] && make -C $path flatjar
50+
for dir in build pkg ; do
51+
[ ! -d "$path/$dir" ] && continue
52+
(cd $path/$dir;
53+
for i in *.gz *.rpm *.deb *.zip *.jar ; do
54+
[ ! -f "$i" ] && continue
55+
echo "Copying $path/$dir/$i"
56+
cp $path/$dir/$i $workdir/build
57+
done
58+
)
59+
done
4860
done
4961
}
5062

0 commit comments

Comments
 (0)