svn commit: r1187084 - in /incubator/bigtop/trunk/bigtop-packages/src: common/whirr/do-component-build common/whirr/install_whirr.sh deb/whirr/rules rpm/whirr/SPECS/whirr.spec

[rv...@apache.org]

Author: rvs
Date: Thu Oct 20 22:05:09 2011
New Revision: 1187084

URL: http://svn.apache.org/viewvc?rev=1187084&view=rev
Log:
BIGTOP-125. whir package is full of build artifacts

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh
    incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules
    incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build?rev=1187084&r1=1187083&r2=1187084&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build Thu Oct 20 22:05:09 2011
@@ -16,5 +16,7 @@
 
 set -ex
 
-mvn clean source:jar install assembly:assembly -Pjavadoc site "$@"
+mvn clean -Pjavadoc site source:jar package assembly:assembly -DskipTests "$@" 
 
+mkdir build
+tar -C build --strip-components=1 -xzf target/*.tar.gz

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh?rev=1187084&r1=1187083&r2=1187084&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh Thu Oct 20 22:05:09 2011
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -114,3 +114,8 @@ chmod 755 $BIN_DIR/whirr
 
 install -d -m 0755 $MAN_DIR
 gzip -c whirr.1 > $MAN_DIR/whirr.1.gz
+
+# Move the docs, but leave a symlink in place for compat. reasons
+install -d -m 0755 $DOC_DIR
+mv $LIB_DIR/docs/* $DOC_DIR
+ln -s /${DOC_DIR/#$PREFIX/} $LIB_DIR/docs

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules?rev=1187084&r1=1187083&r2=1187084&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules Thu Oct 20 22:05:09 2011
@@ -41,15 +41,15 @@ build-indep-stamp: patch-stamp
 	mkdir -p debian/tmp
 	# NOTE: FIXME me right away
 	cp -r debian/whirr.1 .
-	tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
 	touch $@
 
 install: install-indep
 install-indep:	
 	dh_testdir
 	dh_testroot
-	sh -x debian/install_whirr.sh \
-	  --build-dir=debian/tmp \
+	bash -x debian/install_whirr.sh \
+	  --build-dir=build \
+	  --doc-dir=debian/whirr/usr/share/doc/whirr \
 	  --prefix=debian/whirr
 	(dh_lintian) || /bin/true
 

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec?rev=1187084&r1=1187083&r2=1187084&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec Thu Oct 20 22:05:09 2011
@@ -15,6 +15,12 @@
 %define lib_whirr /usr/lib/whirr
 %define man_dir /usr/share/man
 
+%if  %{?suse_version:1}0
+  %define doc_whirr %{_docdir}/whirr
+%else
+  %define doc_whirr %{_docdir}/whirr-%{package_version}
+%endif
+
 # disable repacking jars
 %define __os_install_post %{nil}
 
@@ -52,8 +58,9 @@ bash %{SOURCE1}
 %install
 %__rm -rf $RPM_BUILD_ROOT
 cp $RPM_SOURCE_DIR/whirr.1 .
-sh %{SOURCE2} \
-          --build-dir=. \
+bash %{SOURCE2} \
+          --build-dir=build \
+	  --doc-dir=$RPM_BUILD_ROOT%{doc_whirr} \
           --prefix=$RPM_BUILD_ROOT
 
 %files 
@@ -61,4 +68,4 @@ sh %{SOURCE2} \
 %attr(0755,root,root) %{lib_whirr}
 %attr(0755,root,root) %{_bindir}/%{name}
 %doc %attr(0644,root,root) %{man_dir}/man1/whirr.1.gz
-%ghost %{lib_whirr}/cli/whirr.log
+%doc %{doc_whirr}