BIGTOP-926. Bump version of Giraph to 1.0.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/bbd034e2 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/bbd034e2 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/bbd034e2 Branch: refs/heads/master Commit: bbd034e2480c9891299d789c993045ec0403a31d Parents: a07ebbb Author: Roman Shaposhnik <[email protected]> Authored: Mon Apr 15 12:55:37 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Thu May 2 09:59:42 2013 -0700 ---------------------------------------------------------------------- .../src/common/giraph/do-component-build | 6 ++- .../src/common/giraph/install_giraph.sh | 28 ++++++++++----- bigtop-packages/src/deb/giraph/rules | 2 +- bigtop-packages/src/rpm/giraph/SPECS/giraph.spec | 5 +-- bigtop.mk | 15 +++----- 5 files changed, 32 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop-packages/src/common/giraph/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/giraph/do-component-build b/bigtop-packages/src/common/giraph/do-component-build index d7c744e..76106f7 100644 --- a/bigtop-packages/src/common/giraph/do-component-build +++ b/bigtop-packages/src/common/giraph/do-component-build @@ -18,5 +18,7 @@ set -ex . `dirname $0`/bigtop.bom -mvn -Phadoop_trunk -DskipTests -Dhadoop.version=$HADOOP_VERSION site package "$@" -tar --strip-components 1 -C target -xzf target/giraph-*-bin.tar.gz +mvn -Phadoop_yarn -DskipTests -Dhadoop.version=$HADOOP_VERSION clean package "$@" +# FIXME: GIRAPH-640 +# mvn -Phadoop_yarn -DskipTests -Dhadoop.version=$HADOOP_VERSION site "$@" +(cd giraph-core/target ; tar --strip-components 1 -xzf giraph-*-bin.tar.gz) http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop-packages/src/common/giraph/install_giraph.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/giraph/install_giraph.sh b/bigtop-packages/src/common/giraph/install_giraph.sh index c9d51d0..011ef77 100644 --- a/bigtop-packages/src/common/giraph/install_giraph.sh +++ b/bigtop-packages/src/common/giraph/install_giraph.sh @@ -107,20 +107,30 @@ CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist} install -d -m 0755 ${PREFIX}/${LIB_DIR} +# Installing Giraph core install -d -m 0755 ${PREFIX}/${LIB_DIR} -mv $BUILD_DIR/lib/giraph*.jar $BUILD_DIR/ -cp $BUILD_DIR/giraph*.jar ${PREFIX}/${LIB_DIR} +cp $BUILD_DIR/giraph-core/target/*.jar ${PREFIX}/${LIB_DIR} install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib -cp -a $BUILD_DIR/lib/*.jar ${PREFIX}/${LIB_DIR}/lib +cp $BUILD_DIR/giraph-core/target/lib/*.jar ${PREFIX}/${LIB_DIR}/lib -install -d -m 0755 $PREFIX/usr/bin +# Installing various Giraph modules +cp $BUILD_DIR/giraph-hive/target/*.jar ${PREFIX}/${LIB_DIR} +# FIXME: cp $BUILD_DIR/giraph-hbase/target/*.jar ${PREFIX}/${LIB_DIR} +# FIXME: cp $BUILD_DIR/giraph-hcatalog/target/*.jar ${PREFIX}/${LIB_DIR} -install -d -m 0755 $PREFIX/${BIN_DIR} -cp $BUILD_DIR/bin/* $PREFIX/${BIN_DIR} +# Remove things we don't need +rm -f ${PREFIX}/${LIB_DIR}/*tests.jar ${PREFIX}/${LIB_DIR}/*javadoc.jar ${PREFIX}/${LIB_DIR}/*sources.jar +# Installing docs and examples install -d -m 0755 $PREFIX/${DOC_DIR} -cp -r $BUILD_DIR/docs/* $PREFIX/${DOC_DIR} +cp -r $BUILD_DIR/giraph-core/target/site/apidocs/* $PREFIX/${DOC_DIR} +cp $BUILD_DIR/giraph-examples/target/*.jar $PREFIX/${DOC_DIR} + +# Install executable wrappers +install -d -m 0755 $PREFIX/usr/bin +install -d -m 0755 $PREFIX/${BIN_DIR} +cp $BUILD_DIR/bin/* $PREFIX/${BIN_DIR} for i in giraph ; do #echo "Copying manpage $i" @@ -151,8 +161,8 @@ unlink $PREFIX/$LIB_DIR/conf || /bin/true ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf # Create version independent symlinks -ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*jar | grep -v javadoc.jar | grep -v sources.jar | grep -v tests.jar | grep -v jar-with-dependencies.jar` $PREFIX/$LIB_DIR/giraph.jar -ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*jar | grep jar-with-dependencies.jar` $PREFIX/$LIB_DIR/giraph-jar-with-dependencies.jar +ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*jar | grep -v jar-with-dependencies.jar | grep -v giraph-hive` $PREFIX/$LIB_DIR/giraph.jar +ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*jar | grep jar-with-dependencies.jar | grep -v giraph-hive` $PREFIX/$LIB_DIR/giraph-jar-with-dependencies.jar # Workaround for GIRAPH-205 ln -s ../giraph.jar $PREFIX/$LIB_DIR/lib http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop-packages/src/deb/giraph/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/giraph/rules b/bigtop-packages/src/deb/giraph/rules index fc62b3a..7b3a15a 100644 --- a/bigtop-packages/src/deb/giraph/rules +++ b/bigtop-packages/src/deb/giraph/rules @@ -31,7 +31,7 @@ override_dh_auto_build: override_dh_auto_install: sh -x debian/install_giraph.sh \ - --build-dir=target \ + --build-dir=${PWD} \ --conf-dir=/etc/giraph/conf.dist \ --doc-dir=/usr/share/doc/giraph \ --prefix=debian/giraph http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec index 430308f..d2650b7 100644 --- a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec +++ b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec @@ -65,8 +65,7 @@ Requires: zookeeper, hadoop-client, bigtop-utils >= 0.6 Giraph implements a graph processing platform to run large scale algorithms (such as page rank, shared connections, personalization-based popularity, etc.) on top of Hadoop infrastructure. Giraph builds upon the graph-oriented nature of Pregel but additionally adds fault-tolerance to the coordinator process with the use of ZooKeeper as its centralized coordination service. %prep -#%setup -n %{name}-%{giraph_base_version}-src -%setup -n apache-giraph-79962a3 +%setup -n %{name}-%{giraph_base_version} %build bash %{SOURCE1} @@ -74,7 +73,7 @@ bash %{SOURCE1} %install %__rm -rf $RPM_BUILD_ROOT sh %{SOURCE2} \ - --build-dir=target \ + --build-dir=`pwd` \ --conf-dir=%{conf_giraph}.dist \ --doc-dir=%{doc_giraph} \ --prefix=$RPM_BUILD_ROOT http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 64563ff..4ddd859 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -173,17 +173,14 @@ $(eval $(call PACKAGE,flume,FLUME)) GIRAPH_NAME=giraph GIRAPH_RELNOTES_NAME=Giraph GIRAPH_PKG_NAME=giraph -GIRAPH_BASE_VERSION=0.2-SNAPSHOT -GIRAPH_PKG_VERSION=0.2 +GIRAPH_BASE_VERSION=1.0.0 +GIRAPH_PKG_VERSION=1.0.0 GIRAPH_RELEASE_VERSION=1 GIRAPH_TARBALL_DST=$(GIRAPH_NAME)-$(GIRAPH_BASE_VERSION).tar.gz -#GIRAPH_TARBALL_SRC=$(GIRAPH_NAME)-$(GIRAPH_BASE_VERSION)-src.tar.gz -#GIRAPH_DOWNLOAD_PATH=/incubator/giraph/$(GIRAPH_PKG_NAME)-$(GIRAPH_BASE_VERSION) -#GIRAPH_SITE=$(APACHE_MIRROR)$(GIRAPH_DOWNLOAD_PATH) -#GIRAPH_ARCHIVE=$(APACHE_ARCHIVE)$(GIRAPH_DOWNLOAD_PATH) -GIRAPH_TARBALL_SRC=79962a3 -GIRAPH_SITE=https://github.com/apache/giraph/tarball -GIRAPH_ARCHIVE=$(GIRAPH_SITE) +GIRAPH_TARBALL_SRC=$(GIRAPH_TARBALL_DST) +GIRAPH_DOWNLOAD_PATH=/giraph/$(GIRAPH_PKG_NAME)-$(GIRAPH_BASE_VERSION) +GIRAPH_SITE=$(APACHE_MIRROR)$(GIRAPH_DOWNLOAD_PATH) +GIRAPH_ARCHIVE=$(APACHE_ARCHIVE)$(GIRAPH_DOWNLOAD_PATH) $(eval $(call PACKAGE,giraph,GIRAPH)) # Hue
