From 1df69be9a6d7a1c7c0a5446c11fe9fde2c2b88f7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 22 Jan 2010 20:32:34 +0000
Subject: Add first part of test for checking restore of task inventory items
 on oar load Passes but not yet complete

---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 7881cd7..0ab7414 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3271,6 +3271,7 @@
         <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true" />
         <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true" />
         <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true" />
+        <Match path="World/Archiver/Tests/Resources" pattern="*" buildAction="EmbeddedResource"/>
         <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true" />
         <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true" />
         <Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true" />
-- 
cgit v1.1


From 316503c3984ea5333e6d13fb3d4d2f308a618424 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 23 Jan 2010 15:40:34 +0000
Subject: Added some prebuild refs needed for mono building

---
 prebuild.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 0ab7414..46a1057 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2242,6 +2242,7 @@
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="Nini.dll" />
+      <Reference name="Mono.Addins" />
       <Reference name="log4net.dll" />
       <Files>
         <Match pattern="*.cs" recurse="true"/>
@@ -2302,6 +2303,7 @@
       <Reference name="log4net.dll"/>
       <Reference name="protobuf-net"/>
       <Reference name="MXP.dll"/>
+      <Reference name="Mono.Addins"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
@@ -2812,6 +2814,7 @@
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="Mono.Data.SqliteClient"/>
+      <Reference name="Mono.Addins"/>
 
       <!-- For scripting in funny languages by default -->
       <Reference name="Microsoft.JScript"/>
-- 
cgit v1.1


From 70a0d7aa4677c240ad12527adde6725df946e572 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 8 Feb 2010 15:21:35 +0000
Subject: Adding the Careminster "Configger" tool to OpenSim. The tool will,
 when launched in place of OpenSim, dump the config to stdout. Use -f xml, -f
 ini or -f mysql to get a condensed ini file, an xml file suitable for
 webloading, or a set of mysql insert statements.

---
 prebuild.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 46a1057..ac4400d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2886,6 +2886,28 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="Nini.dll"/>
+      <Reference name="log4net.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
     <!-- Test Suite -->
     <Project frameworkVersion="v3_5" name="OpenSim.TestSuite" path="OpenSim/TestSuite" type="Exe">
       <Configuration name="Debug">
-- 
cgit v1.1