Improved Ant

svn path=/nixpkgs/trunk/; revision=1254
This commit is contained in:
Martin Bravenboer 2004-08-09 21:28:26 +00:00
parent 2c61f2f1af
commit 3f371bfacf
3 changed files with 4 additions and 4 deletions

View file

@ -9,6 +9,7 @@ export JAVA_HOME=$j2sdk
export JAVACMD=$j2sdk/bin/java
export ANT_OPTS=""
export ANT_ARGS=""
export LANG="en_US"
$ant/bin/core-ant \$@
EOF

View file

@ -24,6 +24,7 @@ rm $out/bin/* || exit 1
cat >> $out/bin/core-ant <<EOF
#! /bin/sh
# Variables:
# JAVA_HOME
# JAVACMD
@ -39,8 +40,7 @@ else
fi
if [ -n "\$JIKESPATH" ]; then
exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" -Djikes.class.path="\$JIKESPATH" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -l
ib "$CLASSPATH" "\$@"
exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" -Djikes.class.path="\$JIKESPATH" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
else
exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
fi

View file

@ -1,13 +1,12 @@
{stdenv, fetchurl, j2sdk}:
rec {
body =
stdenv.mkDerivation {
name = ant.realname;
builder = ./builder.sh;
inherit ant j2sdk;
buildInputs = [ant j2sdk];
inherit ant j2sdk;
};
ant =