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

Remove hacky jar multimethod.

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

9
src/leiningen/jar.clj
View file

@ -129,9 +129,6 @@
(.putNextEntry jar-os (JarEntry. (:path spec)))
(copy (ByteArrayInputStream. (:bytes spec)) jar-os))
;; TODO: hacky; needed for conditional :resources-path below
(defmethod copy-to-jar nil [project jar-os spec])
(defn write-jar [project out-filename filespecs]
(let [manifest (make-manifest project)]
(with-open [jar-os (-> out-filename
@ -168,11 +165,11 @@
(:group project)
(:name project))
:bytes (make-pom-properties project)}
(when (and (:resources-path project)
(.exists (file (:resources-path project))))
{:type :path :path (:resources-path project)})
{:type :path :path (:compile-path project)}
{:type :path :path (str (:root project) "/project.clj")}]
(when (and (:resources-path project)
(.exists (file (:resources-path project))))
[{:type :path :path (:resources-path project)}])
(when-not (:omit-source project)
[{:type :path :path (:source-path project)}])
(shell-wrapper-filespecs project deps-fileset)))