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

Fix NPE when using -Xbootclasspath with transitive requires.

Browse source
This commit is contained in:
Phil Hagelberg 2009-12-01 23:02:44 -08:00
parent f2a1e1ec97
commit 3a4c7e0408
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/lein
View file

@ -69,7 +69,5 @@ elif [ "$1" = "self-install" ]; then
exec wget -O "$LEIN_JAR" "$LEIN_URL"
fi
else
# Temporarily disabled while debugging NPE.
# exec java -Xbootclasspath/a:"$CLOJURE_JAR" -client -cp "$CLASSPATH" clojure.main -e "(use 'leiningen.core)(-main $ESCAPED_ARGS)"
exec java -client -cp "$CLASSPATH" clojure.main -e "(use 'leiningen.core)(-main $ESCAPED_ARGS)"
exec java -Xbootclasspath/a:"$CLOJURE_JAR" -client -cp "$CLASSPATH" clojure.main -e "(use 'leiningen.core)(-main $ESCAPED_ARGS)"
fi

3
src/leiningen/test.clj
View file

@ -1,6 +1,9 @@
(ns leiningen.test
"Run the project's tests."
(:refer-clojure :exclude [test])
;; When using -Xbootclasspath transitive requires break, so we need
;; to require stuff that clojure.test depends on explicitly:
(:require [clojure walk template stacktrace])
(:use [clojure.test]
[clojure.contrib.java-utils :only [file]]
[clojure.contrib.find-namespaces :only [find-namespaces-in-dir]]