X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build.xml;h=d26d6951e0a180086f5254efa22e9c9ba8788e2b;hb=faceda8c72155f48f51e99e6c99e0968c20c1ee4;hp=6506d8c70ea17524c4d61331c9d0071423c0115b;hpb=17e3df79226eeef4a1f467f373d34d2628427cbc;p=mir.git

diff --git a/build.xml b/build.xml
index 6506d8c7..d26d6951 100755
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 
 
 <!-- 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.
@@ -49,7 +49,7 @@
 
 	java.home          The location of your Java SDK.
 
-	java.localhome     Where your local java classes and jar files 
+	java.localhome     Where your local java classes and jar files
                        are located.
 
 	tomcat.home        The location of the tomcat root directory.
@@ -58,9 +58,6 @@
 
   <property name="app.name"       value="Mir"/>
   <property name="deploy.home"    value="../${app.name}"/>
-  <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/"/>
 
 
 <!-- No customization required after this line -->
@@ -72,6 +69,14 @@
   <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">
@@ -81,7 +86,7 @@
     <fileset dir="lib">
       <include name="*.jar"/>
     </fileset>
-    <fileset dir="${java.home}/lib">
+<!--    <fileset dir="${java.home}/lib">
       <include name="tools.jar"/>
       <include name="rt.jar"/>
     </fileset>
@@ -89,6 +94,7 @@
       <include name="*.jar"/>
     </fileset>
     <pathelement path="${tomcat.home}/lib/tomcat.jar"/>
+-->
   </path>
 
 
@@ -181,16 +187,14 @@
     </copy>
     <copy   todir="${deploy.home}">
       <fileset dir="source" includes="**/content-types.properties"/>
+      <fileset dir="source" includes="**/server.xml"/>
     </copy>
-	<exec executable="./perms.sh"/>
-
-<!--	<echo>
-		Now you should call perms.sh(-dist) in order to set
-		the permissions of your installed files to a meaningful
-		value. 
-		Have fun with Mir!
-	</echo>
--->
+    <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>