Merge branch 'master' of ssh://TOR/var/git/careminster

1 files changed, 54 insertions, 17 deletions

diff --git a/.nant/local.include b/.nant/local.include
index 5e02665..1e8bedc 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -1,8 +1,59 @@
 <!-- -*- xml -*- -->
 <!-- please leave the top comment for us emacs folks -->
-<property name="projectdir" value="opensim-0.5.5" />
 <property name="nunitcmd" value="nunit-console" />
 
+<!-- For safety/laziness sake, we're going to take the approach of deleting known extraneous files here rather than
+     trying to copy across only the essential ones -->
+<property name="distbindir" value="distbin" />
+<target name="distbin">
+  <copy file="bin/OpenSim.ini.example" tofile="bin/OpenSim.ini"/>
+  <delete dir="${distbindir}"/>
+  <!-- <copy file="*" todir="${distbindir}"/> -->
+  <copy todir="${distbindir}">
+    <fileset>
+      <include name="**"/>
+    </fileset>
+  </copy>
+  <delete dir="${distbindir}/OpenSim"/>
+  <delete dir="${distbindir}/Prebuild"/>
+  <delete dir="${distbindir}/%temp%"/>
+  <delete dir="${distbindir}/.nant"/>
+  <delete>
+    <fileset basedir="${distbindir}">
+      <include name="Makefile"/>
+      <include name="nant-color"/>
+      <include name="OpenSim.*"/>
+      <include name="prebuild.xml"/>
+      <include name="runprebuild*"/>
+      <include name="TESTING.txt"/>
+      <include name="TestResult.xml"/>
+      <include name="bin/OpenSim.Server.ini"/>
+      <include name="bin/Regions/*"/>
+      <include name="bin/*.db"/>
+      <include name="**/.git/**"/>
+      <include name=".gitignore"/>
+      <include name=".hgignore"/>
+    </fileset>
+  </delete>
+  
+</target>
+
+<!-- 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">
    <delete dir="${projectdir}" />
    <copy todir="${projectdir}">
@@ -21,14 +72,14 @@
           <include name="bin/assets/**" />
           <include name="bin/data/**" />
           <include name="bin/OpenSim*xml" />
-          <!-- the next is to exclude built libs -->
-          <exclude name="bin/OpenSim.*dll" />
           <include name="bin/OpenSim.ini" />
           <include name="bin/defaultstripe.png" />
+          <exclude name="bin/OpenSim.*dll" />
        </fileset>
    </copy>
    <touch file="${projectdir}/bin/startup_commands.txt" />
 </target>
+-->
 
 <target name="test" depends="build, find-nunit">
   <setenv name="MONO_THREADS_PER_CPU" value="100" />
@@ -317,17 +368,3 @@
 <target name="doxygen">
   <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" />
 </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>