bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bm...@apache.org
Subject svn commit: r1229809 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src: common/hadoop/do-component-build deb/hadoop/rules rpm/hadoop/SPECS/hadoop.spec
Date Tue, 10 Jan 2012 23:48:19 GMT
Author: bmahe
Date: Tue Jan 10 23:48:19 2012
New Revision: 1229809

URL: http://svn.apache.org/viewvc?rev=1229809&view=rev
Log:
BIGTOP-338. Hadoop 0.23 doc package does not contain generated documentation

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

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build?rev=1229809&r1=1229808&r2=1229809&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
Tue Jan 10 23:48:19 2012
@@ -38,3 +38,7 @@ mvn site site:stage ${MAVEN_SKIP_TESTS} 
 (cd build ; tar --strip-components=1 -xzvf  ../hadoop-dist/target/hadoop-${HADOOP_VERSION}.tar.gz)
 (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/
+

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1229809&r1=1229808&r2=1229809&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules Tue Jan 10
23:48:19 2012
@@ -25,7 +25,6 @@ export DH_OPTIONS
 
 
 hadoop_version=${HADOOP_BASE_VERSION}
-hadoop_build_path=$(shell pwd)/hadoop-dist/target/hadoop-${hadoop_version}
 
 ifeq (${DEB_BUILD_ARCH},amd64)
   native_dir=Linux-amd64-64
@@ -59,7 +58,7 @@ install: build
 	bash debian/install_hadoop.sh \
 	  --prefix=debian/tmp/ \
 	  --distro-dir=debian \
-	  --build-dir=${hadoop_build_path} \
+	  --build-dir=${PWD}/build \
 	  --system-lib-dir=debian/tmp/usr/lib/ \
 	  --system-libexec-dir=debian/tmp/usr/libexec/ \
 	  --system-include-dir=debian/tmp/usr/include \

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1229809&r1=1229808&r2=1229809&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Tue Jan 10 23:48:19 2012
@@ -280,7 +280,7 @@ env HADOOP_VERSION=%{hadoop_base_version
 
 bash %{SOURCE2} \
   --distro-dir=$RPM_SOURCE_DIR \
-  --build-dir=$PWD/hadoop-dist/target/hadoop-%{hadoop_base_version} \
+  --build-dir=$PWD/build \
   --system-include-dir=$RPM_BUILD_ROOT%{_includedir} \
   --system-lib-dir=$RPM_BUILD_ROOT%{_libdir} \
   --system-libexec-dir=$RPM_BUILD_ROOT%{libexecdir} \



Mime
View raw message