Permalink
Browse files

update documentation & restore repl scripts

  • Loading branch information...
1 parent 1ebcc8a commit 109300b04c08816b60dd1da96b7aebc278166ad1 @alexott alexott committed Nov 9, 2012
Showing with 24 additions and 6 deletions.
  1. +5 −5 README.textile
  2. +1 −1 project.clj
  3. +4 −0 script/package
  4. +3 −0 script/repl
  5. +9 −0 script/repl.bat
  6. +2 −0 script/run.clj
View
@@ -43,7 +43,7 @@ h2. Getting started with Incanter
Start by visiting the <a href="http://incanter.org">Incanter website</a> for an overview, checkout the <a href="http://data-sorcery.org/contents/">documentation page</a> for a listing of HOW-TOs and examples, and then download either an <a href="http://incanter.org/downloads/">Incanter executable</a> or a pre-built version of <a href="http://incanter.org/downloads/">the latest build of Incanter</a>, which includes all the necessary dependencies, and unpack the file (if you would like to build it from source, read <a href="#build">Building Incanter</a>).
-Start the Clojure REPL (aka the shell) by double-clicking on the downloaded executable or, if you downloaded the pre-built distribution, running one of the scripts in the Incanter directory: @script/repl@ or @script\repl.bat@ on Windows. NOTE: The lein repl task uses Clojure 1.1, and Incanter 1.2.x requires Clojure 1.2, so use the repl script instead of lein.
+Start the Clojure REPL (aka the shell) by double-clicking on the downloaded executable or, if you downloaded the pre-built distribution, running one of the scripts in the Incanter directory: @script/repl@ or @script\repl.bat@ on Windows.
From the Clojure REPL, load the Incanter libraries:
@@ -94,15 +94,15 @@ To build and test Incanter, you will need to have <a href="https://github.com/te
1. Clone the repository with git: @git clone git://github.com/liebke/incanter.git@
-2. Install Leiningen
- a. Download the lein script: @wget https://github.com/technomancy/leiningen/raw/stable/bin/lein@
- (use <a href="https://github.com/technomancy/leiningen/raw/stable/bin/lein.bat">lein.bat</a> on Windows)
+2. Install Leiningen (version 2.x)
+ a. Download the lein script: @wget https://github.com/technomancy/leiningen/raw/preview/bin/lein@
+ (use <a href="https://github.com/technomancy/leiningen/raw/preview/bin/lein.bat">lein.bat</a> on Windows)
b. Place it on your path and chmod it to be executable: @chmod +x lein@
c. Run: @lein self-install@
3. From the incanter directory, download the necessary dependencies: @lein deps@
-4. Start a REPL: @script/repl@ or @script\repl.bat@, or start a Swank server: @script/swank@ or @script\swank.bat@
+4. Start a REPL: @lein repl@ (it also starts nRepl server), or start a Swank server: @lein ritz 4005@
Other tasks:
* If you want to run the tests for each of Incanter's modules, use @script/test@
View
@@ -13,7 +13,7 @@
org.clojure/clojure-contrib]]
[jline "0.9.94"]]
:main incanter.main
-
+ :plugins [[lein-ritz "0.5.0"]]
:profiles {:dev {:resource-paths ["data"]}
:debug {:debug true}
}
View
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -f incanter.jar ] && rm incanter.jar
+lein uberjar && cp target/incanter-*-standalone.jar incanter.jar
View
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -Xmx1G -cp "src:test:data:.:incanter.jar" jline.ConsoleRunner clojure.main -i script/run.clj -r
View
@@ -0,0 +1,9 @@
+@echo off
+setLocal EnableDelayedExpansion
+set CLASSPATH=src;test;data;.:incanter.jar
+echo CLASSPATH=%CLASSPATH%
+
+@rem jline breaks inferior-lisp.
+if not defined LABREPL_SWANK set JLINE=jline.ConsoleRunner
+
+java -Xmx1G -cp %CLASSPATH% %JLINE% clojure.main -i script/run.clj -r
View
@@ -0,0 +1,2 @@
+(use 'clojure.repl)
+(set! *print-length* 500)

0 comments on commit 109300b

Please sign in to comment.