yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move :eval-in-leiningen binding of *ns* to eval-in-project.

Browse source
This commit is contained in:
Phil Hagelberg 2011-06-23 20:21:25 -07:00
parent dfb4b759b0
commit 7137730e90
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/leiningen/compile.clj
View file

@ -160,7 +160,8 @@
(when (:debug project)
(System/setProperty "clojure.debug" "true"))
;; need to at least pretend to return an exit code
(try (binding [*warn-on-reflection* (:warn-on-reflection project)]
(try (binding [*warn-on-reflection* (:warn-on-reflection project)
*ns* *ns*]
(eval (read-string (get-readable-form nil project form init))))
0
(catch Exception e

5
src/leiningen/deps.clj
View file

@ -129,9 +129,8 @@
(let [deps-task (make-deps-task project deps-set)]
(when (seq (deps-set project))
(.execute deps-task)
(when-not (or (and (:local-repo-classpath project)
(= :dependencies deps-set))
(:eval-in-leiningen project))
(when-not (and (:local-repo-classpath project)
(= :dependencies deps-set))
(.mkdirs (File. (:library-path project)))
(copy-dependencies (:jar-behavior project)
;; Leiningen's process only has access to lib/dev.

9
src/leiningen/interactive.clj
View file

@ -64,11 +64,10 @@
(let [[port host] (repl-socket-on project)]
(println welcome)
(future
(binding [*ns* *ns*]
(eval-in-project project `(do ~(repl-server project host port
:prompt '(constantly ""))
;; can't stop return value from printing
(symbol "")))))
(eval-in-project project `(do ~(repl-server project host port
:prompt '(constantly ""))
;; can't stop return value from printing
(symbol ""))))
(let [connect #(poll-repl-connection port 0 vector)]
(binding [eval-in-project (partial eval-in-repl connect)
*exit-after-tests* false