From 147a943df0f4f0df0bef7c0d41c5f4cfd00e00c2 Mon Sep 17 00:00:00 2001 From: Mark Hamstra Date: Tue, 14 Jan 2014 21:36:58 -0800 Subject: [PATCH] Removed repl-bin and updated maven build doc. --- docs/building-with-maven.md | 6 +- pom.xml | 10 -- repl-bin/pom.xml | 184 ---------------------------- repl-bin/src/deb/bin/run | 57 --------- repl-bin/src/deb/bin/spark-executor | 22 ---- repl-bin/src/deb/bin/spark-shell | 21 ---- repl-bin/src/deb/control/control | 8 -- 7 files changed, 3 insertions(+), 305 deletions(-) delete mode 100644 repl-bin/pom.xml delete mode 100755 repl-bin/src/deb/bin/run delete mode 100755 repl-bin/src/deb/bin/spark-executor delete mode 100755 repl-bin/src/deb/bin/spark-shell delete mode 100644 repl-bin/src/deb/control/control diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md index b9ff0af76f647..6a9a8d681742f 100644 --- a/docs/building-with-maven.md +++ b/docs/building-with-maven.md @@ -71,8 +71,8 @@ This setup works fine in IntelliJ IDEA 11.1.4. After opening the project via the ## Building Spark Debian Packages ## -It includes support for building a Debian package containing a 'fat-jar' which includes the repl, the examples and bagel. This can be created by specifying the following profiles: +The maven build includes support for building a Debian package containing the assembly 'fat-jar', PySpark, and the necessary scripts and configuration files. This can be created by specifying the following: - $ mvn -Prepl-bin -Pdeb clean package + $ mvn -Pdeb -DskipTests clean package -The debian package can then be found under repl/target. We added the short commit hash to the file name so that we can distinguish individual packages build for SNAPSHOT versions. +The debian package can then be found under assembly/target. We added the short commit hash to the file name so that we can distinguish individual packages built for SNAPSHOT versions. diff --git a/pom.xml b/pom.xml index b25d9d7ef891d..54072b053cb5e 100644 --- a/pom.xml +++ b/pom.xml @@ -754,15 +754,5 @@ - - - repl-bin - - false - - - repl-bin - - diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml deleted file mode 100644 index 869dbdb9b095a..0000000000000 --- a/repl-bin/pom.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - 4.0.0 - - org.apache.spark - spark-parent - 0.9.0-incubating-SNAPSHOT - ../pom.xml - - - org.apache.spark - spark-repl-bin_2.10 - pom - Spark Project REPL binary packaging - http://spark.incubator.apache.org/ - - - spark - /usr/share/spark - root - - - - - org.apache.spark - spark-core_${scala.binary.version} - ${project.version} - - - org.apache.spark - spark-bagel_${scala.binary.version} - ${project.version} - runtime - - - org.apache.spark - spark-repl_${scala.binary.version} - ${project.version} - runtime - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - false - ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar - - - *:* - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - - reference.conf - - - spark.repl.Main - - - - - - - - - - - - deb - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.1 - - - validate - - create - - - 8 - - - - - - org.vafer - jdeb - 0.11 - - - package - - jdeb - - - ${project.build.directory}/${deb.pkg.name}_${project.version}-${buildNumber}_all.deb - false - gzip - - - ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar - file - - perm - ${deb.user} - ${deb.user} - ${deb.install.path} - - - - ${basedir}/src/deb/bin - directory - - perm - ${deb.user} - ${deb.user} - ${deb.install.path} - 744 - - - - ${basedir}/../conf - directory - - perm - ${deb.user} - ${deb.user} - ${deb.install.path}/conf - 744 - - - - - - - - - - - - diff --git a/repl-bin/src/deb/bin/run b/repl-bin/src/deb/bin/run deleted file mode 100755 index 3a6f22f41fca5..0000000000000 --- a/repl-bin/src/deb/bin/run +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -SCALA_VERSION=2.10 - -# Figure out where the Scala framework is installed -FWDIR="$(cd `dirname $0`; pwd)" - -# Export this as SPARK_HOME -export SPARK_HOME="$FWDIR" - -# Load environment variables from conf/spark-env.sh, if it exists -if [ -e $FWDIR/conf/spark-env.sh ] ; then - . $FWDIR/conf/spark-env.sh -fi - -# Figure out how much memory to use per executor and set it as an environment -# variable so that our process sees it and can report it to Mesos -if [ -z "$SPARK_MEM" ] ; then - SPARK_MEM="512m" -fi -export SPARK_MEM - -# Set JAVA_OPTS to be able to load native libraries and to set heap size -JAVA_OPTS="$SPARK_JAVA_OPTS" -JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH" -JAVA_OPTS+=" -Xms$SPARK_MEM -Xmx$SPARK_MEM" -# Load extra JAVA_OPTS from conf/java-opts, if it exists -if [ -e $FWDIR/conf/java-opts ] ; then - JAVA_OPTS+=" `cat $FWDIR/conf/java-opts`" -fi -export JAVA_OPTS - -# Build up classpath -CLASSPATH=":$FWDIR/conf" -for jar in `find $FWDIR -name '*jar'`; do - CLASSPATH+=":$jar" -done -export CLASSPATH - -exec java -Dscala.usejavacp=true -Djline.shutdownhook=true -cp "$CLASSPATH" $JAVA_OPTS $EXTRA_ARGS "$@" diff --git a/repl-bin/src/deb/bin/spark-executor b/repl-bin/src/deb/bin/spark-executor deleted file mode 100755 index 052d76fb8d81c..0000000000000 --- a/repl-bin/src/deb/bin/spark-executor +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -FWDIR="$(cd `dirname $0`; pwd)" -echo "Running spark-executor with framework dir = $FWDIR" -exec $FWDIR/run org.apache.spark.executor.MesosExecutorBackend diff --git a/repl-bin/src/deb/bin/spark-shell b/repl-bin/src/deb/bin/spark-shell deleted file mode 100755 index 118349d7c30f2..0000000000000 --- a/repl-bin/src/deb/bin/spark-shell +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -FWDIR="$(cd `dirname $0`; pwd)" -exec $FWDIR/run org.apache.spark.repl.Main "$@" diff --git a/repl-bin/src/deb/control/control b/repl-bin/src/deb/control/control deleted file mode 100644 index a6b4471d485f4..0000000000000 --- a/repl-bin/src/deb/control/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: [[deb.pkg.name]] -Version: [[version]]-[[buildNumber]] -Section: misc -Priority: extra -Architecture: all -Maintainer: Matei Zaharia -Description: [[name]] -Distribution: development