- clojure formula now works with HEAD installs.
- Use /bin/sh rather than /bin/bash in the clj script.
- Fix argument-passing in the clj script. (FixesHomebrew/homebrew#867)
- Remove the Java -server flag in the clj script. This is the default
option on 64-bit Macs running 10.5 and 10.6 anyway, unless the user
has used Java Preferences to make the 32-bit VM the preferred VM, in
which case the default is -client. Choosing the 32-bit VM happens to
be the only way to use the client HotSpot VM, as the client VM is
not currently supported on 64-bit architectures. Presumably, if the
user prefers the 32-bit client VM, he has his reasons, and the clj
script should respect them. (The client VM has a faster start-up
time, for example, which may benefit command-line scripts written
in Clojure and invoked using clj.)
It would be nice to allow the user to be explicit about which VM to
use when invoking the clj script, but this would almost certainly
not be portable to other systems' implementations of the 'clj'
script, and would be difficult to document due to the fact that
clojure.main outputs its own usage message when supplied with a
--help/-h/-? argument. Anyone with special needs can simply write
his own wrapper script.
In any case, users of 64-bit Macs who haven't explicitly chosen the
32-bit Java VM in Java Preferences (i.e., probably most Homebrew
users) are unaffected by this change.
- clojure-contrib formula now installs the latest stable release
(1.1.0) by default (it used to install HEAD always). HEAD installs
are still supported via the --HEAD flag but require the HEAD version
of clojure; the build will break if the HEAD version of clojure is
not installed.
- clojure-contrib installs the pre-packaged JAR file, supplied in the
release ZIP file, if installing the release version.
- clojure-contrib only conditionally depends on maven, if installing
HEAD.
- clojure-contrib HEAD builds explicitly use the installed clojure HEAD
JAR file, per the clojure-contrib documentation. (HEAD builds prior
to this change would often mysteriously create a nearly-empty
clojure-contrib JAR file.)
- clojure-contrib always installs the JAR file as clojure-contrib.jar,
rather than adding a version suffix. The Cellar path is sufficient to
discriminate versions, and this way the JAR file name is consistent.
- Change the clojure-contrib homepage to point to the clojure-contrib
documentation, rather than the project's GitHub homepage.
- Clojure does not find the clojure-contrib JAR file unless the
CLASSPATH includes the JAR file name. Fix the clojure-contrib
caveat to reflect this behavior.
- Fix "already initialized constant JAR" warnings in both formulae.
Signed-off-by: David Höppner <0xffea@gmail.com>
$CLOJURE was passed to java -classpath, which
caused the $CLASSPATH ENV var to be ingored.
This is needed for the clojure-contrib formula,
and for using third-party classes, which is kind
of useful..
brewkit.rb changes ENV destructively, so lets not do that everytime a formula
is required. Now it's possible for other tools to require a formula
description without worrying about side-effects.
Merged the clj_repl and clj commands into one clj command, which either
invokes the REPL, or runs a script (similar to how the python command works).
Moved the script to DATA, instead of inline
