aboutsummaryrefslogtreecommitdiff
path: root/lux-lein/src/leiningen
diff options
context:
space:
mode:
authorEduardo Julian2016-12-01 15:25:07 -0400
committerEduardo Julian2016-12-01 15:25:07 -0400
commit4528aee1d700ba0ac611fb07faf4c5a8c7e0b9ad (patch)
treea7c67379d1e23e1c4851d3037d68a2b695f1e899 /lux-lein/src/leiningen
parent74f782af647e9dc9dea53754d48482fa8a18301a (diff)
- Slightly changed the lux-lein commands.
Diffstat (limited to 'lux-lein/src/leiningen')
-rw-r--r--lux-lein/src/leiningen/lux.clj (renamed from lux-lein/src/leiningen/luxc.clj)16
-rw-r--r--lux-lein/src/leiningen/lux/builder.clj (renamed from lux-lein/src/leiningen/luxc/compiler.clj)13
-rw-r--r--lux-lein/src/leiningen/lux/packager.clj (renamed from lux-lein/src/leiningen/luxc/packager.clj)4
-rw-r--r--lux-lein/src/leiningen/lux/repl.clj (renamed from lux-lein/src/leiningen/luxc/repl.clj)4
-rw-r--r--lux-lein/src/leiningen/lux/test.clj (renamed from lux-lein/src/leiningen/luxc/test.clj)10
-rw-r--r--lux-lein/src/leiningen/lux/utils.clj (renamed from lux-lein/src/leiningen/luxc/utils.clj)3
6 files changed, 24 insertions, 26 deletions
diff --git a/lux-lein/src/leiningen/luxc.clj b/lux-lein/src/leiningen/lux.clj
index b04e4997a..6b2268d70 100644
--- a/lux-lein/src/leiningen/luxc.clj
+++ b/lux-lein/src/leiningen/lux.clj
@@ -3,18 +3,18 @@
;; If a copy of the MPL was not distributed with this file,
;; You can obtain one at http://mozilla.org/MPL/2.0/.
-(ns leiningen.luxc
+(ns leiningen.lux
(:require [leiningen.pom :as pom]
[leiningen.core.classpath :as classpath]
- (leiningen.luxc [compiler :as &compiler]
- [test :as &test]
- [repl :as &repl])))
+ (leiningen.lux [builder :as &builder]
+ [test :as &test]
+ [repl :as &repl])))
;; [Exports]
-(defn luxc [project & args]
+(defn lux [project & args]
(case (first args)
- "compile"
- (&compiler/compile project)
+ "build"
+ (&builder/build project)
"test"
(&test/test project)
@@ -23,5 +23,5 @@
(&repl/repl project)
;; default...
- (println "Commands available: compile, test, repl"))
+ (println "Commands available: build, test, repl"))
)
diff --git a/lux-lein/src/leiningen/luxc/compiler.clj b/lux-lein/src/leiningen/lux/builder.clj
index 18eef63a0..530b61bfe 100644
--- a/lux-lein/src/leiningen/luxc/compiler.clj
+++ b/lux-lein/src/leiningen/lux/builder.clj
@@ -3,17 +3,16 @@
;; If a copy of the MPL was not distributed with this file,
;; You can obtain one at http://mozilla.org/MPL/2.0/.
-(ns leiningen.luxc.compiler
- (:refer-clojure :exclude [compile])
+(ns leiningen.lux.builder
(:require [leiningen.core.classpath :as classpath]
- (leiningen.luxc [utils :as &utils]
- [packager :as &packager])))
+ (leiningen.lux [utils :as &utils]
+ [packager :as &packager])))
-(defn compile [project]
+(defn build [project]
(if-let [program-module (get-in project [:lux :program])]
(do (&utils/run-process (&utils/compile-path project program-module (get project :source-paths (list)))
nil
- "[COMPILATION BEGIN]"
- "[COMPILATION END]")
+ "[BUILD BEGIN]"
+ "[BUILD END]")
(&packager/package project program-module (get project :resource-paths (list))))
(println "Please provide a program main module in [:lux :program]")))
diff --git a/lux-lein/src/leiningen/luxc/packager.clj b/lux-lein/src/leiningen/lux/packager.clj
index e7b1d71d8..dd037fe51 100644
--- a/lux-lein/src/leiningen/luxc/packager.clj
+++ b/lux-lein/src/leiningen/lux/packager.clj
@@ -3,11 +3,11 @@
;; If a copy of the MPL was not distributed with this file,
;; You can obtain one at http://mozilla.org/MPL/2.0/.
-(ns leiningen.luxc.packager
+(ns leiningen.lux.packager
(:require [clojure.string :as string]
[leiningen.core.classpath :as classpath]
[leiningen.uberjar]
- [leiningen.luxc.utils :as &utils])
+ [leiningen.lux.utils :as &utils])
(:import (java.io InputStream
File
FileInputStream
diff --git a/lux-lein/src/leiningen/luxc/repl.clj b/lux-lein/src/leiningen/lux/repl.clj
index 2bfb281e6..271e79db9 100644
--- a/lux-lein/src/leiningen/luxc/repl.clj
+++ b/lux-lein/src/leiningen/lux/repl.clj
@@ -3,9 +3,9 @@
;; If a copy of the MPL was not distributed with this file,
;; You can obtain one at http://mozilla.org/MPL/2.0/.
-(ns leiningen.luxc.repl
+(ns leiningen.lux.repl
(:require [leiningen.core.classpath :as classpath]
- [leiningen.luxc.utils :as &utils])
+ [leiningen.lux.utils :as &utils])
(:import (java.io InputStreamReader
BufferedReader
PrintStream)))
diff --git a/lux-lein/src/leiningen/luxc/test.clj b/lux-lein/src/leiningen/lux/test.clj
index a1b5a830c..2a7038904 100644
--- a/lux-lein/src/leiningen/luxc/test.clj
+++ b/lux-lein/src/leiningen/lux/test.clj
@@ -3,18 +3,18 @@
;; If a copy of the MPL was not distributed with this file,
;; You can obtain one at http://mozilla.org/MPL/2.0/.
-(ns leiningen.luxc.test
+(ns leiningen.lux.test
(:refer-clojure :exclude [test])
(:require [leiningen.core.classpath :as classpath]
- (leiningen.luxc [utils :as &utils]
- [packager :as &packager])))
+ (leiningen.lux [utils :as &utils]
+ [packager :as &packager])))
(defn test [project]
(if-let [tests-module (get-in project [:lux :tests])]
(do (&utils/run-process (&utils/compile-path project tests-module (concat (:test-paths project) (:source-paths project)))
nil
- "[COMPILATION BEGIN]"
- "[COMPILATION END]")
+ "[BUILD BEGIN]"
+ "[BUILD END]")
(let [java-cmd (get project :java-cmd "java")
jvm-opts (->> (get project :jvm-opts) (interpose " ") (reduce str ""))
output-package (str (get-in project [:lux :target] &utils/output-dir) "/"
diff --git a/lux-lein/src/leiningen/luxc/utils.clj b/lux-lein/src/leiningen/lux/utils.clj
index bae02d365..70d203865 100644
--- a/lux-lein/src/leiningen/luxc/utils.clj
+++ b/lux-lein/src/leiningen/lux/utils.clj
@@ -3,8 +3,7 @@
;; If a copy of the MPL was not distributed with this file,
;; You can obtain one at http://mozilla.org/MPL/2.0/.
-(ns leiningen.luxc.utils
- (:refer-clojure :exclude [compile])
+(ns leiningen.lux.utils
(:require [leiningen.core.classpath :as classpath])
(:import (java.io File
InputStreamReader