From d3522576c5de2028c18e700cd0796a8db3f4c52f Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 13 Mar 2019 22:06:32 -0400
Subject: No longer needing "jvm" or "js" configurations in "project.clj" files
 for Lux projects.

---
 luxc/src/lux.clj          |  6 +++---
 luxc/src/lux/compiler.clj | 12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'luxc/src')

diff --git a/luxc/src/lux.clj b/luxc/src/lux.clj
index fc39b7b3b..3dbc819a1 100644
--- a/luxc/src/lux.clj
+++ b/luxc/src/lux.clj
@@ -9,7 +9,7 @@
 
 (def unit-separator (str (char 31)))
 
-(defn ^:private separate-paths
+(defn- separate-paths
   "(-> Text (List Text))"
   [resources-dirs]
   (-> resources-dirs
@@ -19,8 +19,8 @@
 
 (defn -main [& args]
   (|case (&/->list args)
-    (&/$Cons "release" (&/$Cons platform (&/$Cons program-module (&/$Cons resources-dirs (&/$Cons source-dirs (&/$Cons target-dir (&/$Nil)))))))
-    (time (&compiler/compile-program platform &/$Build program-module (separate-paths resources-dirs) (separate-paths source-dirs) target-dir))
+    (&/$Cons "release" (&/$Cons program-module (&/$Cons resources-dirs (&/$Cons source-dirs (&/$Cons target-dir (&/$Nil))))))
+    (time (&compiler/compile-program &/$Build program-module (separate-paths resources-dirs) (separate-paths source-dirs) target-dir))
 
     (&/$Cons "repl" (&/$Cons resources-dirs (&/$Cons source-dirs (&/$Cons target-dir (&/$Nil)))))
     (&repl/repl (separate-paths resources-dirs)
diff --git a/luxc/src/lux/compiler.clj b/luxc/src/lux/compiler.clj
index 55b801745..5fc77ce6c 100644
--- a/luxc/src/lux/compiler.clj
+++ b/luxc/src/lux/compiler.clj
@@ -8,13 +8,12 @@
                           [parallel :as &&parallel]
                           [jvm :as &&jvm])))
 
-(defn init! [platform resources-dirs ^String target-dir]
+(defn init! [resources-dirs ^String target-dir]
   (do (reset! &&core/!output-dir target-dir)
     (&&parallel/setup!)
     (&&io/init-libs!)
     (.mkdirs (new java.io.File target-dir))
-    (case platform
-      "jvm" (&&jvm/init! resources-dirs target-dir))))
+    (&&jvm/init! resources-dirs target-dir)))
 
 (def all-compilers
   &&jvm/all-compilers)
@@ -25,7 +24,6 @@
 (defn compile-module [source-dirs name]
   (&&jvm/compile-module source-dirs name))
 
-(defn compile-program [platform mode program-module resources-dir source-dirs target-dir]
-  (init! platform resources-dir target-dir)
-  (case platform
-    "jvm" (&&jvm/compile-program mode program-module resources-dir source-dirs target-dir)))
+(defn compile-program [mode program-module resources-dir source-dirs target-dir]
+  (init! resources-dir target-dir)
+  (&&jvm/compile-program mode program-module resources-dir source-dirs target-dir))
-- 
cgit v1.2.3