From a5b17a42a32ab645c7408b75001272484221030d Mon Sep 17 00:00:00 2001
From: gareth <gareth>
Date: Sun, 25 Mar 2007 00:48:07 +0000
Subject: [PATCH] All shall become clear soon.... Renamed SimConfig stuff,
 ready to abstract both it and ServerConsole yay for code reuse

---
 .../SimConfigDb4o/AssemblyInfo.cs             |  0
 .../SimConfigDb4o/DbSimConfig.cs              |  0
 .../SimConfigDb4o/MapStorage.cs               |  0
 .../OpenSim.Config.SimConfigDb4o.csproj       |  0
 .../OpenSim.Config.SimConfigDb4o.dll.build    |  0
 ...m.Framework.Config.SimConfigDb4o.dll.build | 47 +++++++++++++++++++
 OpenSim.build                                 |  6 +--
 prebuild.xml                                  |  2 +-
 8 files changed, 51 insertions(+), 4 deletions(-)
 rename {OpenSim.Config => OpenSim.Framework.Config}/SimConfigDb4o/AssemblyInfo.cs (100%)
 rename {OpenSim.Config => OpenSim.Framework.Config}/SimConfigDb4o/DbSimConfig.cs (100%)
 rename {OpenSim.Config => OpenSim.Framework.Config}/SimConfigDb4o/MapStorage.cs (100%)
 rename {OpenSim.Config => OpenSim.Framework.Config}/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj (100%)
 rename {OpenSim.Config => OpenSim.Framework.Config}/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build (100%)
 create mode 100644 OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build

diff --git a/OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs b/OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs
similarity index 100%
rename from OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs
rename to OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs
diff --git a/OpenSim.Config/SimConfigDb4o/DbSimConfig.cs b/OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs
similarity index 100%
rename from OpenSim.Config/SimConfigDb4o/DbSimConfig.cs
rename to OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs
diff --git a/OpenSim.Config/SimConfigDb4o/MapStorage.cs b/OpenSim.Framework.Config/SimConfigDb4o/MapStorage.cs
similarity index 100%
rename from OpenSim.Config/SimConfigDb4o/MapStorage.cs
rename to OpenSim.Framework.Config/SimConfigDb4o/MapStorage.cs
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
similarity index 100%
rename from OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
rename to OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
similarity index 100%
rename from OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
rename to OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
diff --git a/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build b/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
new file mode 100644
index 0000000000..9e9d76795b
--- /dev/null
+++ b/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Config.SimConfigDb4o" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Config.SimConfigDb4o" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="DbSimConfig.cs" />
+                <include name="MapStorage.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Data.dll.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
+                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim.build b/OpenSim.build
index e7af73486b..076c5dda1d 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -51,11 +51,11 @@
         <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
         <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
         <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
-        <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
         <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
         <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" />
         <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
         <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
+        <nant buildfile="../opensim/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build" target="clean" />
         <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="clean" />
         <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
         <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
@@ -69,7 +69,7 @@
         <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
         <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
         <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
-        <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" />
+        <nant buildfile="../opensim/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build" target="build" />
         <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
         <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
         <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
@@ -92,11 +92,11 @@
         <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
         <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
         <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
-        <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
         <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
         <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" />
         <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
         <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
+        <nant buildfile="../opensim/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build" target="doc" />
         <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="doc" />
         <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
         <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
diff --git a/prebuild.xml b/prebuild.xml
index 330bc66ebb..b527590ed5 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -175,7 +175,7 @@
     </Project>
 
     <!-- Config Plug-ins -->
-    <Project name="OpenSim.Config.SimConfigDb4o" path="./OpenSim.Config/SimConfigDb4o" type="Library">
+    <Project name="OpenSim.Framework.Config.SimConfigDb4o" path="./OpenSim.Framework.Config/SimConfigDb4o" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>