Repository: bigtop Updated Branches: refs/heads/master be7248cda -> 8d8c40208
BIGTOP-1330. bump Giraph version to 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8d8c4020 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8d8c4020 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8d8c4020 Branch: refs/heads/master Commit: 8d8c40208554f562ce169a10a4bfdf5878a8b6a3 Parents: be7248c Author: Roman Shaposhnik <[email protected]> Authored: Sat Jun 28 18:22:37 2014 +0000 Committer: Roman Shaposhnik <[email protected]> Committed: Sat Jun 28 11:54:35 2014 -0700 ---------------------------------------------------------------------- .../src/common/giraph/do-component-build | 9 ++++--- .../src/common/giraph/install_giraph.sh | 27 +++++--------------- bigtop-packages/src/deb/giraph/control | 6 +++++ .../src/deb/giraph/giraph-doc.install | 1 + bigtop-packages/src/deb/giraph/giraph.install | 3 +++ bigtop-packages/src/deb/giraph/rules | 4 +-- .../src/rpm/giraph/SPECS/giraph.spec | 13 +++++++++- bigtop.mk | 14 +++++----- 8 files changed, 43 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/8d8c4020/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 be4b93b..9ee5d34 100644 --- a/bigtop-packages/src/common/giraph/do-component-build +++ b/bigtop-packages/src/common/giraph/do-component-build @@ -18,7 +18,8 @@ set -ex . `dirname $0`/bigtop.bom -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) +BULK_MVN_OPTS="-Phadoop_2 -DskipTests -Dhadoop.version=$HADOOP_VERSION $@" + +mvn $BULK_MVN_OPTS clean install +mvn $BULK_MVN_OPTS -Ddependency.locations.enabled=false site:site +mvn $BULK_MVN_OPTS -Ddependency.locations.enabled=false site:stage http://git-wip-us.apache.org/repos/asf/bigtop/blob/8d8c4020/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 88078a6..f76959b 100644 --- a/bigtop-packages/src/common/giraph/install_giraph.sh +++ b/bigtop-packages/src/common/giraph/install_giraph.sh @@ -109,28 +109,15 @@ install -d -m 0755 ${PREFIX}/${LIB_DIR} # Installing Giraph core install -d -m 0755 ${PREFIX}/${LIB_DIR} -cp $BUILD_DIR/giraph-core/target/*.jar ${PREFIX}/${LIB_DIR} - -install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib -cp $BUILD_DIR/giraph-core/target/lib/*.jar ${PREFIX}/${LIB_DIR}/lib - -# 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} - -# Remove things we don't need -rm -f ${PREFIX}/${LIB_DIR}/*tests.jar ${PREFIX}/${LIB_DIR}/*javadoc.jar ${PREFIX}/${LIB_DIR}/*sources.jar +cp -r $BUILD_DIR/giraph-dist/target/giraph*-bin/*/* ${PREFIX}/${LIB_DIR} # Installing docs and examples install -d -m 0755 $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} +cp -r $BUILD_DIR/target/staging/* $PREFIX/${DOC_DIR} +mv ${PREFIX}/${LIB_DIR}/giraph-examples*.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" @@ -161,11 +148,9 @@ 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 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 +for i in accumulo core gora hbase hcatalog hive kibble rexster ; do + (cd $PREFIX/$LIB_DIR ; ln -s `ls giraph-$i-*jar` giraph-$i.jar) +done # Enforcing dependency on the Bigtop's version of Zookeeper ln -fs /usr/lib/zookeeper/zookeeper.jar $PREFIX/$LIB_DIR/lib/zookeeper*.jar http://git-wip-us.apache.org/repos/asf/bigtop/blob/8d8c4020/bigtop-packages/src/deb/giraph/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/giraph/control b/bigtop-packages/src/deb/giraph/control index 71bcf6b..ac212d2 100644 --- a/bigtop-packages/src/deb/giraph/control +++ b/bigtop-packages/src/deb/giraph/control @@ -31,3 +31,9 @@ Description: Giraph is a BSP inspired graph processing platform that runs on Had of Pregel but additionally adds fault-tolerance to the coordinator process with the use of ZooKeeper as its centralized coordination service. +Package: giraph-doc +Architecture: all +Section: doc +Description: Documentation for Apache Giraph + Documentation for Apache Giraph + http://git-wip-us.apache.org/repos/asf/bigtop/blob/8d8c4020/bigtop-packages/src/deb/giraph/giraph-doc.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/giraph/giraph-doc.install b/bigtop-packages/src/deb/giraph/giraph-doc.install new file mode 100644 index 0000000..04c8569 --- /dev/null +++ b/bigtop-packages/src/deb/giraph/giraph-doc.install @@ -0,0 +1 @@ +/usr/share/doc/giraph http://git-wip-us.apache.org/repos/asf/bigtop/blob/8d8c4020/bigtop-packages/src/deb/giraph/giraph.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/giraph/giraph.install b/bigtop-packages/src/deb/giraph/giraph.install new file mode 100644 index 0000000..b8bb747 --- /dev/null +++ b/bigtop-packages/src/deb/giraph/giraph.install @@ -0,0 +1,3 @@ +/etc/giraph +/usr/lib/giraph +/usr/bin http://git-wip-us.apache.org/repos/asf/bigtop/blob/8d8c4020/bigtop-packages/src/deb/giraph/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/giraph/rules b/bigtop-packages/src/deb/giraph/rules index 7b3a15a..586f732 100644 --- a/bigtop-packages/src/deb/giraph/rules +++ b/bigtop-packages/src/deb/giraph/rules @@ -34,7 +34,7 @@ override_dh_auto_install: --build-dir=${PWD} \ --conf-dir=/etc/giraph/conf.dist \ --doc-dir=/usr/share/doc/giraph \ - --prefix=debian/giraph + --prefix=debian/tmp # Workaround for GIRAPH-198 - cp -f debian/giraph-site.xml debian/giraph/etc/giraph/conf.dist + cp -f debian/giraph-site.xml debian/tmp/etc/giraph/conf.dist http://git-wip-us.apache.org/repos/asf/bigtop/blob/8d8c4020/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 38ff9b8..1c5d818 100644 --- a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec +++ b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec @@ -64,6 +64,15 @@ Requires: zookeeper, hadoop-client, bigtop-utils >= 0.7 %description 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. +%package doc +Summary: Documentation for Apache Giraph +Group: Documentation +%description doc +This package contains the documentation for Apache Giraph + +%description doc +Documentation for Apache Solr + %prep %setup -n %{name}-%{giraph_base_version} @@ -96,5 +105,7 @@ fi %{lib_giraph} %{_bindir}/giraph %config(noreplace) %{conf_giraph}.dist -%defattr(0644,root,root,0755) + +%files doc +%defattr(-,root,root) %doc %{doc_giraph} http://git-wip-us.apache.org/repos/asf/bigtop/blob/8d8c4020/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index b41e3bb..356276d 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -158,14 +158,16 @@ $(eval $(call PACKAGE,flume,FLUME)) GIRAPH_NAME=giraph GIRAPH_RELNOTES_NAME=Giraph GIRAPH_PKG_NAME=giraph -GIRAPH_BASE_VERSION=1.0.0 -GIRAPH_PKG_VERSION=1.0.0 +GIRAPH_BASE_VERSION=1.1.0 +GIRAPH_PKG_VERSION=1.1.0 GIRAPH_RELEASE_VERSION=1 GIRAPH_TARBALL_DST=$(GIRAPH_NAME)-$(GIRAPH_BASE_VERSION).tar.gz -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) +GIRAPH_TARBALL_SRC=$(GIRAPH_NAME)-dist-$(GIRAPH_BASE_VERSION)-src.tar.gz +#GIRAPH_DOWNLOAD_PATH=/giraph/$(GIRAPH_PKG_NAME)-$(GIRAPH_BASE_VERSION) +#GIRAPH_SITE=$(APACHE_MIRROR)$(GIRAPH_DOWNLOAD_PATH) +#GIRAPH_ARCHIVE=$(APACHE_ARCHIVE)$(GIRAPH_DOWNLOAD_PATH) +GIRAPH_SITE=http://people.apache.org/~rvs/giraph-1.1.0-RC0 +GIRAPH_ARCHIVE=http://people.apache.org/~rvs/giraph-1.1.0-RC0 $(eval $(call PACKAGE,giraph,GIRAPH)) # Hue
