incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1352718 - in /incubator/bigtop/trunk: bigtop-packages/src/common/hadoop/do-component-build bigtop.mk
Date Thu, 21 Jun 2012 22:31:03 GMT
Author: rvs
Date: Thu Jun 21 22:31:03 2012
New Revision: 1352718

URL: http://svn.apache.org/viewvc?rev=1352718&view=rev
Log:
BIGTOP-359. documentation build is picked from the wrong place

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
    incubator/bigtop/trunk/bigtop.mk

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build?rev=1352718&r1=1352717&r2=1352718&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build Thu Jun 21
22:31:03 2012
@@ -33,8 +33,8 @@ mvn site site:stage ${MAVEN_SKIP_TESTS} 
 (cd build/src ; tar --strip-components=1 -xzvf  ../../hadoop-dist/target/hadoop-${HADOOP_VERSION}-src.tar.gz)
 
 # Copy generated docs
-mkdir -p build/share/doc/
-cp -r target/site/* build/share/doc/
+mkdir -p build/share
+cp -r target/staging/hadoop-project build/share/doc
 
 # Create a manifest for hadoop client package
 (cd hadoop-client/target/hadoop-client-*/share/hadoop/client/lib ; ls) > build/hadoop-client.list

Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1352718&r1=1352717&r2=1352718&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Thu Jun 21 22:31:03 2012
@@ -22,12 +22,10 @@ HADOOP_BASE_VERSION=2.0.0-alpha
 HADOOP_PKG_VERSION=2.0.0
 HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
-#HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)
-#HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH)
-#HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
-HADOOP_TARBALL_SRC=hadoop-2.0.0-alpha-src.tar.gz 
-HADOOP_SITE=http://people.apache.org/~acmurthy/hadoop-2.0.0-alpha-rc1/
-HADOOP_ARCHIVE=$(HADOOP_SITE)
+HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz 
+HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)
+HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH)
+HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,hadoop,HADOOP))
 
 # ZooKeeper



Mime
View raw message