bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject git commit: BIGTOP-1083. Spark version was changed with incubating process.
Date Fri, 20 Sep 2013 22:14:37 GMT
Updated Branches:
  refs/heads/master d2a2f6de7 -> f69d7f71f


BIGTOP-1083. Spark version was changed with incubating process.


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f69d7f71
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f69d7f71
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f69d7f71

Branch: refs/heads/master
Commit: f69d7f71f0581929d39ca88d3ff93abfa70dbdaf
Parents: d2a2f6d
Author: Konstantin Boudnik <cos@apache.org>
Authored: Thu Sep 19 15:32:15 2013 -0700
Committer: Konstantin Boudnik <cos@apache.org>
Committed: Fri Sep 20 15:14:07 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/spark/install_spark.sh | 8 ++++----
 bigtop.mk                                         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69d7f71/bigtop-packages/src/common/spark/install_spark.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/spark/install_spark.sh b/bigtop-packages/src/common/spark/install_spark.sh
index 6918757..608851d 100644
--- a/bigtop-packages/src/common/spark/install_spark.sh
+++ b/bigtop-packages/src/common/spark/install_spark.sh
@@ -120,15 +120,15 @@ install -d -m 0755 $PREFIX/$LIB_DIR/lib
 install -d -m 0755 $PREFIX/$SPARK_BIN_DIR
 install -d -m 0755 $PREFIX/$DOC_DIR
 
-tar --wildcards -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/assembly/target/spark-assembly-*-dist.tar.gz
'lib/*'
+tar --wildcards -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/assembly/target/spark-assembly*-dist.tar.gz
'lib/*'
 
 for comp in core repl bagel mllib streaming; do
   install -d -m 0755 $PREFIX/$LIB_DIR/$comp/lib
-  tar --wildcards -C $PREFIX/$LIB_DIR/$comp/lib -zxf ${BUILD_DIR}/assembly/target/spark-assembly-*-dist.tar.gz
spark-$comp\*
+  tar --wildcards -C $PREFIX/$LIB_DIR/$comp/lib -zxf ${BUILD_DIR}/assembly/target/spark-assembly*-dist.tar.gz
spark-$comp\*
 done
 ## FIXME: Spark maven assembly needs to include examples into it.
 install -d -m 0755 $PREFIX/$LIB_DIR/examples/lib
-cp ${BUILD_DIR}/examples/target/spark-examples-${SPARK_VERSION}.jar $PREFIX/$LIB_DIR/examples/lib
+cp ${BUILD_DIR}/examples/target/spark-examples*${SPARK_VERSION}.jar $PREFIX/$LIB_DIR/examples/lib
 
 # FIXME: executor scripts need to reside in bin
 cp -a $BUILD_DIR/spark-class $PREFIX/$LIB_DIR
@@ -144,7 +144,7 @@ cp  $PREFIX/$CONF_DIR/spark-env.sh.template $PREFIX/$CONF_DIR/spark-env.sh
 ln -s /etc/spark/conf $PREFIX/$LIB_DIR/conf
 
 # Unpack static UI resources into install_dir/spark where it is expected to be
-tar --wildcards --transform 's,ui-resources/spark,spark,' -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/assembly/target/spark-assembly-*-dist.tar.gz
ui-resources/\*
+tar --wildcards --transform 's,ui-resources/spark,spark,' -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/assembly/target/spark-assembly*-dist.tar.gz
ui-resources/\*
 
 # set correct permissions for exec. files
 for execfile in spark-class spark-shell spark-executor ; do

http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69d7f71/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index c45f871..c5aebae 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -241,7 +241,7 @@ $(eval $(call PACKAGE,crunch,CRUNCH))
 SPARK_NAME=spark
 SPARK_RELNOTES_NAME=Spark
 SPARK_PKG_NAME=spark
-SPARK_BASE_VERSION=0.8.0-SNAPSHOT
+SPARK_BASE_VERSION=0.8.0-incubating-SNAPSHOT
 SPARK_PKG_VERSION=0.8.0
 SPARK_RELEASE_VERSION=1
 SPARK_TARBALL_DST=spark-${SPARK_BASE_VERSION}.tar.gz


Mime
View raw message