Fix defproject. Unfortunately build.clj needs to call it fully-qualif…

…ied.

bin/lein

@@ -19,5 +19,5 @@ if [ $1 = "repl" ]; then
         java -cp "$CLASSPATH" clojure.main
     fi
 else
-    exec java -cp "$CLASSPATH" leinigen.core $@
+    exec java -cp "$CLASSPATH" leiningen.core $@
 fi

build.clj

@@ -1,7 +1,5 @@
-(ns build
-  (:use [leiningen]))
-
-(defproject leiningen
+;; TODO: allow unqualified defproject
+(leiningen.core/defproject leiningen
   :version "1.0-SNAPSHOT"
   :dependencies [["org.clojure" "clojure" "1.1.0-alpha-SNAPSHOT"]
                  ["org.clojure" "clojure-contrib" "1.0-SNAPSHOT"]

src/leiningen/core.clj

@@ -3,15 +3,14 @@
             [clojure.contrib.with-ns])
   (:gen-class))
 
-(declare project)
+(def project nil)
 
 (defmacro defproject [project-name & args]
-  `(do (def ~project-name (assoc (apply hash-map (quote ~args))
-                            :name ~(name project-name)
-                            :root ~(.getParent (java.io.File. *file*))))
-       (let [project# ~project-name]
-         (with-ns 'leiningen.core
-           (def '~'project project#)))))
+  `(do (alter-var-root #'project
+                       (fn [_#] (assoc (apply hash-map (quote ~args))
+                                  :name ~(name project-name)
+                                  :root ~(.getParent (java.io.File. *file*)))))
+       (def ~project-name project)))
 
 (defn read-project []
   (load-file "build.clj")
@@ -20,4 +19,5 @@
 (defn -main [command & args]
   (let [action (ns-resolve (symbol (str "leiningen." command))
                            (symbol command))]
+    ;; TODO: ensure tasks run only once
     (apply action (read-project) args)))

test/build.clj

@@ -1,5 +1,4 @@
-(ns leiningen)
-(defproject nomnomnom
+(leiningen.core/defproject nomnomnom
   :version "1.0-SNAPSHOT"
   :dependencies [["org.clojure" "clojure" "1.0.0"]
                  ["rome" "rome" "0.9"]