Moved clojure.jar to plugins/repl/vendor/ and added it to the installer.

fcoury · Jul 14, 2010 · 4e38f52 · 4e38f52
1 parent 5b749a0
commit 4e38f52
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@ plugins/application_swt/dist
 plugins/edit_view_swt/vendor/j*.jar
 plugins/dans
 plugins/*/lib/dist/
+plugins/repl/vendor/clojure.jar
 pkg
 
 textmate/Bundles/asciidoc.tmbundle

diff --git a/CHANGES b/CHANGES
@@ -1,7 +1,12 @@
 
-Version 0.3.8 (TBA)
+Version 0.3.9 (TBA)
 ===================
 
+ * Clojure REPL (David Byrne)
+
+Version 0.3.8 (12 July 2010)
+============================
+
  * Can switch between open trees in a window (Dan Lucraft)
  * Runnables: extensible runnable tasks/build items/tests/generators for projects. (Dan Lucraft)
  * Runnables: run scripts in edit tabs as processes. (Dan Lucraft)

diff --git a/lib/redcar/installer.rb b/lib/redcar/installer.rb
@@ -100,7 +100,8 @@ def redcar_jars_dir
 
     REDCAR_JARS = {
       "/java-mateview-#{Redcar::VERSION}.jar" => "plugins/edit_view_swt/vendor/java-mateview.jar",
-      "/application_swt-#{Redcar::VERSION}.jar" => "plugins/application_swt/lib/dist/application_swt.jar"
+      "/application_swt-#{Redcar::VERSION}.jar" => "plugins/application_swt/lib/dist/application_swt.jar",
+      "/clojure.jar" => "plugins/repl/vendor/clojure.jar"
     }
 
     XULRUNNER_URI = "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2/runtimes/xulrunner-1.9.2.en-US.win32.zip"

diff --git a/plugins/repl/lib/repl.rb b/plugins/repl/lib/repl.rb
@@ -1,7 +1,7 @@
 require 'java'
 require 'repl/internal_mirror'
 
-require 'clojure.jar'
+require File.dirname(__FILE__) + "/../vendor/clojure.jar"
 
 include_class 'clojure.lang.Var'
 include_class 'clojure.lang.RT'