From 184f07a76513dadf532083db91caa0e63d0e3e8a Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Sat, 3 Mar 2001 22:17:02 +0000
Subject: [PATCH] Eliminate build.sh because we use the debian ant package to
 compile now. Modified build.xml to include jar files from the shared java
 directory provided by Debian.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@85 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 projects/samskivert/build.sh  | 24 ------------------------
 projects/samskivert/build.xml | 14 ++++++++------
 2 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100755 projects/samskivert/build.sh

diff --git a/projects/samskivert/build.sh b/projects/samskivert/build.sh
deleted file mode 100755
index 51a284b0..00000000
--- a/projects/samskivert/build.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# $Id: build.sh,v 1.1 2001/03/03 21:21:46 mdb Exp $
-
-# complain if JAVA_HOME isn't set
-if [ -z "$JAVA_HOME" ]; then
-    echo JAVA_HOME must be set to your JVM install directory.
-    exit -1
-fi
-
-# complain if ANT_HOME isn't set
-if [ -z "$ANT_HOME" ]; then
-    echo ANT_HOME must be set to your ANT install directory.
-    exit -1
-fi
-
-# set up our classpath
-CP=$ANT_HOME/lib/ant.jar
-CP=$CP:$ANT_HOME/../lib/jaxp.jar
-CP=$CP:$ANT_HOME/../lib/crimson.jar
-CP=$CP:$JAVA_HOME/lib/tools.jar
-
-# execute ANT to perform the requested build target
-java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main "$@"
diff --git a/projects/samskivert/build.xml b/projects/samskivert/build.xml
index 7dfb3b71..3071e228 100644
--- a/projects/samskivert/build.xml
+++ b/projects/samskivert/build.xml
@@ -6,8 +6,9 @@
   <property name="deploy.home"    value="dist"/>
   <property name="dist.home"      value="${deploy.home}"/>
   <property name="dist.jar"       value="${app.name}.jar"/>
-  <property name="javadoc.home"   value="${deploy.home}/javadoc"/>
+  <property name="javadoc.home"   value="${deploy.home}/docs"/>
   <property name="build.compiler" value="jikes"/>
+  <property name="java.libraries" value="/usr/share/java"/>
 
   <!-- prepares the application directories -->
   <target name="prepare">
@@ -23,20 +24,21 @@
 
   <!-- build the java class files -->
   <target name="compile" depends="prepare">
-    <javac srcdir="src" destdir="${deploy.home}/classes"
+    <javac srcdir="src/java" destdir="${deploy.home}/classes"
            debug="on" optimize="off" deprecation="off">
       <classpath>
+        <fileset dir="${java.libraries}" includes="**/*.jar"/>
+        <fileset dir="lib" includes="**/*.jar"/>
         <pathelement location="${deploy.home}/classes"/>
-        <fileset dir="lib">
-          <include name="**/*.jar" />
-        </fileset>
       </classpath>
     </javac>
   </target>
 
   <!-- build the javadoc documentation -->
   <target name="javadoc" depends="prepare">
-    <javadoc sourcepath="src" packagenames="*"
+    <javadoc sourcepath="src/java"
+             packagenames="com.samskivert.*"
+             classpath="${deploy.home}/classes"
              destdir="${javadoc.home}"/>
   </target>