Permalink
Browse files

renamed incanter-*-jar-with-dependencies.jar to incanter-exec.jar, an…

…d added instructions on running Incanter directly with 'java -jar incanter-exec.jar'
  • Loading branch information...
1 parent bb6e05e commit 6b3576f89507428f5bf86eb876918fbe2b29c131 @liebke liebke committed Dec 22, 2009
Showing with 12 additions and 36 deletions.
  1. +6 −0 README.textile
  2. +1 −1 bin/clj
  3. +1 −1 bin/clj.bat
  4. +0 −21 bin/incanter
  5. +0 −12 bin/incanter.bat
  6. +4 −1 pom.xml
View
@@ -44,6 +44,12 @@ A pre-built version of Incanter that includes all the necessary dependencies can
Start the Clojure shell (aka the REPL) from the Incanter directory: @bin/clj@ or @bin\clj.bat@ on Windows (note: if you want to start the Clojure REPL from a directory other than the top level Incanter directory, change the INCANTER_HOME variable in the clj script so that it uses an absolute path instead the ./ directory).
+You can also start Incanter directly with the following command:
+@java -jar target/incanter-exec.jar@
+This will start a Clojure REPL, but will not have command history like the clj scripts. If you want to use the built-in data sets, you'll also need to set the incanter.home property as follows:
+@java -Dincanter.home=/path/to/incanter/dir -jar target/incanter-exec.jar@
+
+
From the Clojure shell, load the Incanter libraries: <pre><code>(use '(incanter core stats charts))</code></pre>
Try an example: sample 1,000 values from a standard-normal distribution and view a histogram: <pre><code>(view (histogram (sample-normal 1000)))</code></pre>
View
@@ -8,7 +8,7 @@
INCANTER_HOME=.
CLASSES_DIR=$INCANTER_HOME/target/
-INCANTER_JAR=$INCANTER_HOME/target/incanter-1.0-master-SNAPSHOT-jar-with-dependencies.jar
+INCANTER_JAR=$INCANTER_HOME/target/incanter-exec.jar
if [ -z "$1" ]; then
#java -server -Dclojure.compile.path=$CLASSES_DIR -Dincanter.home=$INCANTER_HOME -jar $INCANTER_JAR clojure.main
View
@@ -1,7 +1,7 @@
@echo off
set INCANTER_HOME=.
set CLASSES_DIR=%INCANTER_HOME%\classes
- set INCANTER_JAR=%INCANTER_HOME%\target\incanter-1.0-SNAPSHOT-jar-with-dependencies.jar
+ set INCANTER_JAR=%INCANTER_HOME%\target\incanter-exec.jar
IF (%1)==() (
java -cp %INCANTER_JAR% -Dclojure.compile.path=%CLASSES_DIR% -Dincanter.home=%INCANTER_HOME% clojure.main
View
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-##; incanter -- script to start Clojure REPL configured with the Incanter libraries
-
-## This script uses the uberjar file created by maven with the following commands
-# $ mvn compile; mvn clojure:compile; mvn package
-
-
-INCANTER_HOME=.
-CLASSES_DIR=$INCANTER_HOME/target/
-INCANTER_JAR=$INCANTER_HOME/target/incanter-1.0-master-SNAPSHOT-jar-with-dependencies.jar
-
-if [ -z "$1" ]; then
- #java -server -Dclojure.compile.path=$CLASSES_DIR -Dincanter.home=$INCANTER_HOME -jar $INCANTER_JAR clojure.main
- java -server -Dclojure.compile.path=$CLASSES_DIR -Dincanter.home=$INCANTER_HOME -cp .:$INCANTER_JAR jline.ConsoleRunner clojure.main
-else
- scriptname=$1
- #java -server -Dclojure.compile.path=$CLASSES_DIR -Dincanter.home=$INCANTER_HOME -cp .:$INCANTER_JAR clojure.lang.Script $scriptname -- $*
- java -server -Dclojure.compile.path=$CLASSES_DIR -Dincanter.home=$INCANTER_HOME -cp .:$INCANTER_JAR clojure.main $scriptname -- $*
-fi
-
View
@@ -1,12 +0,0 @@
-@echo off
- set INCANTER_HOME=.
- set CLASSES_DIR=%INCANTER_HOME%\classes
- set INCANTER_JAR=%INCANTER_HOME%\target\incanter-1.0-SNAPSHOT-jar-with-dependencies.jar
-
- IF (%1)==() (
- java -cp %INCANTER_JAR% -Dclojure.compile.path=%CLASSES_DIR% -Dincanter.home=%INCANTER_HOME% clojure.main
- ) ELSE (
- java -cp %INCANTER_JAR% -Dclojure.compile.path=%CLASSES_DIR% -Dincanter.home=%INCANTER_HOME% clojure.main %1 -- %*
- )
-
-
View
@@ -48,9 +48,12 @@
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
+ <finalName>incanter-exec</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
- <mainClass>jline.ConsoleRunner</mainClass>
+ <!-- <mainClass>jline.ConsoleRunner</mainClass> -->
+ <mainClass>clojure.main</mainClass>
</manifest>
</archive>
</configuration>

0 comments on commit 6b3576f

Please sign in to comment.