public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept NIX_ANT_OPTS 

svn path=/nixpkgs/trunk/; revision=4132
This commit is contained in:
Martin Bravenboer 2005-10-25 17:57:36 +00:00
parent 0fb522de95
commit 8e2ba28fe1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/build-managers/apache-ant/core-builder.sh
View File

@ -28,7 +28,7 @@ cat >> $out/bin/core-ant <<EOF
# Variables:
# JAVA_HOME
# JAVACMD
# ANT_OPTS
# ANT_OPTS, NIX_ANT_OPTS
# ANT_ARGS
ANT_HOME=$out
@ -40,9 +40,9 @@ 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 -lib "$CLASSPATH" "\$@"
exec "\$JAVACMD" \$NIX_ANT_OPTS \$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" "\$@"
exec "\$JAVACMD" \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
fi
fi
EOF