Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

slimupdates
John Hurliman 2010-03-26 12:39:36 -07:00
commit a6e14165fd
1 changed files with 17 additions and 15 deletions

View File

@ -1,8 +1,23 @@
<!-- -*- xml -*- --> <!-- -*- xml -*- -->
<!-- please leave the top comment for us emacs folks --> <!-- please leave the top comment for us emacs folks -->
<property name="projectdir" value="opensim-0.5.5" />
<property name="nunitcmd" value="nunit-console" /> <property name="nunitcmd" value="nunit-console" />
<!-- I don't think these targets are being actively used. But just in case, we'll just comment them out for now - justincc -->
<!--
<property name="projectdir" value="opensim-0.6.9" />
<target name="dist" depends="distdir">
<zip zipfile="${projectdir}.zip">
<fileset basedir=".">
<include name="${projectdir}/**" />
</fileset>
</zip>
<tar destfile="${projectdir}.tar.gz" compression="GZip">
<fileset basedir=".">
<include name="${projectdir}/**" />
</fileset>
</tar>
</target>
<target name="distdir"> <target name="distdir">
<delete dir="${projectdir}" /> <delete dir="${projectdir}" />
<copy todir="${projectdir}"> <copy todir="${projectdir}">
@ -29,6 +44,7 @@
</copy> </copy>
<touch file="${projectdir}/bin/startup_commands.txt" /> <touch file="${projectdir}/bin/startup_commands.txt" />
</target> </target>
-->
<target name="test" depends="build, find-nunit"> <target name="test" depends="build, find-nunit">
<setenv name="MONO_THREADS_PER_CPU" value="100" /> <setenv name="MONO_THREADS_PER_CPU" value="100" />
@ -296,17 +312,3 @@
<target name="doxygen"> <target name="doxygen">
<exec program="doxygen" workingdir="doc" commandline="doxygen.conf" /> <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" />
</target> </target>
<target name="dist" depends="distdir">
<zip zipfile="${projectdir}.zip">
<fileset basedir=".">
<include name="${projectdir}/**" />
</fileset>
</zip>
<tar destfile="${projectdir}.tar.gz" compression="GZip">
<fileset basedir=".">
<include name="${projectdir}/**" />
</fileset>
</tar>
</target>