Accept NIX_ANT_OPTS
svn path=/nixpkgs/trunk/; revision=4132
This commit is contained in:
parent
0fb522de95
commit
8e2ba28fe1
@ -28,7 +28,7 @@ cat >> $out/bin/core-ant <<EOF
|
|||||||
# Variables:
|
# Variables:
|
||||||
# JAVA_HOME
|
# JAVA_HOME
|
||||||
# JAVACMD
|
# JAVACMD
|
||||||
# ANT_OPTS
|
# ANT_OPTS, NIX_ANT_OPTS
|
||||||
# ANT_ARGS
|
# ANT_ARGS
|
||||||
|
|
||||||
ANT_HOME=$out
|
ANT_HOME=$out
|
||||||
@ -40,9 +40,9 @@ 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 -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
|
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
|
||||||
fi
|
fi
|
||||||
EOF
|
EOF
|
||||||
|
Loading…
x
Reference in New Issue
Block a user