Removed the explicit specification of the build compiler and optimization

configurations. We'll specify these in the top-level ant invocation and it
can filter down for the whole build.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2820 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-10-06 21:24:30 +00:00
parent b032f51b84
commit 5970b1eef9
3 changed files with 4 additions and 6 deletions
+1 -2
View File
@@ -1,12 +1,11 @@
#!/bin/sh #!/bin/sh
# #
# $Id: ant,v 1.3 2002/05/08 23:04:07 shaper Exp $ # $Id: ant,v 1.4 2003/10/06 21:24:29 mdb Exp $
# #
# Invokes our desired version of ant with all of our jar files in the # Invokes our desired version of ant with all of our jar files in the
# classpath. # classpath.
BINDIR=`dirname $0` BINDIR=`dirname $0`
ANT_COMPILER="-Dbuild.compiler=jikes"
# process our arguments # process our arguments
while [ ! -z "$1" ]; do while [ ! -z "$1" ]; do
+3 -3
View File
@@ -7,8 +7,6 @@
<!-- configuration parameters --> <!-- configuration parameters -->
<property name="app.name" value="narya"/> <property name="app.name" value="narya"/>
<property name="build.compiler" value="jikes"/>
<property name="build.optimize" value="off"/>
<property name="deploy.dir" value="dist"/> <property name="deploy.dir" value="dist"/>
<property name="savedoc.dir" value="docs"/> <property name="savedoc.dir" value="docs"/>
@@ -116,9 +114,11 @@
<javadoc sourcepath="src/java" <javadoc sourcepath="src/java"
packagenames="com.threerings.*" packagenames="com.threerings.*"
destdir="${javadoc.home}" destdir="${javadoc.home}"
additionalparam="-breakiterator"> additionalparam="-breakiterator"
link="http://dev.threerings.net/devel/docs/narya/">
<classpath refid="classpath"/> <classpath refid="classpath"/>
<link href="http://java.sun.com/j2se/1.4/docs/api/"/> <link href="http://java.sun.com/j2se/1.4/docs/api/"/>
<link href="http://dev.threerings.net/devel/docs/samskivert/"/>
</javadoc> </javadoc>
<copy todir="${javadoc.home}"> <copy todir="${javadoc.home}">
<fileset dir="src/java" includes="**/*.png"/> <fileset dir="src/java" includes="**/*.png"/>
-1
View File
@@ -2,7 +2,6 @@
<project name="narya tests" default="compile" basedir="."> <project name="narya tests" default="compile" basedir=".">
<!-- things you may want to change --> <!-- things you may want to change -->
<property name="build.compiler" value="jikes"/>
<property name="junit.fork" value="true"/> <property name="junit.fork" value="true"/>
<!-- we want to access the environment --> <!-- we want to access the environment -->