Skip to content

Commit d9032d3

Browse files
cemerickcemerick
committed
explicitly return result of compile for tasks that check for it (e.g. jar); fixes clojurebookgh-2 and clojurebookgh-3 
1 parent 158d6da commit d9032d3

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

‎ch08-lein-mixed-source/project.clj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ Programming' by Emerick, Carper, and Grand."
1212

1313
(robert.hooke/add-hook #'leiningen.compile/compile
1414
(fn [compile project & args]
15-
(apply compile project args)
16-
(leiningen.javac/javac (assoc project
17-
;; Leiningen 1 uses :java-source-path
18-
:java-source-path "srcj"
19-
;; Lein 2 uses :java-source-paths
20-
:java-source-paths ["srcj"]))))
15+
(let [compile-result (apply compile project args)]
16+
(leiningen.javac/javac (assoc project
17+
;; Leiningen 1 uses :java-source-path
18+
:java-source-path "srcj"
19+
;; Lein 2 uses :java-source-paths
20+
:java-source-paths ["srcj"]))
21+
compile-result)))

‎ch09-gen-class/project.clj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ From chapter 9 of 'Clojure Programming' by Emerick, Carper, and Grand."
1111

1212
(robert.hooke/add-hook #'leiningen.compile/compile
1313
(fn [compile project & args]
14-
(apply compile project args)
15-
(leiningen.javac/javac (assoc project
16-
;; Leiningen 1 uses :java-source-path
17-
:java-source-path "src"
18-
;; Lein 2 uses :java-source-paths
19-
:java-source-paths ["src"]))))
14+
(let [compile-result (apply compile project args)]
15+
(leiningen.javac/javac (assoc project
16+
;; Leiningen 1 uses :java-source-path
17+
:java-source-path "srcj"
18+
;; Lein 2 uses :java-source-paths
19+
:java-source-paths ["srcj"]))
20+
compile-result)))
2021

0 commit comments

Comments
 (0)