From 66f3eac2db9487a8c47fc2db4ff2d58d4f79dd1d Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sun, 14 Apr 2002 01:32:21 +0000
Subject: [PATCH] Modified the ant wrapper scripts to handle being passed -D
 arguments more cleanly.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1236 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 bin/ant | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/bin/ant b/bin/ant
index ae5ab6829..dbbff03af 100755
--- a/bin/ant
+++ b/bin/ant
@@ -1,24 +1,37 @@
 #!/bin/sh
 #
-# $Id: ant,v 1.1 2002/02/05 21:39:22 mdb Exp $
+# $Id: ant,v 1.2 2002/04/14 01:32:21 mdb Exp $
 #
 # Invokes our desired version of ant with all of our jar files in the
 # classpath.
 
 BINDIR=`dirname $0`
-ANT_OPTS="-Dbuild.compiler=jikes"
+ANT_COMPILER="-Dbuild.compiler=jikes"
+
+# process our arguments
+while [ ! -z "$1" ]; do
+    case "$1" in
+    -Dbuild.compiler=*)
+        ANT_COMPILER="$1"
+        ;;
+    -D*)
+        ANT_OPTS="$ANT_OPTS $1"
+        ;;
+    -d)
+        ANT_OPTS="$ANT_OPTS -Dbuild.optimize=off"
+        ;;
+    *)
+        ARGS="$ARGS $1"
+        ;;
+    esac
+    shift
+done
 
 # Load default settings from config file (if it exists)
 if [ -f "$HOME/.antrc" ]; then
   . "$HOME/.antrc"
 fi
 
-# determine whether or not we want optimization off
-if [ "$1" == "-d" ]; then
-    shift
-    ANT_OPTS="$ANT_OPTS -Dbuild.optimize=off"
-fi
-
 # add all JAR files in JAVA_LIBS to CLASSPATH
 SYSTEMCP=`echo $JAVA_LIBS/*.jar | tr ' ' ':'`
 
@@ -35,5 +48,5 @@ else
 fi
 export CLASSPATH
 
-$JAVA_HOME/bin/java $ANT_OPTS -Dant.home=/usr/share/ant \
-	org.apache.tools.ant.Main $@
+$JAVA_HOME/bin/java $ANT_COMPILER $ANT_OPTS -Dant.home=/usr/share/ant \
+	org.apache.tools.ant.Main $ARGS