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

Allow JVM file.encoding to be overridden by anything.

Browse source 
This allows profiles to set a -Dfile.encoding. Later, perhaps in 3.0,
JVM_OPTS should perhaps be moved farther down the list (along with
:jvm-opts?) -- but that could be a breaking change. (Environment is
sometimes set locally, sometimes set globally.)
This commit is contained in:
Tim McCormack 2014-09-08 09:17:06 -04:00
parent 74ec14fb20
commit 6696f11341
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
leiningen-core/src/leiningen/core/eval.clj
View file

@ -107,13 +107,13 @@
"Calculate command-line arguments for launching java subprocess."
[project]
(let [native-arch-paths (native-arch-paths project)]
`(~@(get-jvm-opts-from-env (System/getenv "JVM_OPTS"))
`(~(d-property [:file.encoding (or (System/getProperty "file.encoding") "UTF-8")])
~@(get-jvm-opts-from-env (System/getenv "JVM_OPTS"))
~@(:jvm-opts project)
~@(get arch-options (:arch project))
;; TODO: support -Xverify:none
~@(map d-property {:clojure.compile.path (:compile-path project)
(str (:name project) ".version") (:version project)
:file.encoding (or (System/getProperty "file.encoding") "UTF-8")
:clojure.debug (boolean (or (System/getenv "DEBUG")
(:debug project)))})
~@(if native-arch-paths