incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1177144 - in /incubator/bigtop/branches/hadoop-0.23: ./ bigtop-packages/src/common/hbase/ bigtop-packages/src/deb/hbase/ bigtop-packages/src/rpm/hbase/SPECS/
Date Thu, 29 Sep 2011 01:13:48 GMT
Author: rvs
Date: Thu Sep 29 01:13:48 2011
New Revision: 1177144

URL: http://svn.apache.org/viewvc?rev=1177144&view=rev
Log:
Enabling HBase

Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/install_hbase.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop.mk

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build?rev=1177144&r1=1177143&r2=1177144&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build
Thu Sep 29 01:13:48 2011
@@ -16,5 +16,4 @@
 
 set -ex
 
-mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} install assembly:assembly "$@"
-
+mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} -Dhadoop.profile=23 install site assembly:assembly
"$@"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/install_hbase.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/install_hbase.sh?rev=1177144&r1=1177143&r2=1177144&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/install_hbase.sh
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/install_hbase.sh
Thu Sep 29 01:13:48 2011
@@ -105,14 +105,14 @@ install -d -m 0755 $PREFIX/$BIN_DIR
 install -d -m 0755 $PREFIX/$ETC_DIR
 install -d -m 0755 $PREFIX/$MAN_DIR
 
-cp -ra lib/* ${PREFIX}/${LIB_DIR}/lib/
-cp hbase*.jar $PREFIX/$LIB_DIR
-cp -a docs/* $PREFIX/$DOC_DIR
-cp *.txt $PREFIX/$DOC_DIR/
-cp -a hbase-webapps $PREFIX/$LIB_DIR
+cp -ra $BUILD_DIR/lib/* ${PREFIX}/${LIB_DIR}/lib/
+cp $BUILD_DIR/hbase*.jar $PREFIX/$LIB_DIR
+cp -a $BUILD_DIR/docs/* $PREFIX/$DOC_DIR
+cp $BUILD_DIR/*.txt $PREFIX/$DOC_DIR/
+cp -a $BUILD_DIR/hbase-webapps $PREFIX/$LIB_DIR
 
-cp -a conf $PREFIX/$ETC_DIR/conf
-cp -a bin/* $PREFIX/$BIN_DIR
+cp -a $BUILD_DIR/conf $PREFIX/$ETC_DIR/conf
+cp -a $BUILD_DIR/bin/* $PREFIX/$BIN_DIR
 
 ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules?rev=1177144&r1=1177143&r2=1177144&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules Thu Sep 29 01:13:48
2011
@@ -46,7 +46,7 @@ install: build
 	dh_installdirs
 	cp debian/hbase.default debian/hadoop-hbase/etc/default/hbase
 	sh -x debian/install_hbase.sh \
-		--build-dir=. \
+		--build-dir=target/hbase-0.92/hbase-0.92 \
 		--doc-dir=usr/share/doc/hadoop-hbase-doc \
 		--prefix=debian/tmp
 	# Symlink in the dependency jars from their packages. Both of these packages

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1177144&r1=1177143&r2=1177144&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Thu
Sep 29 01:13:48 2011
@@ -147,7 +147,7 @@ Documentation for Hbase
 
 
 %prep
-%setup -n hbase-%{hbase_base_version}
+%setup -n apache-hbase-8146460
 
 %build
 env HBASE_VERSION=%{version} bash %{SOURCE1}
@@ -155,7 +155,7 @@ env HBASE_VERSION=%{version} bash %{SOUR
 %install
 %__rm -rf $RPM_BUILD_ROOT
 sh %{SOURCE2} \
-	--build-dir=. \
+	--build-dir=target/hbase-0.92/hbase-0.92 \
    --doc-dir=%{doc_hbase} \
 	--prefix=$RPM_BUILD_ROOT
 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1177144&r1=1177143&r2=1177144&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Thu Sep 29 01:13:48 2011
@@ -45,12 +45,14 @@ $(eval $(call PACKAGE,zookeeper,ZOOKEEPE
 HBASE_NAME=hbase
 HBASE_RELNOTES_NAME=Apache HBase
 HBASE_PKG_NAME=hadoop-hbase
-HBASE_BASE_VERSION=0.90.3
+HBASE_BASE_VERSION=0.92
 HBASE_PKG_VERSION=$(HBASE_BASE_VERSION)
 HBASE_RELEASE_VERSION=1
 HBASE_TARBALL_DST=hbase-$(HBASE_BASE_VERSION).tar.gz
-HBASE_TARBALL_SRC=$(HBASE_TARBALL_DST)
-HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-0.90.3/
+#HBASE_TARBALL_SRC=$(HBASE_TARBALL_DST)
+#HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-0.90.4/
+HBASE_TARBALL_SRC=8146460
+HBASE_SITE=https://github.com/apache/hbase/tarball
 $(eval $(call PACKAGE,hbase,HBASE))
 
 # Pig



Mime
View raw message