From c99af38529b13f06d18c0ce047cafa6bbe5390d9 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <technomancy@gmail.com>
Date: Wed, 9 Mar 2011 19:45:36 -0800
Subject: [PATCH] Move to lancet as a separate project.

Requires re-running "lein-stable deps" in checkout if you are running
from source.
---
 TUTORIAL.md               |  2 +-
 project.clj               |  3 +--
 src/lancet.clj            |  2 ++
 src/leiningen/compile.clj | 14 +++++++-------
 src/leiningen/deploy.clj  |  2 +-
 src/leiningen/deps.clj    |  2 +-
 src/leiningen/jar.clj     |  2 +-
 src/leiningen/javac.clj   |  2 +-
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/TUTORIAL.md b/TUTORIAL.md
index 8e7dcc31..589aba4d 100644
--- a/TUTORIAL.md
+++ b/TUTORIAL.md
@@ -385,7 +385,7 @@ repository or get it into Maven central, the easiest way is to publish
 it at [Clojars](http://clojars.org). Once you have created an account
 there, publishing is easy:
 
-    $ lein jar && lein pom
+    $ lein jar, pom
     $ scp pom.xml myproject-1.0.0.jar clojars@clojars.org:
 
 Once that succeeds it will be available as a package on which other
diff --git a/project.clj b/project.clj
index 9b41b35e..20dd3d54 100644
--- a/project.clj
+++ b/project.clj
@@ -8,8 +8,7 @@
   :license {:name "Eclipse Public License"}
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [org.clojure/clojure-contrib "1.2.0"]
-                 [org.apache.ant/ant "1.7.1"]
-                 [org.apache.ant/ant-nodeps "1.7.1"]
+                 [lancet "1.0.0"]
                  [jline "0.9.94"]
                  [robert/hooke "1.1.0"]
                  [org.apache.maven/maven-ant-tasks "2.0.10" :exclusions [ant]]]
diff --git a/src/lancet.clj b/src/lancet.clj
index c2c990fd..7af9f49f 100755
--- a/src/lancet.clj
+++ b/src/lancet.clj
@@ -4,6 +4,8 @@
            (java.util.concurrent CountDownLatch)
            (org.apache.tools.ant.types Path)))
 
+(println "WARNING: lancet namespace is deprecated; use lancet.core.")
+
 (def #^{:doc "Dummy ant project to keep Ant tasks happy"}
   ant-project
   (let [proj (org.apache.tools.ant.Project.)
diff --git a/src/leiningen/compile.clj b/src/leiningen/compile.clj
index 333212e8..2ecbff1a 100644
--- a/src/leiningen/compile.clj
+++ b/src/leiningen/compile.clj
@@ -1,12 +1,12 @@
 (ns leiningen.compile
   "Compile Clojure source into .class files."
-  (:require lancet)
-  (:use  [leiningen.deps :only [deps]]
-         [leiningen.core :only [ns->path]]
-         [leiningen.javac :only [javac]]
-         [leiningen.classpath :only [make-path find-lib-jars get-classpath]]
-         [clojure.java.io :only [file]]
-         [leiningen.util.ns :only [namespaces-in-dir]])
+  (:require [lancet.core :as lancet])
+  (:use [leiningen.deps :only [deps]]
+        [leiningen.core :only [ns->path]]
+        [leiningen.javac :only [javac]]
+        [leiningen.classpath :only [make-path find-lib-jars get-classpath]]
+        [clojure.java.io :only [file]]
+        [leiningen.util.ns :only [namespaces-in-dir]])
   (:refer-clojure :exclude [compile])
   (:import (org.apache.tools.ant.taskdefs Java)
            (java.lang.management ManagementFactory)
diff --git a/src/leiningen/deploy.clj b/src/leiningen/deploy.clj
index 0eb295ca..2b2793bf 100644
--- a/src/leiningen/deploy.clj
+++ b/src/leiningen/deploy.clj
@@ -1,6 +1,6 @@
 (ns leiningen.deploy
   "Build and deploy jar to remote repository."
-  (:require [lancet])
+  (:require [lancet.core :as lancet])
   (:use [leiningen.core :only [abort repositories-for]]
         [leiningen.jar :only [jar]]
         [leiningen.pom :only [pom snapshot?]]
diff --git a/src/leiningen/deps.clj b/src/leiningen/deps.clj
index 57a8ea06..6a25c740 100644
--- a/src/leiningen/deps.clj
+++ b/src/leiningen/deps.clj
@@ -1,6 +1,6 @@
 (ns leiningen.deps
   "Download all dependencies and place them in the :library-path."
-  (:require [lancet])
+  (:require [lancet.core :as lancet])
   (:use [leiningen.core :only [repositories-for]]
         [leiningen.util.maven :only [make-dependency]]
         [leiningen.util.file :only [delete-file-recursively]])
diff --git a/src/leiningen/jar.clj b/src/leiningen/jar.clj
index b0628643..741fe278 100644
--- a/src/leiningen/jar.clj
+++ b/src/leiningen/jar.clj
@@ -2,7 +2,7 @@
   "Package up all the project's files into a jar file."
   (:require [leiningen.compile :as compile]
             [clojure.string :as string]
-            [lancet])
+            [lancet.core :as lancet])
   (:use [leiningen.pom :only [make-pom make-pom-properties]]
         [leiningen.deps :only [deps]]
         [clojure.java.io :only [copy file]])
diff --git a/src/leiningen/javac.clj b/src/leiningen/javac.clj
index bc883657..96cecad1 100644
--- a/src/leiningen/javac.clj
+++ b/src/leiningen/javac.clj
@@ -1,7 +1,7 @@
 (ns leiningen.javac
   "Compile Java source files."
   (:use [leiningen.classpath :only [get-classpath-string]])
-  (:require [lancet])
+  (:require [lancet.core :as lancet])
   (:import (java.io File)))
 
 (def ^{:doc "Default options for the java compiler."} *default-javac-options*