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

Fix for issue #1113: file paths with spaces are not passed correctly as javac arguments on Windows

Browse source 
The bug is from a commit from Feb 6 which changes how the classpath is passed javac to use @argfiles parameter.

SHA-1: 3867d4d17c

According to the javac specification (http://docs.oracle.com/javase/6/docs/technotes/tools/windows/javac.html) :

"An argument file can include javac options and source filenames in any combination. The arguments within a file can be space-separated or newline-separated. If a filename contains embedded spaces, put the whole filename in double quotes, and double each backslash ("My Files\\\\Stuff.java")."
This commit is contained in:
Daniel Dinnyes 2013-05-30 22:22:17 +02:00
parent 577ef23d55
commit 12db0c6478
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/leiningen/javac.clj
View file

@ -54,6 +54,9 @@
(vec (map (comp name str) (flatten (concat specials others)))))
opts))
(defn- safe-quote [s]
(str "\"" (string/replace s "\\" "\\\\") "\""))
;; Tool's .run method expects the last argument to be an array of
;; strings, so that's what we'll return here.
(defn- javac-options
@ -64,9 +67,9 @@
(.deleteOnExit options-file)
(with-open [options-file (io/writer options-file)]
(doto options-file
(.write (format "-cp %s\n" (classpath/get-classpath-string project)))
(.write (format "-d %s\n" (:compile-path project)))
(.write (string/join "\n" files))))
(.write (format "-cp %s\n" (safe-quote (classpath/get-classpath-string project))))
(.write (format "-d %s\n" (safe-quote (:compile-path project))))
(.write (string/join "\n" (map safe-quote files)))))
(into-array String
(concat (normalize-javac-options (:javac-options project))
args