You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ma...@apache.org on 2013/11/01 23:08:28 UTC
git commit: BIGTOP-1092. Adding Hue documentation package
Updated Branches:
refs/heads/master cb8a5a1d6 -> ddae974d3
BIGTOP-1092. Adding Hue documentation package
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ddae974d
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ddae974d
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ddae974d
Branch: refs/heads/master
Commit: ddae974d32bdcdff1ad90689f2fce62a96c6edac
Parents: cb8a5a1
Author: Sean Mackrory <ma...@apache.org>
Authored: Fri Nov 1 14:55:41 2013 -0700
Committer: Sean Mackrory <ma...@apache.org>
Committed: Fri Nov 1 14:55:41 2013 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hue/do-component-build | 4 +++-
bigtop-packages/src/common/hue/install_hue.sh | 4 ++++
bigtop-packages/src/deb/hue/control | 5 +++++
bigtop-packages/src/deb/hue/hue-doc.install | 1 +
bigtop-packages/src/rpm/hue/SPECS/hue.spec | 11 +++++++++++
.../package/src/main/resources/package_data.xml | 11 +++++++++++
6 files changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddae974d/bigtop-packages/src/common/hue/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hue/do-component-build b/bigtop-packages/src/common/hue/do-component-build
index 6c13e5f..659b403 100644
--- a/bigtop-packages/src/common/hue/do-component-build
+++ b/bigtop-packages/src/common/hue/do-component-build
@@ -19,7 +19,9 @@ set -ex
#FIXME: this needs to be fixed upstream
sed -i -e "s#${FULL_VERSION}-SNAPSHOT#${FULL_VERSION}#g" `grep -lR ${FULL_VERSION}-SNAPSHOT .`
-make MAVEN_VERSION='$(DESKTOP_VERSION)' apps
+make MAVEN_VERSION='$(DESKTOP_VERSION)' apps docs
+# Workaround for https://issues.cloudera.org/browse/HUE-1603
+rename .md .html build/docs/user-guide/*.md
# Make the entire tree relocatable
bash tools/relocatable.sh
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddae974d/bigtop-packages/src/common/hue/install_hue.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hue/install_hue.sh b/bigtop-packages/src/common/hue/install_hue.sh
index ab8c445..7dbc3a2 100644
--- a/bigtop-packages/src/common/hue/install_hue.sh
+++ b/bigtop-packages/src/common/hue/install_hue.sh
@@ -90,6 +90,7 @@ done
PREFIX=`echo $PREFIX | sed -e 's#/*$##'`
BUILD_DIR=`echo $BUILD_DIR | sed -e 's#/*$##'`
+DOC_DIR=${DOC_DIR:-/usr/share/doc/hue}
CONF_DIR=${CONF_DIR:-/etc/hue}
LIB_DIR=${LIB_DIR:-/usr/lib/hue}
VAR_DIR=${VAR_DIR:-/var/lib/hue}
@@ -182,6 +183,9 @@ done
# Remove bogus files
rm -fv `find $PREFIX -iname "build_log.txt"`
+install -d ${PREFIX}/${DOC_DIR}
+cp -r ${BUILD_DIR}/build/docs/* ${PREFIX}/${DOC_DIR}/
+
# FXIME: for Hue 3.0 the following section would need to go away (hence it is kept at the bottom)
# Move desktop.db to a var location
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddae974d/bigtop-packages/src/deb/hue/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control
index 20edf6a..d66ba65 100644
--- a/bigtop-packages/src/deb/hue/control
+++ b/bigtop-packages/src/deb/hue/control
@@ -42,6 +42,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, hue-common (= ${source:Version})
Description: Service Scripts for Hue
This package provides the service scripts for Hue server.
+Package: hue-doc
+Architecture: all
+Description: Documentation for Hue
+ This package provides the installation manual, user guide, SDK documentation, and release notes.
+
Package: hue-beeswax
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}), hive
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddae974d/bigtop-packages/src/deb/hue/hue-doc.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hue/hue-doc.install b/bigtop-packages/src/deb/hue/hue-doc.install
new file mode 100644
index 0000000..74eab93
--- /dev/null
+++ b/bigtop-packages/src/deb/hue/hue-doc.install
@@ -0,0 +1 @@
+/usr/share/doc/hue
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddae974d/bigtop-packages/src/rpm/hue/SPECS/hue.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
index 6b9aab6..8f150ee 100644
--- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec
+++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
@@ -307,6 +307,17 @@ This package provides the service scripts for Hue server.
%post -n %{name}-server
/sbin/chkconfig --add hue
+# Documentation
+%package -n %{name}-doc
+Summary: Documentation for Hue
+Group: Documentation
+
+%description -n %{name}-doc
+This package provides the installation manual, user guide, SDK documentation, and release notes.
+
+%files -n %{name}-doc
+%attr(0755,root,root) /usr/share/doc/hue
+
########################################
# Pre-uninstall
########################################
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ddae974d/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
index 69922e5..a47a275 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
@@ -998,6 +998,17 @@ It supports a file browser, job tracker interface, cluster health monitor, and m
<hue-common>/self</hue-common>
</deps>
</hue-server>
+ <hue-doc>
+ <metadata>
+ <summary>Documentation for Hue</summary>
+ <description>This package provides the installation manual, user guide, SDK documentation, and release notes.</description>
+ <url>http://github.com/cloudera/hue</url>
+ </metadata>
+ <deps>
+ </deps>
+ <alternatives>
+ </alternatives>
+ </hue-doc>
<hue-beeswax>
<metadata>
<summary>A UI for Hive on Hue</summary>