aboutsummaryrefslogtreecommitdiff
path: root/lux-lein/src
diff options
context:
space:
mode:
authorEduardo Julian2021-11-08 03:21:42 -0400
committerEduardo Julian2021-11-08 03:21:42 -0400
commit651c7afff45f7f6c6b16d873d699ef0f7c890246 (patch)
tree3c7fd419c58ab0aa276c017614c2b9fbf305b62e /lux-lein/src
parentdf6cf0d3c980e3d7240eec6cb38d86af61037725 (diff)
Used new Function interface to fix directives bug in JVM compiler.
Diffstat (limited to '')
-rw-r--r--lux-lein/src/leiningen/lux/builder.clj19
-rw-r--r--lux-lein/src/leiningen/lux/utils.clj1
2 files changed, 11 insertions, 9 deletions
diff --git a/lux-lein/src/leiningen/lux/builder.clj b/lux-lein/src/leiningen/lux/builder.clj
index 76e19b1e8..408af5c7b 100644
--- a/lux-lein/src/leiningen/lux/builder.clj
+++ b/lux-lein/src/leiningen/lux/builder.clj
@@ -5,17 +5,18 @@
(defn build [project]
(if-let [program-module (get-in project [:lux :program])]
- (if-let [command (&utils/build-jvm project program-module)]
+ ;; (if-let [command (&utils/build-jvm project program-module)]
+ ;; (when (time (&utils/run-process command
+ ;; nil
+ ;; "[COMPILATION BEGAN]"
+ ;; "[COMPILATION ENDED]"))
+ ;; true)
+ ;; )
+ (let [command (&utils/compile-path project program-module (get project :source-paths (list)))]
(when (time (&utils/run-process command
nil
"[COMPILATION BEGAN]"
"[COMPILATION ENDED]"))
- true)
- (let [command (&utils/compile-path project program-module (get project :source-paths (list)))]
- (when (time (&utils/run-process command
- nil
- "[COMPILATION BEGAN]"
- "[COMPILATION ENDED]"))
- (time (&packager/package project program-module (get project :resource-paths (list))))
- true)))
+ (time (&packager/package project program-module (get project :resource-paths (list))))
+ true))
(println "Please provide a program main module in [:lux :program]")))
diff --git a/lux-lein/src/leiningen/lux/utils.clj b/lux-lein/src/leiningen/lux/utils.clj
index 6ed549ae2..f18da2831 100644
--- a/lux-lein/src/leiningen/lux/utils.clj
+++ b/lux-lein/src/leiningen/lux/utils.clj
@@ -132,6 +132,7 @@
repl-path "repl"
)
+;; DEPRECATED
(defn build-jvm [project module]
(let [raw-paths (project-jars project)]
(when-let [compiler-path (find-jvm-compiler-path raw-paths)]