From 543cda0398aaeed84f29870f27e14ccd93b65236 Mon Sep 17 00:00:00 2001 From: gareth <gareth> Date: Sat, 5 May 2007 13:45:39 +0000 Subject: [PATCH] Cleaned up Adam's mess --- .../OpenGridServices.GridServer.exe.build | 3 ++- OpenSim.Framework/OpenSim.Framework.dll.build | 1 + OpenSim.RegionServer/OpenSim.RegionServer.dll.build | 1 - OpenSim.build | 6 ++++++ prebuild.xml | 4 ++-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index 6bef534866..774dab55bd 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build @@ -11,8 +11,8 @@ <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > </resources> <sources failonempty="true"> + <include name="GridManager.cs" /> <include name="Main.cs" /> - <include name="SimProfiles.cs" /> <include name="Properties/AssemblyInfo.cs" /> </sources> <references basedir="${project::get-base-directory()}"> @@ -26,6 +26,7 @@ <include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.Console.dll" /> <include name="../bin/OpenSim.Servers.dll" /> + <include name="../bin/OpenGrid.Framework.Data.dll" /> <include name="../bin/libsecondlife.dll" /> <include name="../bin/Db4objects.Db4o.dll" /> <include name="../bin/XMLRPC.dll" /> diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index 69ea10a393..aa405fb290 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build @@ -22,6 +22,7 @@ <include name="UserProfileManager.cs" /> <include name="UserProfileManagerBase.cs" /> <include name="Util.cs" /> + <include name="VersionInfo.cs" /> <include name="Interfaces/IAssetServer.cs" /> <include name="Interfaces/IConfig.cs" /> <include name="Interfaces/IGenericConfig.cs" /> diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 871d639d3a..d41d6643bb 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -19,7 +19,6 @@ <include name="QueItem.cs" /> <include name="RegionInfo.cs" /> <include name="SimClient.cs" /> - <include name="VersionInfo.cs" /> <include name="Assets/AssetCache.cs" /> <include name="Assets/InventoryCache.cs" /> <include name="CAPS/AdminWebFront.cs" /> diff --git a/OpenSim.build b/OpenSim.build index 182776b990..67b2120da1 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -49,7 +49,9 @@ <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" /> <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> + <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" /> <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> + <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" /> <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" /> <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" /> <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> @@ -81,6 +83,8 @@ <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" /> <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> + <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" /> + <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" /> <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> @@ -108,7 +112,9 @@ <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" /> <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> + <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" /> <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> + <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" /> <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" /> <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" /> <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> diff --git a/prebuild.xml b/prebuild.xml index c97c96cde1..7d1ca5909b 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -250,7 +250,7 @@ <!-- OpenGrid Data Services --> - <Project name="OpenGrid.Framework.Data" path="OpenGrid.FrameWork.Data" type="Library"> + <Project name="OpenGrid.Framework.Data" path="OpenGrid.Framework.Data" type="Library"> <Configuration name="Debug"> <Options> <OutputPath>../bin/</OutputPath> @@ -272,7 +272,7 @@ </Files> </Project> - <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.FrameWork.Data.MySQL" type="Library"> + <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.Framework.Data.MySQL" type="Library"> <Configuration name="Debug"> <Options> <OutputPath>../bin/</OutputPath>