From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.

---
 .nant/local.include | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to '.nant')

diff --git a/.nant/local.include b/.nant/local.include
index 7663748..be79d1c 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -5,9 +5,9 @@
 <!-- This target produces a source distribution of OpenSimulator -->
 <!-- TODO: A few parameters still need to be tweaked after running this - need to do this automatically with sed or similar -->
 <target name="distsrc">
-  <copy file="config/OpenSim.ini.example" tofile="config/OpenSim.ini"/>
-  <copy file="config/config-include/StandaloneCommon.ini.example" tofile="config/config-include/StandaloneCommon.ini"/>
-  <copy file="config/config-include/FlotsamCache.ini.example" tofile="config/config-include/FlotsamCache.ini"/>
+  <copy file="bin/OpenSim.ini.example" tofile="bin/OpenSim.ini"/>
+  <copy file="bin/config-include/StandaloneCommon.ini.example" tofile="bin/config-include/StandaloneCommon.ini"/>
+  <copy file="bin/config-include/FlotsamCache.ini.example" tofile="bin/config-include/FlotsamCache.ini"/>
   <!-- delete files generated by runprebuild.sh which had to be run in order to generate the build file for this target-->
   <delete>
     <fileset basedir="OpenSim">
@@ -55,8 +55,8 @@
       <include name="runprebuild*"/>
       <include name="TESTING.txt"/>
       <include name="TestResult.xml"/>
-      <include name="config/OpenSim.Server.ini"/>
-      <include name="config/Regions/Regions.ini"/>
+      <include name="bin/OpenSim.Server.ini"/>
+      <include name="bin/Regions/Regions.ini"/>
       <include name="bin/*.db"/>
       <include name="**/.git/**"/>
       <include name=".gitignore"/>
@@ -113,10 +113,12 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 
 
+<!--
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.optionalmodules.tests">
     <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" />
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> 
+-->
 
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.framework.tests">
     <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
@@ -143,7 +145,12 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
 
-  <delete dir="%temp%"/>
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions">
+    <arg value="./bin/OpenSim.Tests.Permissions.dll" />
+  </exec>
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
+  
+<delete dir="%temp%"/>
 </target>
 
 <target name="test-stress" depends="build, find-nunit">
@@ -226,10 +233,12 @@
     <arg value="-xml=test-results/OpenSim.Region.CoreModules.Tests.dll-Results.xml" />
   </exec>
 
+<!--
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.optionalmodules.tests">
     <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Region.OptionalModules.Tests.dll-Results.xml" />
   </exec>
+-->
 
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests">
     <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
@@ -256,17 +265,23 @@
     <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
   </exec>
 
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions">
+    <arg value="./bin/OpenSim.Tests.Permissions.dll" />
+    <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" />
+  </exec>
+  
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" />
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 
- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> 
+<!--  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> -->
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
 </target>
 
 <target name="doxygen">
-- 
cgit v1.1