From f6d3d9494d1c795ae034d98aaff40663f8de5601 Mon Sep 17 00:00:00 2001
From: "Eric J. Bowersox" <erbo@erbosoft.com>
Date: Sun, 6 Jun 2004 05:19:48 +0000
Subject: [PATCH] instead of having separate class files, all the Venice
 classes are now compiled into one Venice jar file

---
 .gitignore |  2 ++
 build.xml  | 72 ++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 81cd42a..3ad6bb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 build.properties
+buildwork
+jars
 
diff --git a/build.xml b/build.xml
index ddd1b89..e6165fd 100644
--- a/build.xml
+++ b/build.xml
@@ -10,13 +10,13 @@
 
     The Original Code is the Venice Web Communities System.
 
-    The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+    The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001-04 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
-<project name="Venice" default="compile">
+<project name="Venice" default="deploy">
 
   <!-- ============================================================================
     Load build properties
@@ -86,6 +86,40 @@
     <fileset dir="${bsf.lib}" includes="${bsf.jarfile}"/>
   </path>
 
+  <!-- ============================================================================
+    "buildprep" - Creates the build directories
+    ============================================================================ -->
+
+  <target name="buildprep">
+    <mkdir dir="buildwork"/>
+    <mkdir dir="jars"/>
+  </target>
+
+  <!-- ============================================================================
+    "compile" - Compile all the Java source
+    ============================================================================ -->
+
+  <target name="compile" depends="buildprep">
+    <javac srcdir="src" destdir="buildwork" debug="${compile.debug}" optimize="${compile.optimize}"
+           deprecation="${compile.deprecation}">
+      <classpath>
+	<pathelement location="buildwork"/>
+        <path refid="base.build.path"/>
+      </classpath>
+    </javac>
+    <copy todir="buildwork">
+      <fileset dir="src" includes="**/*.properties"/>
+    </copy>
+  </target>
+
+  <!-- ============================================================================
+    "jar" - Create the JAR file of all the Java compiled code
+    ============================================================================ -->
+
+  <target name="jar" depends="compile">
+    <jar destfile="jars/venice001.jar" basedir="buildwork"/>
+  </target>
+
   <!-- ============================================================================
     "mkbasedirs" - Creates the base directories for "fastupdate"
     ============================================================================ -->
@@ -115,11 +149,11 @@
   </target>
 
   <!-- ============================================================================
-    "prepare" - Prepare directory for build (copy everything that requires a
-                restart to take effect)
+    "deploy" - Copy everything to the deployment directory, including stuff that
+               requires a restart to take effect.
     ============================================================================ -->
 
-  <target name="prepare" depends="mkbasedirs">
+  <target name="deploy" depends="jar,fastupdate">
     <copy todir="${deploy.home}/WEB-INF">
       <fileset dir="etc">
 	<include name="*.xml"/>
@@ -137,6 +171,7 @@
       <!-- <fileset dir="${jacl.lib}" includes="${jacl.jarfile}, ${jacl.tcljarfile}"/> -->
       <fileset dir="${rhino.lib}" includes="${rhino.jarfile}"/>
       <fileset dir="lib" includes="*.jar"/>
+      <fileset dir="jars" includes="venice001.jar"/>
     </copy>
     <mkdir  dir="${deploy.home}/WEB-INF/tlds"/>
     <copy todir="${deploy.home}/WEB-INF/tlds">
@@ -145,31 +180,14 @@
       </fileset>
     </copy>
     <mkdir  dir="${deploy.home}/WEB-INF/temp"/>
-    <mkdir  dir="${javadoc.home}"/>
-  </target>
-
-  <!-- ============================================================================
-    "compile" - Compile all the Java source
-    ============================================================================ -->
-
-  <target name="compile" depends="prepare, fastupdate">
-    <javac srcdir="src" destdir="${deploy.home}/WEB-INF/classes"
-           debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
-      <classpath>
-	<pathelement location="${deploy.home}/WEB-INF/classes"/>
-        <path refid="base.build.path"/>
-      </classpath>
-    </javac>
-    <copy todir="${deploy.home}/WEB-INF/classes">
-      <fileset dir="src" includes="**/*.properties"/>
-    </copy>
   </target>
 
   <!-- ============================================================================
     "javadoc" - Create Javadocs
     ============================================================================ -->
 
-  <target name="javadoc" depends="mkbasedirs,prepare">
+  <target name="javadoc" depends="mkbasedirs">
+    <mkdir dir="${javadoc.home}"/>
     <javadoc sourcepath="src" packagenames="*" destdir="${javadoc.home}"/>
   </target>
 
@@ -179,12 +197,14 @@
 
   <target name="clean">
     <delete dir="${deploy.home}"/>
+    <delete dir="buildwork"/>
+    <delete dir="jars"/>
   </target>
 
   <!-- ============================================================================
     "all" - Build entire project
     ============================================================================ -->
 
-  <target name="all" depends="clean,mkbasedirs,prepare,fastupdate,compile,javadoc"/>
+  <target name="all" depends="clean,deploy,javadoc"/>
 
 </project>