aboutsummaryrefslogtreecommitdiff
path: root/lux-lein/src
diff options
context:
space:
mode:
authorEduardo Julian2020-07-01 19:09:53 -0400
committerEduardo Julian2020-07-01 19:09:53 -0400
commit23ad698f1ad87f9e9838c1e7df1809991c6a1d18 (patch)
tree752c4cb6fdb709c88e7c82fffd838ac49f836aa4 /lux-lein/src
parent5d2512af61ac17bca25a4790ea01c24f7d2415da (diff)
WIP: Leiningen integration with the new JVM compiler.
Diffstat (limited to 'lux-lein/src')
-rw-r--r--lux-lein/src/leiningen/lux/builder.clj28
-rw-r--r--lux-lein/src/leiningen/lux/utils.clj42
2 files changed, 48 insertions, 22 deletions
diff --git a/lux-lein/src/leiningen/lux/builder.clj b/lux-lein/src/leiningen/lux/builder.clj
index ebfbc7895..76e19b1e8 100644
--- a/lux-lein/src/leiningen/lux/builder.clj
+++ b/lux-lein/src/leiningen/lux/builder.clj
@@ -1,15 +1,21 @@
(ns leiningen.lux.builder
- (:require (leiningen.lux [utils :as &utils]
- [packager :as &packager])))
-
-(def missing-module-error "Please provide a program main module in [:lux :program]")
+ (:require (leiningen.lux
+ [utils :as &utils]
+ [packager :as &packager])))
(defn build [project]
(if-let [program-module (get-in project [:lux :program])]
- (when (time (&utils/run-process (&utils/compile-path project program-module (get project :source-paths (list)))
- nil
- "[COMPILATION BEGAN]"
- "[COMPILATION ENDED]"))
- (time (&packager/package project program-module (get project :resource-paths (list))))
- true)
- (println missing-module-error)))
+ (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]"))
+ (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 6829f3d96..a0bb5abe2 100644
--- a/lux-lein/src/leiningen/lux/utils.clj
+++ b/lux-lein/src/leiningen/lux/utils.clj
@@ -1,5 +1,7 @@
(ns leiningen.lux.utils
- (:require (clojure [template :refer [do-template]])
+ (:require (clojure
+ [template :refer [do-template]]
+ [string :as string])
[leiningen.core.classpath :as classpath])
(:import (java.io File
InputStreamReader
@@ -30,6 +32,7 @@
(def ^:private lux-group "com.github.luxlang")
(def ^:private compiler-id [lux-group "luxc-jvm"])
+(def ^:private jvm-compiler-id [lux-group "lux-jvm"])
(def ^:private stdlib-id [lux-group "stdlib"])
(defn ^:private id-path
@@ -38,6 +41,7 @@
(str (.replace group "." "/") "/" name))
(def ^:private compiler-path (id-path compiler-id))
+(def ^:private jvm-compiler-path (id-path jvm-compiler-id))
(def ^:private stdlib-path (id-path stdlib-id))
(defn ^:private project-jars [project]
@@ -47,7 +51,6 @@
(do-template [<name> <path>]
(defn <name> [jar-paths]
- {:post [(not (nil? %))]}
(some (fn [^:private path]
(if (.contains path <path>)
path
@@ -55,6 +58,7 @@
jar-paths))
^:private find-compiler-path (sanitize-path compiler-path)
+ ^:private find-jvm-compiler-path (sanitize-path jvm-compiler-path)
^:private find-stdlib-path (sanitize-path stdlib-path)
)
@@ -62,14 +66,15 @@
(or (.contains path (sanitize-path "org/ow2/asm/asm-all"))
(.contains path (sanitize-path "org/clojure/core.match"))
(.contains path (sanitize-path "org/clojure/clojure"))
- (.contains path (sanitize-path compiler-path))))
+ (.contains path (sanitize-path compiler-path))
+ (.contains path (sanitize-path jvm-compiler-path))))
(defn ^:private filter-compiler-dependencies [jar-paths]
(filter compiler-dependency? jar-paths))
(defn ^:private java-command [project]
(str (get project :java-cmd "java")
- " " (->> (get project :jvm-opts) (interpose " ") (reduce str ""))
+ ;; " " (->> (get project :jvm-opts) (interpose " ") (reduce str ""))
" " vm-options))
(defn ^:private join-paths [paths]
@@ -89,7 +94,6 @@
(let [is-stdlib? (= stdlib-id
(project-id project))
raw-paths (project-jars project)
- compiler-path (prepare-path (find-compiler-path raw-paths))
stdlib-path (when (not is-stdlib?)
(prepare-path (find-stdlib-path raw-paths)))
sdk-path (get-in project [:lux :android :sdk])
@@ -111,6 +115,7 @@
(if is-stdlib?
deps
(list* stdlib-path deps)))
+ compiler-path (prepare-path (find-compiler-path raw-paths))
class-path (->> compiler-dependencies
(list* compiler-path)
(interpose java.io.File/pathSeparator)
@@ -123,6 +128,21 @@
repl-path "repl"
)
+(defn build-jvm [project module]
+ (let [raw-paths (project-jars project)]
+ (when-let [compiler-path (find-jvm-compiler-path raw-paths)]
+ (let [compiler (prepare-path compiler-path)
+ sources (->> (get project :source-paths (list))
+ (map #(str " --source " %))
+ (string/join ""))
+ target (get project :target-path default-target-dir)]
+ (str (java-command project)
+ " -jar " compiler " build"
+ " --library " "~/lux/stdlib/target/library.tar"
+ sources
+ " --target " target
+ " --module " module)))))
+
(def ^:private normal-exit 0)
(defn run-process [command working-directory pre post]
@@ -130,13 +150,13 @@
(with-open [std-out (->> process .getInputStream (new InputStreamReader) (new BufferedReader))
std-err (->> process .getErrorStream (new InputStreamReader) (new BufferedReader))]
(println pre)
- (loop [line (.readLine std-out)]
- (when line
+ (loop []
+ (when-let [line (.readLine std-out)]
(println line)
- (recur (.readLine std-out))))
- (loop [line (.readLine std-err)]
- (when line
+ (recur)))
+ (loop []
+ (when-let [line (.readLine std-err)]
(println line)
- (recur (.readLine std-err))))
+ (recur)))
(println post)
(= normal-exit (.waitFor process)))))