aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs (renamed from OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs)0
-rw-r--r--OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs (renamed from OpenSim.Config/SimConfigDb4o/DbSimConfig.cs)0
-rw-r--r--OpenSim.Framework.Config/SimConfigDb4o/MapStorage.cs (renamed from OpenSim.Config/SimConfigDb4o/MapStorage.cs)0
-rw-r--r--OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj (renamed from OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj)0
-rw-r--r--OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build (renamed from OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build)0
-rw-r--r--OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build47
-rw-r--r--OpenSim.build6
-rw-r--r--prebuild.xml2
8 files changed, 51 insertions, 4 deletions
diff --git a/OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs b/OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs
index 96c3e73..96c3e73 100644
--- a/OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs
+++ b/OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs
diff --git a/OpenSim.Config/SimConfigDb4o/DbSimConfig.cs b/OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs
index 250f3fd..250f3fd 100644
--- a/OpenSim.Config/SimConfigDb4o/DbSimConfig.cs
+++ b/OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs
diff --git a/OpenSim.Config/SimConfigDb4o/MapStorage.cs b/OpenSim.Framework.Config/SimConfigDb4o/MapStorage.cs
index eb68a94..eb68a94 100644
--- a/OpenSim.Config/SimConfigDb4o/MapStorage.cs
+++ b/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
index cf13d5b..cf13d5b 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
+++ b/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
index 703abe6..703abe6 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
+++ b/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 0000000..9e9d767
--- /dev/null
+++ b/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
@@ -0,0 +1,47 @@
1<?xml version="1.0" ?>
2<project name="OpenSim.Framework.Config.SimConfigDb4o" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Framework.Config.SimConfigDb4o" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="AssemblyInfo.cs" />
15 <include name="DbSimConfig.cs" />
16 <include name="MapStorage.cs" />
17 </sources>
18 <references basedir="${project::get-base-directory()}">
19 <lib>
20 <include name="${project::get-base-directory()}" />
21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib>
23 <include name="System.dll" />
24 <include name="System.Data.dll.dll" />
25 <include name="System.Xml.dll" />
26 <include name="../../bin/libsecondlife.dll" />
27 <include name="../../bin/Db4objects.Db4o.dll" />
28 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
29 <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
30 </references>
31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
33 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
34 <copy todir="${project::get-base-directory()}/../../bin/">
35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
36 <include name="*.dll"/>
37 <include name="*.exe"/>
38 </fileset>
39 </copy>
40 </target>
41 <target name="clean">
42 <delete dir="${bin.dir}" failonerror="false" />
43 <delete dir="${obj.dir}" failonerror="false" />
44 </target>
45 <target name="doc" description="Creates documentation.">
46 </target>
47</project>
diff --git a/OpenSim.build b/OpenSim.build
index e7af734..076c5dd 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -51,11 +51,11 @@
51 <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> 51 <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
52 <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> 52 <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
53 <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> 53 <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
54 <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
55 <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> 54 <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
56 <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" /> 55 <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" />
57 <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> 56 <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
58 <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> 57 <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
58 <nant buildfile="../opensim/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build" target="clean" />
59 <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="clean" /> 59 <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="clean" />
60 <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> 60 <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
61 <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> 61 <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
@@ -69,7 +69,7 @@
69 <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 69 <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
70 <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 70 <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
71 <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> 71 <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
72 <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> 72 <nant buildfile="../opensim/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build" target="build" />
73 <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> 73 <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
74 <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> 74 <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
75 <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> 75 <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
@@ -92,11 +92,11 @@
92 <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> 92 <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
93 <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> 93 <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
94 <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> 94 <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
95 <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
96 <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> 95 <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
97 <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" /> 96 <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" />
98 <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> 97 <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
99 <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> 98 <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
99 <nant buildfile="../opensim/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build" target="doc" />
100 <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="doc" /> 100 <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="doc" />
101 <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> 101 <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
102 <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> 102 <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
diff --git a/prebuild.xml b/prebuild.xml
index 330bc66..b527590 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -175,7 +175,7 @@
175 </Project> 175 </Project>
176 176
177 <!-- Config Plug-ins --> 177 <!-- Config Plug-ins -->
178 <Project name="OpenSim.Config.SimConfigDb4o" path="./OpenSim.Config/SimConfigDb4o" type="Library"> 178 <Project name="OpenSim.Framework.Config.SimConfigDb4o" path="./OpenSim.Framework.Config/SimConfigDb4o" type="Library">
179 <Configuration name="Debug"> 179 <Configuration name="Debug">
180 <Options> 180 <Options>
181 <OutputPath>../../bin/</OutputPath> 181 <OutputPath>../../bin/</OutputPath>