diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-07-17 01:02:35 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-07-17 01:02:35 -0700 |
| commit | d0ea496877b53f3253e6e5f6d053c7f79c7991a5 (patch) | |
| tree | 498df817a5eaab288615fd681489a38b418ddb3d /dev | |
| parent | 7c23c0dc3ed721c95690fc49f435d9de6952523c (diff) | |
| download | spark-d0ea496877b53f3253e6e5f6d053c7f79c7991a5.tar.gz spark-d0ea496877b53f3253e6e5f6d053c7f79c7991a5.tar.bz2 spark-d0ea496877b53f3253e6e5f6d053c7f79c7991a5.zip | |
SPARK-2526: Simplify options in make-distribution.sh
Right now we have a bunch of parallel logic in make-distribution.sh
that's just extra work to maintain. We should just pass through
Maven profiles in this case and keep the script simple. See
the JIRA for more details.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #1445 from pwendell/make-distribution.sh and squashes the following commits:
f1294ea [Patrick Wendell] Simplify options in make-distribution.sh.
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/create-release/create-release.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh index 49bf78f607..38830103d1 100755 --- a/dev/create-release/create-release.sh +++ b/dev/create-release/create-release.sh @@ -95,7 +95,7 @@ make_binary_release() { cp -r spark spark-$RELEASE_VERSION-bin-$NAME cd spark-$RELEASE_VERSION-bin-$NAME - ./make-distribution.sh $FLAGS --name $NAME --tgz + ./make-distribution.sh --name $NAME --tgz $FLAGS cd .. cp spark-$RELEASE_VERSION-bin-$NAME/spark-$RELEASE_VERSION-bin-$NAME.tgz . rm -rf spark-$RELEASE_VERSION-bin-$NAME @@ -111,9 +111,10 @@ make_binary_release() { spark-$RELEASE_VERSION-bin-$NAME.tgz.sha } -make_binary_release "hadoop1" "--with-hive --hadoop 1.0.4" -make_binary_release "cdh4" "--with-hive --hadoop 2.0.0-mr1-cdh4.2.0" -make_binary_release "hadoop2" "--with-hive --with-yarn --hadoop 2.2.0" +make_binary_release "hadoop1" "-Phive -Dhadoop.version=1.0.4" +make_binary_release "cdh4" "-Phive -Dhadoop.version=2.0.0-mr1-cdh4.2.0" +make_binary_release "hadoop2" \ + "-Phive -Pyarn -Phadoop-2.2 -Dhadoop.version=2.2.0 -Pyarn.version=2.2.0" # Copy data echo "Copying release tarballs" |