Allow multiple Java source paths. Fixes technomancy#155.

src/leiningen/core.clj

@@ -16,7 +16,7 @@
         identity
         args))
 
-(defn- normalize-path [project-root path]
+(defn normalize-path [project-root path]
   (when path
     (let [f (File. path)]
       (.getAbsolutePath (if (.isAbsolute f) f (File. project-root path))))))
@@ -65,8 +65,6 @@
                                :jar-dir (normalize-path#
                                          (or (:target-dir m#) (:jar-dir m#)
                                              root#))
-                               :java-source-path (normalize-path#
-                                                  (:java-source-path m#))
                                :root root#)))
      (when (:test-resources-path m#)
        (println (str "WARNING: :test-resources-path is deprecated; use "

src/leiningen/javac.clj

@@ -1,6 +1,7 @@
 (ns leiningen.javac
   "Compile Java source files."
-  (:use [leiningen.classpath :only [get-classpath-string]])
+  (:use [leiningen.classpath :only [get-classpath-string]]
+        [leiningen.core :only [normalize-path]])
   (:require [lancet.core :as lancet])
   (:import (java.io File)))
 
@@ -16,16 +17,16 @@
   (merge *default-javac-options*
          (:javac-options project)
          {:destdir (:compile-path project)
-          :srcdir path
+          :srcdir (normalize-path (:root project) path)
           :classpath (get-classpath-string project)}
          (apply hash-map options)))
 
 (defn- extract-javac-tasks
   "Extract all compile tasks of the project."
   [project]
   (let [specs (:java-source-path project)]
-    (map #(extract-javac-task project %)
-         (if (string? specs) [[specs]] specs))))
+    (for [spec (if (string? specs) [[specs]] specs)]
+      (extract-javac-task project spec))))
 
 (defn- run-javac-task
   "Compile the given task spec."

test/leiningen/test/javac.clj

@@ -11,4 +11,6 @@
   (delete-file-recursively "test_projects/dev-deps-only/classes" true)
   (javac test-project)
   (is (.exists (file "test_projects/dev-deps-only/classes"
-                     "dev_deps_only" "Junk.class"))))
+                     "dev_deps_only" "Junk.class")))
+  (is (.exists (file "test_projects/dev-deps-only/classes"
+                     "dev_deps_only" "Junk2.class"))))

test_projects/dev-deps-only/project.clj

@@ -1,3 +1,3 @@
 (defproject dev-deps-only "1.0.0-SNAPSHOT"
-  :java-source-path "src"
+  :java-source-path [["src"] ["src2"]]
   :dev-dependencies [[org.clojure/clojure "1.2.0"]])

test_projects/dev-deps-only/src2/dev_deps_only/Junk2.java

@@ -0,0 +1,3 @@
+package dev_deps_only;
+
+class Junk2 {}