Fix indentation and remove outdated todos.
This commit is contained in:
parent
7d57e70e3f
commit
14f9691e0a
3 changed files with 17 additions and 19 deletions
|
@ -10,30 +10,30 @@
|
|||
(org.apache.tools.ant.types Environment$Variable Path)))
|
||||
|
||||
(defn compilable-namespaces
|
||||
"Retrns a seq of the namespaces that are compilable, regardless of whether
|
||||
"Returns a seq of the namespaces that are compilable, regardless of whether
|
||||
their class files are present and up-to-date."
|
||||
[project]
|
||||
;; TODO: Compile :main ns if needed
|
||||
(cond
|
||||
(coll? (:namespaces project))
|
||||
(:namespaces project)
|
||||
(= :all (:namespaces project))
|
||||
(find-namespaces-in-dir (file (:source-path project)))))
|
||||
(coll? (:namespaces project))
|
||||
(:namespaces project)
|
||||
(= :all (:namespaces project))
|
||||
(find-namespaces-in-dir (file (:source-path project)))))
|
||||
|
||||
(defn stale-namespaces
|
||||
"Given a seq of namespaces that are both compilable and that hav missing or
|
||||
out-of-date class files."
|
||||
[project]
|
||||
(filter
|
||||
(fn [n]
|
||||
(let [ns-file (str (-> (name n)
|
||||
(.replaceAll "\\." "/")
|
||||
(.replaceAll "-" "_")))]
|
||||
(> (.lastModified (file (:source-path project)
|
||||
(str ns-file ".clj")))
|
||||
(.lastModified (file (:compile-path project)
|
||||
(str ns-file "__init.class"))))))
|
||||
(compilable-namespaces project)))
|
||||
(fn [n]
|
||||
(let [ns-file (str (-> (name n)
|
||||
(.replaceAll "\\." "/")
|
||||
(.replaceAll "-" "_")))]
|
||||
(> (.lastModified (file (:source-path project)
|
||||
(str ns-file ".clj")))
|
||||
(.lastModified (file (:compile-path project)
|
||||
(str ns-file "__init.class"))))))
|
||||
(compilable-namespaces project)))
|
||||
|
||||
(defn find-lib-jars
|
||||
"Returns a seq of Files for all the jars in the project's library directory."
|
||||
|
@ -149,8 +149,8 @@
|
|||
(if (compilable-namespaces project)
|
||||
(if-let [namespaces (seq (stale-namespaces project))]
|
||||
(eval-in-project project
|
||||
`(doseq [namespace# '~namespaces]
|
||||
(println "Compiling" namespace#)
|
||||
(clojure.core/compile namespace#)))
|
||||
`(doseq [namespace# '~namespaces]
|
||||
(println "Compiling" namespace#)
|
||||
(clojure.core/compile namespace#)))
|
||||
(println "All :namespaces already compiled."))
|
||||
(println "No :namespaces listed for compilation in project.clj.")))
|
||||
|
|
|
@ -85,7 +85,6 @@ as the main-class for an executable jar."
|
|||
{:type :path :path (:compile-path project)}
|
||||
{:type :path :path (:source-path project)}
|
||||
{:type :path :path (str (:root project) "/project.clj")}]]
|
||||
;; TODO: support slim, etc
|
||||
(write-jar project jar-file filespecs)
|
||||
(println "Created" jar-file)
|
||||
jar-file))
|
||||
|
|
|
@ -13,7 +13,6 @@ Neither group-id nor artifact-id may contain slashes."
|
|||
group-id (namespace project-name)
|
||||
artifact-id (name project-name)]
|
||||
(.mkdirs (file project-dir))
|
||||
;; TODO: pretty-print this
|
||||
(spit (file project-dir "project.clj")
|
||||
(str "(defproject " project-name " \"1.0.0-SNAPSHOT\"\n"
|
||||
" :description \"FIXME: write\"\n"
|
||||
|
|
Loading…
Reference in a new issue