Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #56 from mstump/master

Source path included twice when building a war or uberwar
  • Loading branch information...
commit 5be1f7be95a6de0c0321a19f434293f4fa6c42ec 2 parents b518561 + 43a39c5
@weavejester authored
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/leiningen/ring/uberwar.clj
  2. +2 −2 src/leiningen/ring/war.clj
View
4 src/leiningen/ring/uberwar.clj
@@ -33,8 +33,8 @@
(doto war-stream
(war/str-entry "WEB-INF/web.xml" (war/make-web-xml project))
(war/dir-entry project "WEB-INF/classes/" (:compile-path project)))
- (doseq [path (concat [(:source-path project)] (:source-paths project)
- [(:resources-path project)] (:resource-paths project))
+ (doseq [path (distinct (concat [(:source-path project)] (:source-paths project)
+ [(:resources-path project)] (:resource-paths project)))
:when path]
(war/dir-entry war-stream project "WEB-INF/classes/" path))
(war/dir-entry war-stream project "" (war/war-resources-path project))
View
4 src/leiningen/ring/war.clj
@@ -188,8 +188,8 @@
(doto war-stream
(str-entry "WEB-INF/web.xml" (make-web-xml project))
(dir-entry project "WEB-INF/classes/" (:compile-path project)))
- (doseq [path (concat [(:source-path project)] (:source-paths project)
- [(:resources-path project)] (:resource-paths project))
+ (doseq [path (distinct (concat [(:source-path project)] (:source-paths project)
+ [(:resources-path project)] (:resource-paths project)))
:when path]
(dir-entry war-stream project "WEB-INF/classes/" path))
(dir-entry war-stream project "" (war-resources-path project))
Please sign in to comment.
Something went wrong with that request. Please try again.