From 5e5f871f58ed1eb57c677ff85bce3e0a97842cf5 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 6 Mar 2002 20:26:24 +0000
Subject: [PATCH] Allow overriding build properties in build.properties.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1094 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .cvsignore |  1 +
 build.xml  | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .cvsignore

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 000000000..56fb545fa
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1 @@
+build.properties
diff --git a/build.xml b/build.xml
index e03057d70..b49585083 100644
--- a/build.xml
+++ b/build.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" standalone="yes"?>
-
 <!-- build configuration -->
 <project name="narya" default="compile" basedir=".">
 
+  <!-- import overriding properties -->
+  <property file="build.properties"/>
+
   <!-- configuration parameters -->
   <property name="app.name"       value="narya"/>
-  <property name="deploy.dir"     value="dist"/>
-  <property name="dist.jar"       value="${app.name}.jar"/>
-  <property name="javadoc.home"   value="${deploy.dir}/docs"/>
   <property name="build.compiler" value="jikes"/>
   <property name="build.optimize" value="off"/>
+  <property name="deploy.dir"     value="dist"/>
+
+  <!-- derived properties -->  
+  <property name="dist.jar"       value="${app.name}.jar"/>
+  <property name="javadoc.home"   value="${deploy.dir}/docs"/>
 
   <!-- we want to access the environment -->
   <property environment="env"/>
@@ -64,6 +68,7 @@
              destdir="${javadoc.home}"
              additionalparam="-breakiterator">
       <classpath refid="classpath"/>
+      <link href="http://java.sun.com/j2se/1.4/docs/api/"/>
     </javadoc>
     <copy todir="${javadoc.home}">
       <fileset dir="src/java" includes="**/*.png"/>