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

Move :checkout-deps-shares to default profile.

Browse source 
This will prevent checkout deps from being used when just the
production profile is active. Also, this may be the first legitimate
use of flatten I've ever seen.
This commit is contained in:
Phil Hagelberg 2012-05-11 14:10:18 -07:00
parent 893dbd4b82
commit 54cc378671
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
leiningen-core/src/leiningen/core/classpath.clj
View file

@ -24,11 +24,7 @@
"as it does not contain a project.clj file.")))) "as it does not contain a project.clj file."))))
(defn- checkout-dep-paths [project dep dep-project] (defn- checkout-dep-paths [project dep dep-project]
(if-let [shares (:checkout-deps-shares project)] (flatten (map dep-project shares)))
(map #(% dep-project) shares)
(concat (:source-paths dep-project)
(:resource-paths dep-project)
[(:compile-path dep-project)])))
(defn- checkout-deps-paths (defn- checkout-deps-paths
"Checkout dependencies are used to place source for a dependency "Checkout dependencies are used to place source for a dependency

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

@ -122,7 +122,11 @@
"Profiles get merged into the project map. The :dev and :user "Profiles get merged into the project map. The :dev and :user
profiles are active by default." profiles are active by default."
(atom {:default {:resource-paths ["dev-resources"] (atom {:default {:resource-paths ["dev-resources"]
:plugins [['lein-newnew "0.3.1"]]} :plugins [['lein-newnew "0.3.1"]]
:checkout-deps-shares [:source-paths
:resource-paths
:compile-path]}
:production {}
:test {} :test {}
:update {:update :always} :update {:update :always}
:offline {:offline? true} :offline {:offline? true}