Skip to content

Commit ec5d273

Browse files
committed
no need for bultitude here
1 parent 9c86348 commit ec5d273

File tree

4 files changed

+13
-177
lines changed

4 files changed

+13
-177
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ pulled in code from the following projects (thanks, guys!)
376376
* [technomancy/leiningen][50]
377377
* [cemerick/pomegranate][51]
378378
* [Raynes/conch][52]
379-
* [Raynes/bultitude][60]
380379
* [tebeka/clj-digest][53]
381380
* [cldwalker/table][54]
382381
* [clojure/tools.cli][55]
@@ -416,4 +415,3 @@ Distributed under the Eclipse Public License, the same as Clojure.
416415
[57]: https://github.com/AvisoNovate/pretty
417416
[58]: https://github.com/google/hesokuri
418417
[59]: https://code.google.com/p/barbarywatchservice/
419-
[60]: https://github.com/Raynes/bultitude

boot/core/src/boot/from/bultitude/core.clj

Lines changed: 0 additions & 169 deletions
This file was deleted.

boot/core/src/boot/task/built_in.clj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
[boot.util :as util]
1212
[boot.gitignore :as git]
1313
[boot.task-helpers :as helpers]
14-
[boot.from.table.core :as table]
15-
[boot.from.bultitude.core :as btude])
14+
[boot.from.table.core :as table])
1615
(:import
1716
[java.util.concurrent LinkedBlockingQueue TimeUnit]))
1817

@@ -315,10 +314,11 @@
315314

316315
(let [tgt (core/mktgtdir! ::aot-tgt)]
317316
(core/with-pre-wrap
318-
(let [nses (if-not all
319-
namespace
320-
(->> (core/get-env :src-paths) (map io/file)
321-
(btude/namespaces-on-classpath :classpath)))]
317+
(let [nses (->> (core/src-files)
318+
(map core/relative-path)
319+
(filter #(.endsWith % ".clj"))
320+
(map util/path->ns)
321+
(filter (if all (constantly true) #(contains? namespace %))))]
322322
(binding [*compile-path* (.getPath tgt)]
323323
(doseq [ns nses]
324324
(util/info "Compiling %s...\n" ns)

boot/pod/src/boot/util.clj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
[clojure.java.io :as io]
44
[clojure.set :as set]
55
[clojure.pprint :as pprint]
6+
[clojure.string :as string]
7+
[boot.file :as file]
68
[boot.from.io.aviso.ansi :as ansi]
79
[boot.from.io.aviso.repl :as repl]
810
[boot.from.io.aviso.exception :as pretty])
@@ -93,6 +95,11 @@
9395
(map? form) (str "{" (apply str (interpose " " (map pr-color-str (mapcat identity form)))) "}")
9496
:else (pr-str form)))
9597

98+
(defn path->ns
99+
[path]
100+
(-> path file/split-path (#(string/join "." %))
101+
(.replace \_ \-) (.replaceAll "\\.clj$" "") symbol))
102+
96103
(defn auto-flush
97104
[writer]
98105
(proxy [java.io.PrintWriter] [writer]

0 commit comments

Comments
 (0)