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

Split out get-classified-jar-filename. Fixes #1039.

Browse source
This commit is contained in:
Phil Hagelberg 2013-03-14 13:33:14 -07:00
parent 3d1fc448a6
commit c2325a73e0
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/leiningen/jar.clj
View file

@ -125,15 +125,19 @@
{:type :paths :paths (:java-source-paths project)}]) {:type :paths :paths (:java-source-paths project)}])
(:filespecs project))) (:filespecs project)))
;; Split out backwards-compatibility. Collapse into get-jar-filename for 3.0
(defn get-classified-jar-filename [project classifier]
(let [target (doto (io/file (:target-path project)) .mkdirs)
suffix (if classifier (str "-" (name classifier) ".jar") ".jar")
;; TODO: splice in version to :jar-name
name-kw (if (= classifier :standalone) :uberjar-name :jar-name)
jar-name (or (project name-kw)
(str (:name project) "-" (:version project) suffix))]
(str (io/file target jar-name))))
(defn get-jar-filename (defn get-jar-filename
([project classifier] ([project uberjar?]
(let [target (doto (io/file (:target-path project)) .mkdirs) (get-classified-jar-filename project (if uberjar? :standalone)))
suffix (if classifier (str "-" (name classifier) ".jar") ".jar")
;; TODO: splice in version to :jar-name
name-kw (if (= classifier :standalone) :uberjar-name :jar-name)
jar-name (or (project name-kw)
(str (:name project) "-" (:version project) suffix))]
(str (io/file target jar-name))))
([project] (get-jar-filename project nil))) ([project] (get-jar-filename project nil)))
(def whitelist-keys (def whitelist-keys