Skip to content
Browse files

Move to lancet as a separate project.

Requires re-running "lein-stable deps" in checkout if you are running
from source.
  • Loading branch information...
1 parent beeb8ed commit c99af38529b13f06d18c0ce047cafa6bbe5390d9 @technomancy committed
Showing with 15 additions and 14 deletions.
  1. +1 −1 TUTORIAL.md
  2. +1 −2 project.clj
  3. +2 −0 src/lancet.clj
  4. +7 −7 src/leiningen/compile.clj
  5. +1 −1 src/leiningen/deploy.clj
  6. +1 −1 src/leiningen/deps.clj
  7. +1 −1 src/leiningen/jar.clj
  8. +1 −1 src/leiningen/javac.clj
View
2 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
View
3 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]]]
View
2 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.)
View
14 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)
View
2 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?]]
View
2 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]])
View
2 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]])
View
2 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*

0 comments on commit c99af38

Please sign in to comment.
Something went wrong with that request. Please try again.