diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-10-25 17:57:36 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-10-25 17:57:36 +0000 |
| commit | 8e2ba28fe1154da93e2f5ab5dbced37ae23a92da (patch) | |
| tree | ad5d62b7e328ff5d530233f7c93aa6d1d1502b32 /pkgs/development/tools/build-managers/apache-ant | |
| parent | 0fb522de9584a1708bbd54ae1fc6a1b5a72c6fdc (diff) | |
| download | nixlib-8e2ba28fe1154da93e2f5ab5dbced37ae23a92da.tar nixlib-8e2ba28fe1154da93e2f5ab5dbced37ae23a92da.tar.gz nixlib-8e2ba28fe1154da93e2f5ab5dbced37ae23a92da.tar.bz2 nixlib-8e2ba28fe1154da93e2f5ab5dbced37ae23a92da.tar.lz nixlib-8e2ba28fe1154da93e2f5ab5dbced37ae23a92da.tar.xz nixlib-8e2ba28fe1154da93e2f5ab5dbced37ae23a92da.tar.zst nixlib-8e2ba28fe1154da93e2f5ab5dbced37ae23a92da.zip | |
Accept NIX_ANT_OPTS
svn path=/nixpkgs/trunk/; revision=4132
Diffstat (limited to 'pkgs/development/tools/build-managers/apache-ant')
| -rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/core-builder.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh index e06c6a2d2ca8..612a11202d53 100644 --- a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh +++ b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh @@ -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 |