X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build.xml;h=d26d6951e0a180086f5254efa22e9c9ba8788e2b;hb=b5b530de69f9b675a473baae08cc83d8d265e1b9;hp=350492c46e2f51a1b36064090926b95fa06c8dc9;hpb=3a2587015308aeca2d9895edbc35ca2d2b84ebed;p=mir.git

diff --git a/build.xml b/build.xml
index 350492c4..d26d6951 100755
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,20 @@
 <project name="Mir" default="compile" basedir=".">
 
 
+<!-- What this file is all about
+
+     You can use this version of build.xml to use directly with ant
+     i.e. without the build.sh script. Simply call ant and let it all
+     happen.
+-->
+
 <!-- Property Definitions
+
+     Please not that only the first couple of properties have to be defined.
+     The rest, residing below the "no customization needed" line may be
+     customized if you know what you are doing. Else, leave the defaults
+     and use them to look up where ant places all the files.
+
      app.name          Base name of this application, used to
                        construct filenames and directories.
 
@@ -10,6 +23,9 @@
                        Normally, this will be the name of a
                        subdirectory under $TOMCAT_HOME/webapps.
 
+     deploy.classes    The name of the directory that will contain
+                       the class files.
+
      dist.home	       The name of the base directory in which
                        distribution files are created.
 
@@ -30,15 +46,58 @@
                        Tomcat has been installed.  This value is
                        normally set automatically from the value
                        of the TOMCAT_HOME environment variable.
+
+	java.home          The location of your Java SDK.
+
+	java.localhome     Where your local java classes and jar files
+                       are located.
+
+	tomcat.home        The location of the tomcat root directory.
+
 -->
 
   <property name="app.name"       value="Mir"/>
   <property name="deploy.home"    value="../${app.name}"/>
+
+
+<!-- No customization required after this line -->
+
   <property name="dist.home"      value="${deploy.home}"/>
+  <property name="deploy.webinf"  value="${deploy.home}/WEB-INF"/>
+  <property name="deploy.classes" value="${deploy.webinf}/classes"/>
   <property name="dist.src"       value="${app.name}.jar"/>
   <property name="dist.war"       value="${app.name}.war"/>
   <property name="javadoc.home"   value="${deploy.home}/javadoc"/>
 
+  <!-- If you want to use the very good jikes compiler, uncomment this
+  <property name="build.compiler"   value="jikes"/>-->
+
+  <!-- The following 3 properties seem redundant -->
+  <property name="java.home"   	  value="/usr/lib/j2sdk1.3/"/>
+  <property name="java.localhome" value="/usr/share/java/"/>
+  <property name="tomcat.home"    value="/usr/share/tomcat/"/>
+
+
+  <!-- Construct the classpath -->
+  <path id="project.class.path">
+    <pathelement path="${deploy.home}"/>
+    <pathelement path="${deploy.classes}"/>
+    <pathelement path="source"/>
+    <fileset dir="lib">
+      <include name="*.jar"/>
+    </fileset>
+<!--    <fileset dir="${java.home}/lib">
+      <include name="tools.jar"/>
+      <include name="rt.jar"/>
+    </fileset>
+    <fileset dir="${java.localhome}">
+      <include name="*.jar"/>
+    </fileset>
+    <pathelement path="${tomcat.home}/lib/tomcat.jar"/>
+-->
+  </path>
+
+
 
 <!-- The "prepare" target is used to construct the deployment home
      directory structure (if necessary), and to copy in static files
@@ -63,10 +122,13 @@
 
     <mkdir  dir="${deploy.home}/WEB-INF"/>
     <copy  file="etc/web.xml"          tofile="${deploy.home}/WEB-INF/web.xml"/>
-    <mkdir  dir="${deploy.home}/WEB-INF/classes"/>
+    <mkdir  dir="${deploy.classes}"/>
     <mkdir  dir="${deploy.home}/WEB-INF/lib"/>
     <copy todir="${deploy.home}/WEB-INF/lib">
-      <fileset dir="lib"/>
+      <fileset dir="lib">
+        <exclude name="ant.jar"/>
+        <exclude name="xerces.jar"/>
+      </fileset>
     </copy>
     <mkdir  dir="${javadoc.home}"/>
     <mkdir  dir="${deploy.home}/log"/>
@@ -74,6 +136,7 @@
   </target>
 
 
+
 <!-- The "clean" target removes the deployment home directory structure,
      so that the next time the "compile" target is requested, it will need
      to compile everything from scratch.
@@ -81,10 +144,22 @@
 
 
   <target name="clean">
+    <delete dir="${deploy.classes}"/>
+	<mkdir dir="${deploy.classes}"/>
+  </target>
+
+
+
+<!-- The "mrproper" target removes the entire deploy dir - including all
+	built pages and images.
+-->
+
+  <target name="mrproper">
     <delete dir="${deploy.home}"/>
   </target>
 
 
+
 <!-- The "compile" target is used to compile (or recompile) the Java classes
      that make up this web application.  The recommended source code directory
      structure makes this very easy because the <javac> task automatically
@@ -102,12 +177,24 @@
 -->
 
   <target name="compile" depends="prepare">
-    <javac srcdir="source" destdir="${deploy.home}/WEB-INF/classes"
-           classpath="${deploy.home}/WEB-INF/classes"
-           debug="on" optimize="off" deprecation="on"/>
-    <copy   todir="${deploy.home}/WEB-INF/classes">
+	<antcall target="clean"/>
+    <javac srcdir="source" destdir="${deploy.classes}"
+           debug="on" optimize="off" deprecation="on">
+      <classpath refid="project.class.path"/>
+	</javac>
+    <copy   todir="${deploy.classes}">
       <fileset dir="source" includes="**/*.properties"/>
     </copy>
+    <copy   todir="${deploy.home}">
+      <fileset dir="source" includes="**/content-types.properties"/>
+      <fileset dir="source" includes="**/server.xml"/>
+    </copy>
+    <copy   todir="${deploy.classes}/bundles">
+      <fileset dir="bundles" includes="**/*.properties"/>
+    </copy>
+  <!-- I really don't think this is needed by default. maybe make it a targe?
+    -mh -->
+	<!--<exec executable="./perms.sh"/>-->
   </target>
 
 
@@ -123,7 +210,9 @@
     <javadoc packagenames="mir.*, mircoders.*"
 	     sourcefiles="source/${app.name}.java,source/Open${app.name}.java"
 	     sourcepath="source"
-             destdir="${javadoc.home}"/>
+             destdir="${javadoc.home}">
+	  <classpath refid="project.class.path"/>
+	</javadoc>
   </target>
 
 
@@ -142,10 +231,14 @@
      that separately.
 -->
   <target name="dist" depends="prepare,compile">
-    <jar jarfile="${dist.src}"
+    <jar jarfile="${dist.home}/mirbase.jar"
+	 includes="mir/**"
+	 basedir="${deploy.classes}"/>
+    <jar jarfile="${dist.home}/${dist.src}"
          basedir="./source"/>
-    <jar jarfile="${dist.war}"
-         basedir="${deploy.home}"/>
+    <jar jarfile="${dist.home}/${dist.war}"
+         basedir="${deploy.home}"
+         excludes="${dist.war}"/>
   </target>
 
-</project>
\ No newline at end of file
+</project>