Updated Branches: refs/heads/master 9a90bdf63 -> 15177dc1b
BIGTOP-963. bump version of Whirr to 0.8.2 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/7d6f0817 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/7d6f0817 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/7d6f0817 Branch: refs/heads/master Commit: 7d6f0817928304659a0cfd451eeaa7fb3c7f47a9 Parents: 9a90bdf Author: Roman Shaposhnik <[email protected]> Authored: Wed Apr 17 19:09:49 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Fri May 3 11:50:17 2013 -0700 ---------------------------------------------------------------------- .../src/common/whirr/do-component-build | 3 ++- bigtop-packages/src/rpm/whirr/SPECS/whirr.spec | 4 ++-- bigtop.mk | 14 ++++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/7d6f0817/bigtop-packages/src/common/whirr/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/whirr/do-component-build b/bigtop-packages/src/common/whirr/do-component-build index cf833a5..a7843b2 100644 --- a/bigtop-packages/src/common/whirr/do-component-build +++ b/bigtop-packages/src/common/whirr/do-component-build @@ -18,7 +18,8 @@ set -ex # BIGTOP-472 whirr build needs more perm gen space export MAVEN_OPT="-XX:MaxPermSize=128m" -mvn clean -Pjavadoc site source:jar package assembly:assembly -DskipTests "$@" +mvn -Pjavadoc -DskipTests clean install -DskipTests "$@" +mvn -Pjavadoc site source:jar package assembly:assembly -DskipTests "$@" mkdir build tar -C build --strip-components=1 -xzf target/*.tar.gz http://git-wip-us.apache.org/repos/asf/bigtop/blob/7d6f0817/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec b/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec index f99d842..edece5e 100644 --- a/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec +++ b/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec @@ -33,7 +33,7 @@ Group: Development/Libraries BuildArch: noarch Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) License: ASL 2.0 -Source0: %{name}-%{whirr_base_version}.tar.gz +Source0: %{name}-%{whirr_base_version}-src.tar.gz Source1: do-component-build Source2: install_%{name}.sh Source3: whirr.1 @@ -51,7 +51,7 @@ Whirr provides %prep -%setup -n %{name}-%{whirr_base_version} +%setup -n %{name}-%{whirr_base_version}-src %build bash %{SOURCE1} http://git-wip-us.apache.org/repos/asf/bigtop/blob/7d6f0817/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 4ddd859..18858b5 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -131,14 +131,16 @@ $(eval $(call PACKAGE,oozie,OOZIE)) WHIRR_NAME=whirr WHIRR_RELNOTES_NAME=Apache Whirr WHIRR_PKG_NAME=whirr -WHIRR_BASE_VERSION=0.8.1 -WHIRR_PKG_VERSION=0.8.1 +WHIRR_BASE_VERSION=0.8.2 +WHIRR_PKG_VERSION=0.8.2 WHIRR_RELEASE_VERSION=1 -WHIRR_TARBALL_DST=whirr-$(WHIRR_BASE_VERSION).tar.gz +WHIRR_TARBALL_DST=whirr-$(WHIRR_BASE_VERSION)-src.tar.gz WHIRR_TARBALL_SRC=$(WHIRR_TARBALL_DST) -WHIRR_DOWNLOAD_PATH=/whirr/whirr-$(WHIRR_BASE_VERSION) -WHIRR_SITE=$(APACHE_MIRROR)$(WHIRR_DOWNLOAD_PATH) -WHIRR_ARCHIVE=$(APACHE_ARCHIVE)$(WHIRR_DOWNLOAD_PATH) +#WHIRR_DOWNLOAD_PATH=/whirr/whirr-$(WHIRR_BASE_VERSION) +#WHIRR_SITE=$(APACHE_MIRROR)$(WHIRR_DOWNLOAD_PATH) +#WHIRR_ARCHIVE=$(APACHE_ARCHIVE)$(WHIRR_DOWNLOAD_PATH) +WHIRR_SITE=http://people.apache.org/~abayer/whirr-0.8.2-candidate-2/ +WHIRR_ARCHIVE=$(WHIRR_SITE) $(eval $(call PACKAGE,whirr,WHIRR)) # Mahout
