aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-26 12:39:36 -0700
committerJohn Hurliman2010-03-26 12:39:36 -0700
commita6e14165fd7682601852adb572ea66ca1c5d9294 (patch)
treea4acbffad872fca895f6d70eccde48ac24e14f78
parent* Fixed a dictionary value retrieval in GroupsModule (diff)
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a6e14165fd7682601852adb572ea66ca1c5d9294.zip
opensim-SC_OLD-a6e14165fd7682601852adb572ea66ca1c5d9294.tar.gz
opensim-SC_OLD-a6e14165fd7682601852adb572ea66ca1c5d9294.tar.bz2
opensim-SC_OLD-a6e14165fd7682601852adb572ea66ca1c5d9294.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--.nant/local.include32
1 files changed, 17 insertions, 15 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 114c12d..3da7c1c 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -1,8 +1,23 @@
1<!-- -*- xml -*- --> 1<!-- -*- xml -*- -->
2<!-- please leave the top comment for us emacs folks --> 2<!-- please leave the top comment for us emacs folks -->
3<property name="projectdir" value="opensim-0.5.5" />
4<property name="nunitcmd" value="nunit-console" /> 3<property name="nunitcmd" value="nunit-console" />
5 4
5<!-- I don't think these targets are being actively used. But just in case, we'll just comment them out for now - justincc -->
6<!--
7<property name="projectdir" value="opensim-0.6.9" />
8<target name="dist" depends="distdir">
9 <zip zipfile="${projectdir}.zip">
10 <fileset basedir=".">
11 <include name="${projectdir}/**" />
12 </fileset>
13 </zip>
14 <tar destfile="${projectdir}.tar.gz" compression="GZip">
15 <fileset basedir=".">
16 <include name="${projectdir}/**" />
17 </fileset>
18 </tar>
19</target>
20
6<target name="distdir"> 21<target name="distdir">
7 <delete dir="${projectdir}" /> 22 <delete dir="${projectdir}" />
8 <copy todir="${projectdir}"> 23 <copy todir="${projectdir}">
@@ -29,6 +44,7 @@
29 </copy> 44 </copy>
30 <touch file="${projectdir}/bin/startup_commands.txt" /> 45 <touch file="${projectdir}/bin/startup_commands.txt" />
31</target> 46</target>
47-->
32 48
33<target name="test" depends="build, find-nunit"> 49<target name="test" depends="build, find-nunit">
34 <setenv name="MONO_THREADS_PER_CPU" value="100" /> 50 <setenv name="MONO_THREADS_PER_CPU" value="100" />
@@ -296,17 +312,3 @@
296<target name="doxygen"> 312<target name="doxygen">
297 <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" /> 313 <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" />
298</target> 314</target>
299
300
301<target name="dist" depends="distdir">
302 <zip zipfile="${projectdir}.zip">
303 <fileset basedir=".">
304 <include name="${projectdir}/**" />
305 </fileset>
306 </zip>
307 <tar destfile="${projectdir}.tar.gz" compression="GZip">
308 <fileset basedir=".">
309 <include name="${projectdir}/**" />
310 </fileset>
311 </tar>
312</target>