From 959cd6022504fa3ffe2f69c66ed94827f6ae6951 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Apr 2010 17:17:15 +0100
Subject: Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG.  SQLiteNG
 will shortly be changed to work under mono 2.6 and above

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

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 6b25792..9db30ff 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2510,6 +2510,43 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library">
+      <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="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Data.SQLite.dll"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="Mono.Data.SqliteClient"/>
+      <Reference name="Mono.Addins.dll" />
+      <Reference name="log4net.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true" >
+          <Exclude name="Tests" pattern="Tests" />
+        </Match>
+        <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
+      </Files>
+    </Project>
+
     <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
       <Configuration name="Debug">
         <Options>
-- 
cgit v1.1


From 7ce0ec874a31d2567bee43afa0cdec24e002dc1d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Apr 2010 18:56:50 +0100
Subject: Change SQLiteNG to work with mono 2.6 and above using the
 Mono.Data.Sqlite.dll Include the library so that Windows builds correctly It
 appears that Windows is okay with either SQLite or SQLiteNG Incorporate the
 latest fixes made by Diva to OpenSim.Data.SQLite

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

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 9db30ff..7c7e3c7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2526,7 +2526,6 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
-      <Reference name="System.Data.SQLite.dll"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="System.Drawing"/>
       <Reference name="OpenSim.Framework"/>
@@ -2534,7 +2533,7 @@
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
-      <Reference name="Mono.Data.SqliteClient"/>
+      <Reference name="Mono.Data.Sqlite"/>
       <Reference name="Mono.Addins.dll" />
       <Reference name="log4net.dll"/>
 
-- 
cgit v1.1


From 56fe4c24b8c67ec3b6a5a897c35ab19507bd1077 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 30 Apr 2010 17:45:00 +0100
Subject: rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the
 least evil way forward since mono 2.6 and later will see increasing usage,
 and this only works with what was SQLiteNG MAC USERS WILL NEED TO CHANGE
 REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in
 OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone) See
 the OpenSim.ini.example and StandaloneCommon.ini.example files for more
 details This commit also temporarily changes unsigned ParentEstateID values
 in the OpenSim.Data.Tests to signed temporarily, since the new plugin
 enforces creation of signed fields in the database (which is what the SQL
 actually specifies).  And change data columns in sqlite is a pita.

---
 prebuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 7c7e3c7..908855f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2473,7 +2473,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteLegacy" path="OpenSim/Data/SQLiteLegacy" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2510,7 +2510,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
-- 
cgit v1.1


From f5ca70127347b20f9bfbb81fe777b9a602bfef0d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 1 Jun 2010 14:19:26 +0100
Subject: Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer
 include the needed libraries

---
 prebuild.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 6b25792..66ab532 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -765,7 +765,6 @@
       <Reference name="OpenSim.Region.Physics.Manager"/>
 
       <!-- For scripting in funny languages by default -->
-      <Reference name="Microsoft.JScript"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="Nini.dll" />
@@ -1619,7 +1618,6 @@
       <Reference name="GlynnTucker.Cache.dll"/>
 
       <!-- For scripting in funny languages by default -->
-      <Reference name="Microsoft.JScript"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="Nini.dll" />
@@ -1702,7 +1700,6 @@
       <Reference name="Mono.Addins.dll" />
 
       <!-- For scripting in funny languages by default -->
-      <Reference name="Microsoft.JScript"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="Nini.dll" />
@@ -2671,7 +2668,6 @@
 
       <ReferencePath>../../../../../bin/</ReferencePath>
       <Reference name="System"/>
-      <Reference name="Microsoft.JScript"/>
       <Reference name="OpenSim.Framework" />
       <Reference name="OpenSim.Region.Framework" />
       <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -2808,7 +2804,6 @@
       <Reference name="Mono.Addins"/>
 
       <!-- For scripting in funny languages by default -->
-      <Reference name="Microsoft.JScript"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="Nini.dll" />
@@ -3270,7 +3265,6 @@
       <Reference name="nunit.framework.dll"/>
 
       <!-- For scripting in funny languages by default -->
-      <Reference name="Microsoft.JScript"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="Nini.dll" />
@@ -3334,7 +3328,6 @@
       <Reference name="nunit.framework.dll"/>
 
       <!-- For scripting in funny languages by default -->
-      <Reference name="Microsoft.JScript"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="Nini.dll" />
-- 
cgit v1.1