Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/lein_modules/versionization.clj
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@
ver)
opts)))

(def project-versions (atom {}))
(defn set-project-versions! [vs] (swap! project-versions merge vs))

(defn versionize
"Substitute versions in dependency vectors with actual versions from
the :versions modules config"
[project]
(let [vmap (merge (select-keys project [:version]) (versions project))
(let [vmap (merge (select-keys project [:version])
@project-versions
(versions project))
f #(with-meta (for [d %] (expand-version d vmap)) (meta %))]
(-> project
(update-in [:dependencies] f)
(update-in [:parent] expand-version vmap))))
(update-in [:dependencies] f)
(update-in [:parent] expand-version vmap))))
26 changes: 17 additions & 9 deletions src/leiningen/modules.clj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
[clojure.string :as s])
(:use [lein-modules.inheritance :only (inherit)]
[lein-modules.common :only (parent with-profiles read-project)]
[lein-modules.compression :only (compressed-profiles)]))
[lein-modules.compression :only (compressed-profiles)]
[lein-modules.versionization :only (set-project-versions!)]))

(defn child?
"Return true if child is an immediate descendant of project"
Expand Down Expand Up @@ -120,7 +121,7 @@
"If running in 'quiet' mode, only prints the located modules.

Otherwise prints a more human-formatted modules list."

[{:keys [quiet?]} modules]
(if (empty? modules)
(if-not quiet?
Expand All @@ -131,12 +132,18 @@
(println " Module build order:"))
(doseq [p modules]
(if-not quiet?
(println " " (:name p))
(println " " (:name p) "/" (:version p))
(println (:name p))))

;; For the test suite, return all children.
(map id modules))))

(defn- ensure-project-versions [project]
(let [modules (ordered-builds project)
vs (reduce #(assoc % (id %2) (:version %2)) {} modules)]
(set-project-versions! vs)
modules))

(defn modules
"Run a task for all related projects in dependency order.

Expand Down Expand Up @@ -170,14 +177,15 @@ Accepts '-q', '--quiet' and ':quiet' to suppress non-subprocess output."
(checkout-dependencies project)
(apply modules project (remove #{":checkouts"} args)))
":dirs" (let [dirs (s/split (second args) #"[:,]")]
(ensure-project-versions project)
(apply modules
(-> project
(assoc-in [:modules :dirs] dirs)
(assoc-in [:modules :quiet] quiet?)
(vary-meta assoc-in [:without-profiles :modules :dirs] dirs))
(drop 2 args)))
(-> project
(assoc-in [:modules :dirs] dirs)
(assoc-in [:modules :quiet] quiet?)
(vary-meta assoc-in [:without-profiles :modules :dirs] dirs))
(drop 2 args)))
nil (print-modules opts (ordered-builds project))
(let [modules (ordered-builds project)
(let [modules (ensure-project-versions project)
profiles (compressed-profiles project)
args (cli-with-profiles profiles args)
subprocess (get-in project [:modules :subprocess]
Expand Down