Skip to content

Commit

Permalink
Move to lancet as a separate project.
Browse files Browse the repository at this point in the history
Requires re-running "lein-stable deps" in checkout if you are running
from source.
  • Loading branch information
technomancy committed Mar 10, 2011
1 parent beeb8ed commit c99af38
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion TUTORIAL.md
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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 it at [Clojars](http://clojars.org). Once you have created an account
there, publishing is easy: there, publishing is easy:


$ lein jar && lein pom $ lein jar, pom
$ scp pom.xml myproject-1.0.0.jar clojars@clojars.org: $ scp pom.xml myproject-1.0.0.jar clojars@clojars.org:


Once that succeeds it will be available as a package on which other Once that succeeds it will be available as a package on which other
Expand Down
3 changes: 1 addition & 2 deletions project.clj
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
:license {:name "Eclipse Public License"} :license {:name "Eclipse Public License"}
:dependencies [[org.clojure/clojure "1.2.0"] :dependencies [[org.clojure/clojure "1.2.0"]
[org.clojure/clojure-contrib "1.2.0"] [org.clojure/clojure-contrib "1.2.0"]
[org.apache.ant/ant "1.7.1"] [lancet "1.0.0"]
[org.apache.ant/ant-nodeps "1.7.1"]
[jline "0.9.94"] [jline "0.9.94"]
[robert/hooke "1.1.0"] [robert/hooke "1.1.0"]
[org.apache.maven/maven-ant-tasks "2.0.10" :exclusions [ant]]] [org.apache.maven/maven-ant-tasks "2.0.10" :exclusions [ant]]]
Expand Down
2 changes: 2 additions & 0 deletions src/lancet.clj
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
(java.util.concurrent CountDownLatch) (java.util.concurrent CountDownLatch)
(org.apache.tools.ant.types Path))) (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"} (def #^{:doc "Dummy ant project to keep Ant tasks happy"}
ant-project ant-project
(let [proj (org.apache.tools.ant.Project.) (let [proj (org.apache.tools.ant.Project.)
Expand Down
14 changes: 7 additions & 7 deletions src/leiningen/compile.clj
Original file line number Original file line Diff line number Diff line change
@@ -1,12 +1,12 @@
(ns leiningen.compile (ns leiningen.compile
"Compile Clojure source into .class files." "Compile Clojure source into .class files."
(:require lancet) (:require [lancet.core :as lancet])
(:use [leiningen.deps :only [deps]] (:use [leiningen.deps :only [deps]]
[leiningen.core :only [ns->path]] [leiningen.core :only [ns->path]]
[leiningen.javac :only [javac]] [leiningen.javac :only [javac]]
[leiningen.classpath :only [make-path find-lib-jars get-classpath]] [leiningen.classpath :only [make-path find-lib-jars get-classpath]]
[clojure.java.io :only [file]] [clojure.java.io :only [file]]
[leiningen.util.ns :only [namespaces-in-dir]]) [leiningen.util.ns :only [namespaces-in-dir]])
(:refer-clojure :exclude [compile]) (:refer-clojure :exclude [compile])
(:import (org.apache.tools.ant.taskdefs Java) (:import (org.apache.tools.ant.taskdefs Java)
(java.lang.management ManagementFactory) (java.lang.management ManagementFactory)
Expand Down
2 changes: 1 addition & 1 deletion src/leiningen/deploy.clj
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns leiningen.deploy (ns leiningen.deploy
"Build and deploy jar to remote repository." "Build and deploy jar to remote repository."
(:require [lancet]) (:require [lancet.core :as lancet])
(:use [leiningen.core :only [abort repositories-for]] (:use [leiningen.core :only [abort repositories-for]]
[leiningen.jar :only [jar]] [leiningen.jar :only [jar]]
[leiningen.pom :only [pom snapshot?]] [leiningen.pom :only [pom snapshot?]]
Expand Down
2 changes: 1 addition & 1 deletion src/leiningen/deps.clj
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns leiningen.deps (ns leiningen.deps
"Download all dependencies and place them in the :library-path." "Download all dependencies and place them in the :library-path."
(:require [lancet]) (:require [lancet.core :as lancet])
(:use [leiningen.core :only [repositories-for]] (:use [leiningen.core :only [repositories-for]]
[leiningen.util.maven :only [make-dependency]] [leiningen.util.maven :only [make-dependency]]
[leiningen.util.file :only [delete-file-recursively]]) [leiningen.util.file :only [delete-file-recursively]])
Expand Down
2 changes: 1 addition & 1 deletion src/leiningen/jar.clj
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Package up all the project's files into a jar file." "Package up all the project's files into a jar file."
(:require [leiningen.compile :as compile] (:require [leiningen.compile :as compile]
[clojure.string :as string] [clojure.string :as string]
[lancet]) [lancet.core :as lancet])
(:use [leiningen.pom :only [make-pom make-pom-properties]] (:use [leiningen.pom :only [make-pom make-pom-properties]]
[leiningen.deps :only [deps]] [leiningen.deps :only [deps]]
[clojure.java.io :only [copy file]]) [clojure.java.io :only [copy file]])
Expand Down
2 changes: 1 addition & 1 deletion src/leiningen/javac.clj
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns leiningen.javac (ns leiningen.javac
"Compile Java source files." "Compile Java source files."
(:use [leiningen.classpath :only [get-classpath-string]]) (:use [leiningen.classpath :only [get-classpath-string]])
(:require [lancet]) (:require [lancet.core :as lancet])
(:import (java.io File))) (:import (java.io File)))


(def ^{:doc "Default options for the java compiler."} *default-javac-options* (def ^{:doc "Default options for the java compiler."} *default-javac-options*
Expand Down

0 comments on commit c99af38

Please sign in to comment.