Skip to content

Commit

Permalink
- add 'packages' target
Browse files Browse the repository at this point in the history
- bump to 1.1.10.rc1
  • Loading branch information
jordansissel committed Apr 16, 2013
1 parent cb8a8ba commit 7466375
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -332,3 +332,10 @@ releaseNote:
-$(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)ruby pull_release_note.rb

packages: # flatjar
(cd pkg; \
./build.sh ubuntu 12.10; \
./build.sh centos 6; \
./build.sh debian 6; \
)
2 changes: 1 addition & 1 deletion lib/logstash/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The version of logstash.
LOGSTASH_VERSION = "1.1.10.dev"
LOGSTASH_VERSION = "1.1.10.rc1"

# Note to authors: this should not include dashes because 'gem' barfs if
# you include a dash in the version string.
17 changes: 11 additions & 6 deletions pkg/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

VERSION=1.1.9

VERSION="$(awk -F\" '/LOGSTASH_VERSION/ {print $2}' $(dirname $0)/../lib/logstash/version.rb)"

if [ "$#" -ne 2 ] ; then
echo "Usage: $0 <os> <release>"
Expand All @@ -12,6 +13,8 @@ fi
os=$1
release=$2

echo "Building package for $os $release"

destdir=build/
prefix=/opt/logstash

Expand All @@ -21,13 +24,15 @@ fi

mkdir -p $destdir/$prefix


# install logstash.jar
if [ ! -f "$(dirname $0)/../build/logstash-$VERSION-flatjar.jar" ] ; then
echo "Unable to find logstash-$VERSION-flatjar.jar"
jar="$(dirname $0)/../build/logstash-$VERSION-flatjar.jar"
if [ ! -f "$jar" ] ; then
echo "Unable to find $jar"
exit 1
fi

cp $(dirname $0)/../build/logstash-$VERSION-flatjar $destdir/$prefix
cp $jar $destdir/$prefix/

case $os@$release in
centos@*)
Expand Down Expand Up @@ -73,7 +78,7 @@ case $os in
--before-install centos/before-install.sh \
--before-remove centos/before-remove.sh \
--after-install centos/after-install.sh \
-C $destdir .
-f -C $destdir .
;;
ubuntu|debian)
fpm -s dir -t deb -n logstash -v "$VERSION" \
Expand All @@ -82,6 +87,6 @@ case $os in
--before-install ubuntu/before-install.sh \
--before-remove ubuntu/before-remove.sh \
--after-install ubuntu/after-install.sh \
-C $destdir .
-f -C $destdir .
;;
esac

0 comments on commit 7466375

Please sign in to comment.