yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preserve JVM_OPTS in trampoline.

Browse source
This commit is contained in:
Phil Hagelberg 2011-06-27 19:56:50 -07:00
parent 591d8137ce
commit 015d19b571
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/leiningen/trampoline.clj
View file

@ -4,10 +4,22 @@
[leiningen.compile :only [get-input-args get-readable-form
prep eval-in-project]]
[leiningen.classpath :only [get-classpath-string]])
(:require [clojure.string :as string]))
(:require [clojure.string :as string]
[clojure.java.io :as io]
[leiningen.util.paths :as paths]))
(def *trampoline?* false)
(defn get-jvm-opts [project]
(let [legacy-native (paths/legacy-native-path project)]
(concat (get-input-args)
(if (:debug project)
["-Dclojure.debug=true"])
(if (.exists (io/file (:native-path project)))
[(str "-Djava.library.path=" (:native-path project))])
(if (.exists (io/file legacy-native))
[(str "-Djava.library.path=" legacy-native)]))))
(defn escape [form-string]
(format "\"%s\"" (.replaceAll form-string "\"" "\\\\\"")))
@ -32,10 +44,7 @@ issues. Not compatible with chaining.
ALPHA: subject to change without warning."
[project task-name & args]
(let [java-cmd (format "%s/bin/java" (System/getProperty "java.home"))
jvm-opts (get-input-args)
jvm-opts (if (:debug project)
(conj jvm-opts "-Dclojure.debug=true")
jvm-opts)
jvm-opts (get-jvm-opts project)
eval-args (atom nil)]
(when (:eval-in-leiningen project)
(println "Warning: trampoline has no effect with :eval-in-leiningen."))