From 70b8797c4b513e0aa1195dc9dc64770828504ab8 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 16 Nov 2006 22:51:02 +0000
Subject: [PATCH] Use new safer library locating process.

---
 build.xml     |  8 ++------
 libs-incl.xml | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/build.xml b/build.xml
index 7059a38..17cfda3 100644
--- a/build.xml
+++ b/build.xml
@@ -5,6 +5,8 @@
   <property name="app.name" value="getdown"/>
   <property name="src.dir" value="src/java"/>
   <property name="deploy.dir" value="dist"/>
+  <property name="libs.dir" value="lib"/>
+  <import file="libs-incl.xml"/>
 
   <!-- these are only used if we're going to sign things -->
   <property file="build.properties"/>
@@ -18,12 +20,6 @@
   <property name="copyright.holder" value="Three Rings Design, Inc."/>
   <property name="copy.post"    value="All Rights Reserved."/>
 
-  <!-- import some targets to enumerate library dependencies -->
-  <property name="projects.root" value="."/>
-  <property name="libs.dir"      value="lib"/>
-  <property name="distlib.dir"   value="lib"/>
-  <import file="libs-incl.xml"/>
-
   <!-- declare our classpath -->
   <path id="clazzpath">
     <pathelement location="${deploy.dir}/classes"/>
diff --git a/libs-incl.xml b/libs-incl.xml
index 69a70ba..3a44406 100644
--- a/libs-incl.xml
+++ b/libs-incl.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!-- declares the libraries needed to build getdown -->
 <project name="library-dependencies">
-  <fileset dir="${projects.root}" id="getdown.libs">
-    <include name="${libs.dir}/ant.jar"/>
-    <include name="${libs.dir}/commons-codec.jar"/>
-    <include name="${libs.dir}/commons-io.jar"/>
-    <include name="${libs.dir}/proguard.jar"/>
-    <include name="${libs.dir}/retroweaver-all-1.2.2.jar"/>
-    <include name="${libs.dir}/retroweaver-rt-1.2.2.jar"/>
-    <include name="${distlib.dir}/snark.jar"/>
-    <include name="${distlib.dir}/samskivert.jar"/>
-    <include name="lib/javaws.jar"/>
+  <fileset dir="${libs.dir}" id="getdown.libs">
+    <include name="ant.jar"/>
+    <include name="commons-codec.jar"/>
+    <include name="commons-io.jar"/>
+    <include name="javaws.jar"/>
+    <include name="proguard.jar"/>
+    <include name="retroweaver-all-1.2.2.jar"/>
+    <include name="retroweaver-rt-1.2.2.jar"/>
+    <include name="samskivert.jar"/>
+    <include name="snark.jar"/>
   </fileset>
 </project>