From 52deb508847b5cf42dbee7235ef8416327fdced1 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Tue, 3 Feb 2009 05:20:52 +0000
Subject: Embed OpenSim.Data.addin.xml as a resource into OpenSim.Data.dll.

---
 OpenSim/Data/Resources/OpenSim.Data.addin.xml | 21 +++++++++++++++++++++
 bin/OpenSim.Data.addin.xml                    | 21 ---------------------
 prebuild.xml                                  |  1 +
 3 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 OpenSim/Data/Resources/OpenSim.Data.addin.xml
 delete mode 100644 bin/OpenSim.Data.addin.xml

diff --git a/OpenSim/Data/Resources/OpenSim.Data.addin.xml b/OpenSim/Data/Resources/OpenSim.Data.addin.xml
new file mode 100644
index 0000000..65774ff
--- /dev/null
+++ b/OpenSim/Data/Resources/OpenSim.Data.addin.xml
@@ -0,0 +1,21 @@
+<Addin id="OpenSim.Data" isroot="true" version="0.5">
+    <Runtime>
+        <Import assembly="OpenSim.Data.dll" />
+        <Import assembly="OpenSim.Framework.dll" />
+    </Runtime>
+    <ExtensionPoint path = "/OpenSim/GridData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IGridDataPlugin" />
+    </ExtensionPoint>
+    <ExtensionPoint path = "/OpenSim/LogData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.ILogDataPlugin" />
+    </ExtensionPoint>
+    <ExtensionPoint path = "/OpenSim/AssetData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IAssetDataPlugin" />
+    </ExtensionPoint>
+    <ExtensionPoint path = "/OpenSim/InventoryData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IInventoryDataPlugin" />
+    </ExtensionPoint>
+    <ExtensionPoint path = "/OpenSim/UserData">
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IUserDataPlugin" />
+    </ExtensionPoint>
+</Addin>
diff --git a/bin/OpenSim.Data.addin.xml b/bin/OpenSim.Data.addin.xml
deleted file mode 100644
index 65774ff..0000000
--- a/bin/OpenSim.Data.addin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Addin id="OpenSim.Data" isroot="true" version="0.5">
-    <Runtime>
-        <Import assembly="OpenSim.Data.dll" />
-        <Import assembly="OpenSim.Framework.dll" />
-    </Runtime>
-    <ExtensionPoint path = "/OpenSim/GridData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IGridDataPlugin" />
-    </ExtensionPoint>
-    <ExtensionPoint path = "/OpenSim/LogData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.ILogDataPlugin" />
-    </ExtensionPoint>
-    <ExtensionPoint path = "/OpenSim/AssetData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IAssetDataPlugin" />
-    </ExtensionPoint>
-    <ExtensionPoint path = "/OpenSim/InventoryData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IInventoryDataPlugin" />
-    </ExtensionPoint>
-    <ExtensionPoint path = "/OpenSim/UserData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IUserDataPlugin" />
-    </ExtensionPoint>
-</Addin>
diff --git a/prebuild.xml b/prebuild.xml
index f41107b..a88b332 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -154,6 +154,7 @@
       <Files>
         <Match pattern="*.cs" recurse="false"/>
         <Match pattern="Properties/*.cs" recurse="false"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
-- 
cgit v1.1