incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1244163 - in /incubator/bigtop/trunk: bigtop-packages/src/common/hadoop/do-component-build bigtop-packages/src/common/hadoop/install_hadoop.sh bigtop.mk
Date Tue, 14 Feb 2012 18:51:03 GMT
Author: rvs
Date: Tue Feb 14 18:51:03 2012
New Revision: 1244163

URL: http://svn.apache.org/viewvc?rev=1244163&view=rev
Log:
BIGTOP-353. Bump version of Hadoop to 1.0.0

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
    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=1244163&r1=1244162&r2=1244163&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 Tue Feb 14
18:51:03 2012
@@ -17,7 +17,7 @@
 set -ex
 
 # FIXME: BIGTOP-137
-chmod 777 src/c++/task-controller/configure
+chmod 777 src/c++/task-controller/configure || :
 
 
 # This is a poor man version comparison of autoconf.

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1244163&r1=1244162&r2=1244163&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh Tue Feb 14
18:51:03 2012
@@ -163,7 +163,7 @@ cp -a $BUILD_SRC_DIR/examples/* $EXAMPLE
 
 # Install docs
 mkdir -p $DOC_DIR
-cp -r ./docs/* $DOC_DIR
+cp -r $BUILD_DIR/docs/* $DOC_DIR
 
 # Install source
 mkdir -p ${SRC_DIR}
@@ -281,13 +281,13 @@ EOF
 
   # Pipes
   mkdir -p $PREFIX/$SYSTEM_LIB_DIR $PREFIX/usr/include
-  cp ./c++/${NATIVE_BUILD_STRING}/lib/libhadooppipes.a \
-      ./c++/${NATIVE_BUILD_STRING}/lib/libhadooputils.a \
+  cp ${BUILD_DIR}/c++/${NATIVE_BUILD_STRING}/lib/libhadooppipes.a \
+      ${BUILD_DIR}/c++/${NATIVE_BUILD_STRING}/lib/libhadooputils.a \
       $PREFIX/$SYSTEM_LIB_DIR
-  cp -r ./c++/${NATIVE_BUILD_STRING}/include/hadoop $PREFIX/usr/include/
+  cp -r ${BUILD_DIR}/c++/${NATIVE_BUILD_STRING}/include/hadoop $PREFIX/usr/include/
 
   # libhdfs
-  cp ./build/c++/${NATIVE_BUILD_STRING}/lib/libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR
+  cp ${BUILD_DIR}/c++/${NATIVE_BUILD_STRING}/lib/libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR
   ln -sf libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR/libhdfs.so.0
 
   # libhdfs-devel - hadoop doesn't realy install these things in nice places :(

Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1244163&r1=1244162&r2=1244163&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Tue Feb 14 18:51:03 2012
@@ -18,8 +18,8 @@ BIGTOP_VERSION=0.3.0-incubating
 # Hadoop 0.20.0-based hadoop package
 HADOOP_NAME=hadoop
 HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=0.20.205.0
-HADOOP_PKG_VERSION=0.20.205.0
+HADOOP_BASE_VERSION=1.0.0
+HADOOP_PKG_VERSION=$(HADOOP_BASE_VERSION)
 HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
 HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)



Mime
View raw message