Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A81AD7ED for ; Sat, 22 Sep 2012 06:23:55 +0000 (UTC) Received: (qmail 2592 invoked by uid 500); 22 Sep 2012 06:23:54 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 2512 invoked by uid 500); 22 Sep 2012 06:23:53 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 2480 invoked by uid 99); 22 Sep 2012 06:23:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Sep 2012 06:23:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Sep 2012 06:23:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BD38B238899C; Sat, 22 Sep 2012 06:23:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1388738 - in /incubator/bigtop/trunk/bigtop-packages/src: common/hive/install_hive.sh deb/hive/rules rpm/hive/SPECS/hive.spec Date: Sat, 22 Sep 2012 06:23:02 -0000 To: bigtop-commits@incubator.apache.org From: bmahe@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120922062302.BD38B238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bmahe Date: Sat Sep 22 06:23:02 2012 New Revision: 1388738 URL: http://svn.apache.org/viewvc?rev=1388738&view=rev Log: BIGTOP-706. Make variables used in hive build/install scripts consistent (Anatoli Fomenko via Bruno Mahé) Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh?rev=1388738&r1=1388737&r2=1388738&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh (original) +++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh Sat Sep 22 06:23:02 2012 @@ -94,29 +94,29 @@ for var in PREFIX BUILD_DIR ; do fi done -MAN_DIR=$PREFIX/usr/share/man/man1 -DOC_DIR=${DOC_DIR:-$PREFIX/usr/share/doc/hive} -LIB_DIR=${LIB_DIR:-$PREFIX/usr/lib/hive} +MAN_DIR=/usr/share/man/man1 +DOC_DIR=${DOC_DIR:-/usr/share/doc/hive} +LIB_DIR=${LIB_DIR:-/usr/lib/hive} INSTALLED_LIB_DIR=${INSTALLED_LIB_DIR:-/usr/lib/hive} EXAMPLES_DIR=${EXAMPLES_DIR:-$DOC_DIR/examples} -BIN_DIR=${BIN_DIR:-$PREFIX/usr/bin} +BIN_DIR=${BIN_DIR:-/usr/bin} PYTHON_DIR=${PYTHON_DIR:-$LIB_DIR/lib/py} CONF_DIR=/etc/hive CONF_DIST_DIR=/etc/hive/conf.dist # First we'll move everything into lib -install -d -m 0755 ${LIB_DIR} -(cd ${BUILD_DIR} && tar -cf - .)|(cd ${LIB_DIR} && tar -xf -) +install -d -m 0755 ${PREFIX}/${LIB_DIR} +(cd ${BUILD_DIR} && tar -cf - .)|(cd ${PREFIX}/${LIB_DIR} && tar -xf -) for thing in conf README.txt examples lib/py; do - rm -rf ${LIB_DIR}/$thing + rm -rf ${PREFIX}/${LIB_DIR}/$thing done -install -d -m 0755 ${BIN_DIR} +install -d -m 0755 ${PREFIX}/${BIN_DIR} for file in hive do - wrapper=$BIN_DIR/$file + wrapper=${PREFIX}/$BIN_DIR/$file cat >>$wrapper < $MAN_DIR/hive.1.gz +install -d -m 0755 $PREFIX/$MAN_DIR +gzip -c hive.1 > $PREFIX/$MAN_DIR/hive.1.gz # Docs -install -d -m 0755 ${DOC_DIR} -cp ${BUILD_DIR}/README.txt ${DOC_DIR} -mv ${LIB_DIR}/NOTICE ${DOC_DIR} -mv ${LIB_DIR}/LICENSE ${DOC_DIR} -mv ${LIB_DIR}/RELEASE_NOTES.txt ${DOC_DIR} +install -d -m 0755 ${PREFIX}/${DOC_DIR} +cp ${BUILD_DIR}/README.txt ${PREFIX}/${DOC_DIR} +mv ${PREFIX}/${LIB_DIR}/NOTICE ${PREFIX}/${DOC_DIR} +mv ${PREFIX}/${LIB_DIR}/LICENSE ${PREFIX}/${DOC_DIR} +mv ${PREFIX}/${LIB_DIR}/RELEASE_NOTES.txt ${PREFIX}/${DOC_DIR} # Examples -install -d -m 0755 ${EXAMPLES_DIR} -cp -a ${BUILD_DIR}/examples/* ${EXAMPLES_DIR} +install -d -m 0755 ${PREFIX}/${EXAMPLES_DIR} +cp -a ${BUILD_DIR}/examples/* ${PREFIX}/${EXAMPLES_DIR} # Python libs -install -d -m 0755 ${PYTHON_DIR} -(cd $BUILD_DIR/lib/py && tar cf - .) | (cd ${PYTHON_DIR} && tar xf -) -chmod 755 ${PYTHON_DIR}/hive_metastore/*-remote +install -d -m 0755 ${PREFIX}/${PYTHON_DIR} +(cd $BUILD_DIR/lib/py && tar cf - .) | (cd ${PREFIX}/${PYTHON_DIR} && tar xf -) +chmod 755 ${PREFIX}/${PYTHON_DIR}/hive_metastore/*-remote # Dir for Metastore DB install -d -m 1777 $PREFIX/var/lib/hive/metastore/ # Remove some source which gets installed -rm -rf ${LIB_DIR}/lib/php/ext +rm -rf ${PREFIX}/${LIB_DIR}/lib/php/ext Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules?rev=1388738&r1=1388737&r2=1388738&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules (original) +++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules Sat Sep 22 06:23:02 2012 @@ -52,7 +52,7 @@ install-indep: metastore server sh debian/install_hive.sh \ --prefix=debian/${hive_pkg_name} \ --build-dir=src/build/dist \ - --doc-dir=debian/${hive_pkg_name}/usr/share/doc/${hive_pkg_name} + --doc-dir=/usr/share/doc/${hive_pkg_name} # We need to get rid of jars that happen to be shipped in other packages rm -f debian/${hive_pkg_name}/usr/lib/hive/lib/hbase-*.jar debian/${hive_pkg_name}/usr/lib/hive/lib/zookeeper-*.jar mkdir -p debian/${hive_pkg_name}-hbase/usr/lib/hive/lib Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1388738&r1=1388737&r2=1388738&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Sat Sep 22 06:23:02 2012 @@ -144,7 +144,7 @@ cp $RPM_SOURCE_DIR/hive-site.xml . /bin/bash %{SOURCE2} \ --prefix=$RPM_BUILD_ROOT \ --build-dir=%{hive_dist} \ - --doc-dir=$RPM_BUILD_ROOT/%{doc_hive} + --doc-dir=%{doc_hive} %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/ %__install -d -m 0755 $RPM_BUILD_ROOT/etc/default/