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

Move :test-path to :default profile and lock inside project/read.

Browse source
This commit is contained in:
Phil Hagelberg 2012-02-16 15:51:05 -08:00
parent 9a4c5f6a74
commit 8425e06ed1
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
leiningen-core/src/leiningen/core/project.clj
View file

@ -82,13 +82,14 @@
"Profiles get merged into the project map. The :dev and :user
profiles are active by default."
(atom {:default {:resources-path ["dev-resources"]
:test-path ["test"]
:dependencies '[[org.clojure/tools.nrepl "0.0.5"
:exclusions [org.clojure/clojure]]
[clojure-complete "0.1.4"
:exclusions [org.clojure/clojure]]
[org.thnetos/cd-client "0.3.3"
:exclusions [org.clojure/clojure]]]}
:test {:test-path ["test"]}
:test {}
:debug {:debug true}}))
;; Modified merge-with to provide f with the conflicting key.
@ -139,6 +140,7 @@
(defn- lookup-profile [profiles profile-name]
(let [result (profiles profile-name)]
;; TODO: only warn when profiles are explicitly requested
(when (and (nil? result) (not (#{:default :dev :user :test} profile-name)))
(println "Warning: profile" profile-name "not found."))
(if (keyword? result)
@ -195,15 +197,16 @@
(defn read
"Read project map out of file, which defaults to project.clj."
([file profiles]
(binding [*ns* (find-ns 'leiningen.core.project)]
(load-file file))
(let [project (resolve 'leiningen.core.project/project)]
(when-not project
(throw (Exception. "project.clj must define project map.")))
(ns-unmap *ns* 'project) ; return it to original state
(let [project (merge-profiles @project profiles)]
(load-plugins project)
(load-hooks project)
project)))
(locking project
(binding [*ns* (find-ns 'leiningen.core.project)]
(load-file file))
(let [project (resolve 'leiningen.core.project/project)]
(when-not project
(throw (Exception. "project.clj must define project map.")))
(ns-unmap *ns* 'project) ; return it to original state
(let [project (merge-profiles @project profiles)]
(load-plugins project)
(load-hooks project)
project))))
([file] (read file [:dev :user :default]))
([] (read "project.clj")))