yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #261 from robwolfe/upstream

Browse source 
installing in local repository even if target directory redefined in settings.xml
This commit is contained in:
Phil Hagelberg 2011-09-27 09:05:41 -07:00
commit ae84d2d1d3
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/leiningen/install.clj
View file

@ -61,8 +61,7 @@ shell wrappers in ~/.lein/bin when provided."
(let [[name group] ((juxt name namespace) (symbol project-name)) (let [[name group] ((juxt name namespace) (symbol project-name))
_ (standalone-download name (or group name) version) _ (standalone-download name (or group name) version)
temp-project (format "%s/lein-%s" tmp-dir (UUID/randomUUID)) temp-project (format "%s/lein-%s" tmp-dir (UUID/randomUUID))
jarfile (-> (local-repo-path (or group name) name version) jarfile (local-repo-path (or group name) name version)]
(.replace "$HOME" (System/getProperty "user.home")))]
(install-shell-wrappers (JarFile. jarfile)) (install-shell-wrappers (JarFile. jarfile))
;; TODO: use lancet/unjar? ;; TODO: use lancet/unjar?
(try (extract-jar (file jarfile) temp-project) (try (extract-jar (file jarfile) temp-project)

5
src/leiningen/jar.clj
View file

@ -5,6 +5,7 @@
[lancet.core :as 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]]
[leiningen.util.maven :only [make-local-repo]]
[clojure.java.io :only [copy file]]) [clojure.java.io :only [copy file]])
(:import (java.util.jar Manifest JarEntry JarOutputStream) (:import (java.util.jar Manifest JarEntry JarOutputStream)
(java.util.regex Pattern) (java.util.regex Pattern)
@ -33,8 +34,8 @@
(local-repo-path {:group group :name name :version version})) (local-repo-path {:group group :name name :version version}))
([{:keys [group name version]}] ([{:keys [group name version]}]
(unix-path (format (unix-path (format
"$HOME/.m2/repository/%s/%s/%s/%s-%s.jar" "%s/%s/%s/%s/%s-%s.jar"
(.replace group "." "/") name version name version)))) (.getBasedir (make-local-repo)) (.replace group "." "/") name version name version))))
(defn- script-classpath-for [project deps-fileset system] (defn- script-classpath-for [project deps-fileset system]
(let [deps (when deps-fileset (let [deps (when deps-fileset

5
test/leiningen/test/helper.clj
View file

@ -2,9 +2,10 @@
(:require [lancet.core :as lancet]) (:require [lancet.core :as lancet])
(:use [clojure.java.io :only [file]] (:use [clojure.java.io :only [file]]
[leiningen.compile :only [platform-nullsink]] [leiningen.compile :only [platform-nullsink]]
[leiningen.core :only [read-project]])) [leiningen.core :only [read-project]]
[leiningen.util.maven :only [make-local-repo]]))
(def local-repo (file (System/getProperty "user.home") ".m2" "repository")) (def local-repo (.getBasedir (make-local-repo)))
(defn m2-dir [n v] (defn m2-dir [n v]
(file local-repo (if (string? n) n (or (namespace n) (name n))) (name n) v)) (file local-repo (if (string? n) n (or (namespace n) (name n))) (name n) v))