Improved Ant
svn path=/nixpkgs/trunk/; revision=1254
This commit is contained in:
parent
2c61f2f1af
commit
3f371bfacf
@ -9,6 +9,7 @@ export JAVA_HOME=$j2sdk
|
|||||||
export JAVACMD=$j2sdk/bin/java
|
export JAVACMD=$j2sdk/bin/java
|
||||||
export ANT_OPTS=""
|
export ANT_OPTS=""
|
||||||
export ANT_ARGS=""
|
export ANT_ARGS=""
|
||||||
|
export LANG="en_US"
|
||||||
|
|
||||||
$ant/bin/core-ant \$@
|
$ant/bin/core-ant \$@
|
||||||
EOF
|
EOF
|
||||||
|
@ -24,6 +24,7 @@ rm $out/bin/* || exit 1
|
|||||||
cat >> $out/bin/core-ant <<EOF
|
cat >> $out/bin/core-ant <<EOF
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
|
|
||||||
# Variables:
|
# Variables:
|
||||||
# JAVA_HOME
|
# JAVA_HOME
|
||||||
# JAVACMD
|
# JAVACMD
|
||||||
@ -39,8 +40,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "\$JIKESPATH" ]; then
|
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
|
exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" -Djikes.class.path="\$JIKESPATH" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
|
||||||
ib "$CLASSPATH" "\$@"
|
|
||||||
else
|
else
|
||||||
exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
|
exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
|
||||||
fi
|
fi
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
{stdenv, fetchurl, j2sdk}:
|
{stdenv, fetchurl, j2sdk}:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
|
|
||||||
body =
|
body =
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = ant.realname;
|
name = ant.realname;
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
inherit ant j2sdk;
|
|
||||||
buildInputs = [ant j2sdk];
|
buildInputs = [ant j2sdk];
|
||||||
|
inherit ant j2sdk;
|
||||||
};
|
};
|
||||||
|
|
||||||
ant =
|
ant =
|
||||||
|
Loading…
x
Reference in New Issue
Block a user