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

Merge pull request #1745 from jebberjeb/clean-everything

Browse source 
remove clean targets for all profiles
This commit is contained in:
Phil Hagelberg 2014-10-30 10:26:07 -07:00
commit bf61af296f
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/leiningen/clean.clj
View file

@ -1,7 +1,8 @@
(ns leiningen.clean (ns leiningen.clean
"Remove all files from project's target-path." "Remove all files from project's target-path."
(:require [clojure.java.io :as io] (:require [clojure.java.io :as io]
[leiningen.core.utils :as utils]) [leiningen.core.utils :as utils]
[leiningen.core.project :as project])
(:import [java.io IOException])) (:import [java.io IOException]))
(defn real-directory? (defn real-directory?
@ -79,13 +80,26 @@
(error-msg (error-msg
(format "Deleting non-target project paths [\"%s\"] is not allowed." clean-target))))))) (format "Deleting non-target project paths [\"%s\"] is not allowed." clean-target)))))))
(defn clean (defn clean-targets
"Remove all files from paths in project's clean-targets." "Return a seq of the project's clean targets."
[project] [project]
(doseq [target-key (:clean-targets project)] (for [target-key (:clean-targets project)]
(when-let [target (cond (vector? target-key) (get-in project target-key) (when-let [target (cond (vector? target-key) (get-in project target-key)
(keyword? target-key) (target-key project) (keyword? target-key) (target-key project)
(string? target-key) target-key)] (string? target-key) target-key)]
(doseq [f (flatten [target])] (flatten [target]))))
(defn clean
"Removes all files from paths in clean-targets for a project, and for all
of its profiles."
[project]
(doseq [targets (->> (project/read-profiles project)
keys
(map vector)
(map (partial project/set-profiles project))
(cons project)
(mapcat clean-targets)
distinct)]
(doseq [f targets]
(sanity-check project f) (sanity-check project f)
(delete-file-recursively f :silently))))) (delete-file-recursively f :silently))))

4
src/leiningen/uberjar.clj
View file

@ -129,13 +129,13 @@ be deactivated."
(let [project (project/merge-profiles project [:uberjar]) (let [project (project/merge-profiles project [:uberjar])
project (update-in project [:jar-inclusions] project (update-in project [:jar-inclusions]
concat (:uberjar-inclusions project)) concat (:uberjar-inclusions project))
standalone-filename (jar/get-jar-filename project :standalone)
[_ jar] (try (first (jar/jar project main)) [_ jar] (try (first (jar/jar project main))
(catch Exception e (catch Exception e
(when main/*debug* (when main/*debug*
(.printStackTrace e)) (.printStackTrace e))
(main/abort "Uberjar aborting because jar failed:" (main/abort "Uberjar aborting because jar failed:"
(.getMessage e))))] (.getMessage e))))
standalone-filename (jar/get-jar-filename project :standalone)]
(with-open [out (-> standalone-filename (with-open [out (-> standalone-filename
(FileOutputStream.) (FileOutputStream.)
(ZipOutputStream.))] (ZipOutputStream.))]