aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml1
-rw-r--r--OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml1
-rw-r--r--OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml1
-rw-r--r--OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml1
-rw-r--r--prebuild.xml34
5 files changed, 36 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
index 15fd29e..3509034 100644
--- a/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
+++ b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml
@@ -4,6 +4,7 @@
4 </Runtime> 4 </Runtime>
5 <Dependencies> 5 <Dependencies>
6 <Addin id="OpenSim.Data" version="0.5" /> 6 <Addin id="OpenSim.Data" version="0.5" />
7 <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
7 </Dependencies> 8 </Dependencies>
8 <Extension path = "/OpenSim/GridData"> 9 <Extension path = "/OpenSim/GridData">
9 <Plugin id="MSSQLGridData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" /> 10 <Plugin id="MSSQLGridData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
diff --git a/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml b/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
index 9e99547..9f583a2 100644
--- a/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
+++ b/OpenSim/Data/MySQL/Resources/OpenSim.Data.MySQL.addin.xml
@@ -4,6 +4,7 @@
4 </Runtime> 4 </Runtime>
5 <Dependencies> 5 <Dependencies>
6 <Addin id="OpenSim.Data" version="0.5" /> 6 <Addin id="OpenSim.Data" version="0.5" />
7 <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
7 </Dependencies> 8 </Dependencies>
8 <Extension path = "/OpenSim/GridData"> 9 <Extension path = "/OpenSim/GridData">
9 <Plugin id="MySQLGridData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" /> 10 <Plugin id="MySQLGridData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
diff --git a/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml b/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml
index 37b23cb..6b8e87b 100644
--- a/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml
+++ b/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml
@@ -4,6 +4,7 @@
4 </Runtime> 4 </Runtime>
5 <Dependencies> 5 <Dependencies>
6 <Addin id="OpenSim.Data" version="0.5" /> 6 <Addin id="OpenSim.Data" version="0.5" />
7 <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
7 </Dependencies> 8 </Dependencies>
8 <Extension path = "/OpenSim/GridData"> 9 <Extension path = "/OpenSim/GridData">
9 <Plugin id="NHibernateGridData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateGridData" /> 10 <Plugin id="NHibernateGridData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateGridData" />
diff --git a/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml b/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml
index e6764fa..256ef41 100644
--- a/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml
+++ b/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml
@@ -4,6 +4,7 @@
4 </Runtime> 4 </Runtime>
5 <Dependencies> 5 <Dependencies>
6 <Addin id="OpenSim.Data" version="0.5" /> 6 <Addin id="OpenSim.Data" version="0.5" />
7 <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" />
7 </Dependencies> 8 </Dependencies>
8 <Extension path = "/OpenSim/GridData"> 9 <Extension path = "/OpenSim/GridData">
9 <Plugin id="SQLiteGridData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" /> 10 <Plugin id="SQLiteGridData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
diff --git a/prebuild.xml b/prebuild.xml
index b74b9ab..c157cdf 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -779,8 +779,38 @@
779 <Files> 779 <Files>
780 <Match pattern="*.cs" recurse="false"/> 780 <Match pattern="*.cs" recurse="false"/>
781 <Match path="Extensions" pattern="*.cs" recurse="false"/> 781 <Match path="Extensions" pattern="*.cs" recurse="false"/>
782 <Match path="Plugins" pattern="*.cs" recurse="false"/> 782 <!--Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true"/-->
783 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 783 </Files>
784 </Project>
785
786 <Project name="OpenSim.Grid.AssetServer.Plugins.OpenSim" path="OpenSim/Grid/NewAssetServer/Plugins/OpenSim" type="Library">
787 <Configuration name="Debug">
788 <Options>
789 <OutputPath>../../../../../bin/</OutputPath>
790 </Options>
791 </Configuration>
792 <Configuration name="Release">
793 <Options>
794 <OutputPath>../../../../../bin/</OutputPath>
795 </Options>
796 </Configuration>
797
798 <ReferencePath>../../../../../bin/</ReferencePath>
799 <Reference name="System" />
800 <Reference name="System.Data" />
801 <Reference name="OpenSim.Framework" />
802 <Reference name="OpenSim.Grid.NewAssetServer" />
803 <Reference name="OpenMetaverseTypes"/>
804 <Reference name="OpenMetaverse.StructuredData2" />
805 <Reference name="HttpServer2"/>
806
807 <!-- Remove these eventually -->
808 <Reference name="MySql.Data" />
809 <Reference name="ExtensionLoader" />
810
811 <Files>
812 <Match pattern="*.cs" recurse="false" />
813 <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" />
784 </Files> 814 </Files>
785 </Project> 815 </Project>
786 816