projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
w3cdate parsing fix
[mir.git]
/
build.xml
diff --git
a/build.xml
b/build.xml
index
e1aae85
..
b4429b4
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-56,10
+56,10
@@
-->
-->
- <property name="app.name" value="
M
ir"/>
- <property name="deploy.home" value=".
.
/${app.name}"/>
+ <property name="app.name" value="
m
ir"/>
+ <property name="deploy.home" value=".
/bin
/${app.name}"/>
- <!-- don't use unless your Jikes is >= v1.1
7 and you know what you are doing
-->
+ <!-- don't use unless your Jikes is >= v1.1
8
-->
<!-- <property name="build.compiler" value="jikes"/>-->
<!-- <property name="build.compiler" value="jikes"/>-->
@@
-81,6
+81,7
@@
<pathelement path="${deploy.home}"/>
<pathelement path="${deploy.classes}"/>
<pathelement path="source"/>
<pathelement path="${deploy.home}"/>
<pathelement path="${deploy.classes}"/>
<pathelement path="source"/>
+ <pathelement path="etc/extrasource"/>
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
@@
-93,7
+94,7
@@
<fileset dir="${tomcat.home}">
<include name="lib/apps/*.jar" />
</fileset>
<fileset dir="${tomcat.home}">
<include name="lib/apps/*.jar" />
</fileset>
- <!-- for libs shared between tomcat and webapps (tomcat 4.
0
.x) -->
+ <!-- for libs shared between tomcat and webapps (tomcat 4.
x
.x) -->
<fileset dir="${tomcat.home}">
<include name="common/lib/*.jar" />
</fileset>
<fileset dir="${tomcat.home}">
<include name="common/lib/*.jar" />
</fileset>
@@
-101,6
+102,10
@@
<fileset dir="${tomcat.home}">
<include name="lib/*.jar" />
</fileset>
<fileset dir="${tomcat.home}">
<include name="lib/*.jar" />
</fileset>
+ <!-- for libs shared between webapps (tomcat 4.1.x) -->
+ <fileset dir="${tomcat.home}">
+ <include name="shared/lib/*.jar" />
+ </fileset>
</path>
</path>
@@
-133,16
+138,17
@@
<copy todir="${deploy.webinf}/templates">
<fileset dir="templates"/>
</copy>
<copy todir="${deploy.webinf}/templates">
<fileset dir="templates"/>
</copy>
-
+
+ <copy todir="${deploy.webinf}" file="source/default.properties" />
+
<copy todir="${deploy.classes}/bundles">
<fileset dir="bundles"/>
</copy>
<copy todir="${deploy.classes}/bundles">
<fileset dir="bundles"/>
</copy>
-
+
<copy todir="${deploy.home}/WEB-INF/lib">
<fileset dir="lib">
<exclude name="ant.jar"/>
<exclude name="xerces.jar"/>
<copy todir="${deploy.home}/WEB-INF/lib">
<fileset dir="lib">
<exclude name="ant.jar"/>
<exclude name="xerces.jar"/>
- <exclude name="servlet-2.2.jar"/>
</fileset>
</copy>
</target>
</fileset>
</copy>
</target>
@@
-201,6
+207,10
@@
<srcfileset
dir="source"
includes="**/*.java"/>
<srcfileset
dir="source"
includes="**/*.java"/>
+<!-- ML: now why can't this be added?
+ <srcfileset
+ dir="etc/extrasource"
+ includes="**/*.java"/> -->
<srcfileset
dir="lib"
includes="*.jar"/>
<srcfileset
dir="lib"
includes="*.jar"/>
@@
-208,8
+218,10
@@
dir="${deploy.classes}"
includes="**/*.class"/>
</dependset>
dir="${deploy.classes}"
includes="**/*.class"/>
</dependset>
- <javac
srcdir="source"
destdir="${deploy.classes}"
+ <javac destdir="${deploy.classes}"
debug="on" optimize="off" deprecation="on">
debug="on" optimize="off" deprecation="on">
+ <src path="source"/>
+ <src path="etc/extrasource"/>
<classpath refid="project.class.path"/>
</javac>
</target>
<classpath refid="project.class.path"/>
</javac>
</target>