diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-04-23 10:19:32 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-23 10:19:43 -0700 |
| commit | d36d75cbd9020fefee885a940f4deccef2c75a9d (patch) | |
| tree | c0a0fef97cb46ceec761e8941d1a3fb44724cde7 /dev | |
| parent | b0d8793205f3e9dace8be83cc57444b101395254 (diff) | |
| download | spark-d36d75cbd9020fefee885a940f4deccef2c75a9d.tar.gz spark-d36d75cbd9020fefee885a940f4deccef2c75a9d.tar.bz2 spark-d36d75cbd9020fefee885a940f4deccef2c75a9d.zip | |
SPARK-1119 and other build improvements
1. Makes assembly and examples jar naming consistent in maven/sbt.
2. Updates make-distribution.sh to use Maven and fixes some bugs.
3. Updates the create-release script to call make-distribution script.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #502 from pwendell/make-distribution and squashes the following commits:
1a97f0d [Patrick Wendell] SPARK-1119 and other build improvements
(cherry picked from commit cd4ed293262e2349794c13467d1737974385c019)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/create-release/create-release.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh index fb9d9f9e07..ad38c8d53e 100755 --- a/dev/create-release/create-release.sh +++ b/dev/create-release/create-release.sh @@ -83,15 +83,15 @@ rm -rf spark-$RELEASE_VERSION make_binary_release() { NAME=$1 - MAVEN_FLAGS=$2 - + FLAGS=$2 cp -r spark spark-$RELEASE_VERSION-bin-$NAME + cd spark-$RELEASE_VERSION-bin-$NAME - export MAVEN_OPTS="-Xmx3g -XX:MaxPermSize=1g -XX:ReservedCodeCacheSize=1g" - mvn $MAVEN_FLAGS -DskipTests clean package - find . -name test-classes -type d | xargs rm -rf - find . -name classes -type d | xargs rm -rf + ./make-distribution.sh $FLAGS --name $NAME --tgz cd .. + cp spark-$RELEASE_VERSION-bin-$NAME/spark-$RELEASE_VERSION-bin-$NAME.tgz . + rm -rf spark-$RELEASE_VERSION-bin-$NAME + tar cvzf spark-$RELEASE_VERSION-bin-$NAME.tgz spark-$RELEASE_VERSION-bin-$NAME echo $GPG_PASSPHRASE | gpg --passphrase-fd 0 --armour \ --output spark-$RELEASE_VERSION-bin-$NAME.tgz.asc \ @@ -105,9 +105,9 @@ make_binary_release() { rm -rf spark-$RELEASE_VERSION-bin-$NAME } -make_binary_release "hadoop1" "-Dhadoop.version=1.0.4" -make_binary_release "cdh4" "-Dhadoop.version=2.0.0-mr1-cdh4.2.0" -make_binary_release "hadoop2" "-Pyarn -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0" +make_binary_release "hadoop1" "--hadoop 1.0.4" +make_binary_release "cdh4" "--hadoop 2.0.0-mr1-cdh4.2.0" +make_binary_release "hadoop2" "--with-yarn --hadoop 2.2.0" # Copy data echo "Copying release tarballs" |