From 5970b1eef908f7076ff2fde97f9b28f1fad5d760 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 6 Oct 2003 21:24:30 +0000
Subject: [PATCH] Removed the explicit specification of the build compiler and
 optimization configurations. We'll specify these in the top-level ant
 invocation and it can filter down for the whole build.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2820 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 bin/ant         | 3 +--
 build.xml       | 6 +++---
 tests/build.xml | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bin/ant b/bin/ant
index 8f9db951d..88e932aa3 100755
--- a/bin/ant
+++ b/bin/ant
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# $Id: ant,v 1.3 2002/05/08 23:04:07 shaper Exp $
+# $Id: ant,v 1.4 2003/10/06 21:24:29 mdb Exp $
 #
 # Invokes our desired version of ant with all of our jar files in the
 # classpath.
 
 BINDIR=`dirname $0`
-ANT_COMPILER="-Dbuild.compiler=jikes"
 
 # process our arguments
 while [ ! -z "$1" ]; do
diff --git a/build.xml b/build.xml
index 635d78c10..31f6fba61 100644
--- a/build.xml
+++ b/build.xml
@@ -7,8 +7,6 @@
 
   <!-- configuration parameters -->
   <property name="app.name"       value="narya"/>
-  <property name="build.compiler" value="jikes"/>
-  <property name="build.optimize" value="off"/>
   <property name="deploy.dir"     value="dist"/>
   <property name="savedoc.dir"    value="docs"/>
 
@@ -116,9 +114,11 @@
     <javadoc sourcepath="src/java"
              packagenames="com.threerings.*"
              destdir="${javadoc.home}"
-             additionalparam="-breakiterator">
+             additionalparam="-breakiterator"
+             link="http://dev.threerings.net/devel/docs/narya/">
       <classpath refid="classpath"/>
       <link href="http://java.sun.com/j2se/1.4/docs/api/"/>
+      <link href="http://dev.threerings.net/devel/docs/samskivert/"/>
     </javadoc>
     <copy todir="${javadoc.home}">
       <fileset dir="src/java" includes="**/*.png"/>
diff --git a/tests/build.xml b/tests/build.xml
index 124ea57a3..a5def67c8 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -2,7 +2,6 @@
 <project name="narya tests" default="compile" basedir=".">
 
   <!-- things you may want to change -->
-  <property name="build.compiler" value="jikes"/>
   <property name="junit.fork"     value="true"/>
 
   <!-- we want to access the environment -->