You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2016/01/11 22:02:21 UTC
[39/50] [abbrv] incubator-toree git commit: Fixed work directory for
`make dev` in Vagrant mode
Fixed work directory for `make dev` in Vagrant mode
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/2e20d17b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/2e20d17b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/2e20d17b
Branch: refs/heads/master
Commit: 2e20d17b839a2500c8e522a6ff8f5345636e99c7
Parents: a9de6aa
Author: Gino Bustelo <pa...@us.ibm.com>
Authored: Fri Dec 4 09:49:35 2015 -0600
Committer: Gino Bustelo <pa...@us.ibm.com>
Committed: Fri Dec 4 09:49:35 2015 -0600
----------------------------------------------------------------------
Makefile | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/2e20d17b/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index e26a936..213ee7d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,12 @@
# limitations under the License.
#
-.PHONY: clean clean-dist build dev test test-travis
+.PHONY: help clean clean-dist build dev test test-travis
VERSION?=0.1.5
IS_SNAPSHOT?=true
APACHE_SPARK_VERSION?=1.5.1
-VM_WORKDIR=/src/spark-kernel
-
USE_VAGRANT?=
RUN_PREFIX=$(if $(USE_VAGRANT),vagrant ssh -c "cd $(VM_WORKDIR) && )
RUN_SUFFIX=$(if $(USE_VAGRANT),")
@@ -33,12 +31,21 @@ ENV_OPTS=APACHE_SPARK_VERSION=$(APACHE_SPARK_VERSION) VERSION=$(VERSION) IS_SNAP
FULL_VERSION=$(shell echo $(VERSION)`[ "$(IS_SNAPSHOT)" == "true" ] && (echo '-SNAPSHOT')` )
ASSEMBLY_JAR=$(shell echo kernel-assembly-$(FULL_VERSION).jar )
+help:
+ @echo ' clean - clean build files'
+ @echo ' dev - starts ipython'
+ @echo ' dist - build a packaged distribution'
+ @echo ' build - builds assembly'
+ @echo ' test - run all units'
+
clean-dist:
-rm -r dist
+clean: VM_WORKDIR=/src/spark-kernel
clean: clean-dist
$(call RUN,$(ENV_OPTS) sbt clean)
+kernel/target/scala-2.10/$(ASSEMBLY_JAR): VM_WORKDIR=/src/spark-kernel
kernel/target/scala-2.10/$(ASSEMBLY_JAR): ${shell find ./*/src/main/**/*}
kernel/target/scala-2.10/$(ASSEMBLY_JAR): ${shell find ./*/build.sbt}
kernel/target/scala-2.10/$(ASSEMBLY_JAR): project/build.properties project/Build.scala project/Common.scala project/plugins.sbt
@@ -50,6 +57,7 @@ dev: VM_WORKDIR=~
dev: dist
$(call RUN,ipython notebook --ip=* --no-browser)
+test: VM_WORKDIR=/src/spark-kernel
test:
$(call RUN,$(ENV_OPTS) sbt compile test)