diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj index 19e26d8ea9..ab229967b8 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {7896375E-4912-4F9B-872E-AA76E9EF61BC} + {036E3EE7-2879-4975-AF77-FE1112ECD3E9} Debug AnyCPU - - + OpenSim.Config.SimConfigDb4o - - JScript Grid IE50 false Library + OpenSim.Config.SimConfigDb4o - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,48 +55,35 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll - - System.Data.dll + \System.Data.dll.dll - True - - System.Xml.dll + \System.Xml.dll.dll - True - - libsecondlife.dll + \libsecondlife.dll.dll - True - - Db4objects.Db4o.dll + \Db4objects.Db4o.dll.dll - True OpenSim.Framework - {A3BA45EE-E862-43DA-8FC6-B4A7095232E1} + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True OpenSim.Framework.Console - {E6DE88A1-3D78-409A-A3FB-70B3CAD1D7AA} + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True @@ -123,4 +104,4 @@ - \ No newline at end of file + diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build index 69fb6497c0..584608ca99 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build @@ -3,15 +3,22 @@ - + + + + + + + - - - + + + + @@ -21,8 +28,6 @@ - - diff --git a/OpenSim.FrameWork/OpenSim.Framework.csproj b/OpenSim.FrameWork/OpenSim.Framework.csproj index 61c39be3aa..445ed30c52 100644 --- a/OpenSim.FrameWork/OpenSim.Framework.csproj +++ b/OpenSim.FrameWork/OpenSim.Framework.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {5FD3848E-EA2C-4187-95CB-844195E56FBF} + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07} Debug AnyCPU - - + OpenSim.Framework - - JScript Grid IE50 false Library + OpenSim.Framework - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,24 +55,17 @@ False False 4 - - + - - System.dll + \System.dll.dll - True - - System.Xml.dll + \System.Xml.dll.dll - True - - libsecondlife.dll + \libsecondlife.dll.dll - True @@ -161,4 +148,4 @@ - \ No newline at end of file + diff --git a/OpenSim.FrameWork/OpenSim.Framework.dll.build b/OpenSim.FrameWork/OpenSim.Framework.dll.build index 606fd321d5..fe5063a448 100644 --- a/OpenSim.FrameWork/OpenSim.Framework.dll.build +++ b/OpenSim.FrameWork/OpenSim.Framework.dll.build @@ -3,42 +3,47 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index 0ad0703f59..550d88575f 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {0D23207E-63D6-454C-B892-CAAC6A8ABFD1} + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845} Debug AnyCPU - - + OpenSim.Framework.Console - - JScript Grid IE50 false Library + OpenSim.Framework.Console - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,14 +55,11 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll @@ -91,4 +82,4 @@ - \ No newline at end of file + diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build index c38bc9f6ad..cf6c20d70e 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build @@ -3,20 +3,25 @@ - + + + + + + + - - - + + + + - - diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index 3b1d24573c..dfda93f7c0 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {09A06B98-8566-4992-B8EA-1A1218202122} + {13DD8941-91C2-419C-B9EC-56D79EA1B1E2} Debug AnyCPU - - + OpenSim.GridInterfaces.Local - - JScript Grid IE50 false Library + OpenSim.GridInterfaces.Local - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,43 +55,32 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll - - System.Xml.dll + \System.Xml.dll.dll - True - - Db4objects.Db4o.dll + \Db4objects.Db4o.dll.dll - True - - libsecondlife.dll + \libsecondlife.dll.dll - True OpenSim.Framework - {A3BA45EE-E862-43DA-8FC6-B4A7095232E1} + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True OpenSim.Framework.Console - {E6DE88A1-3D78-409A-A3FB-70B3CAD1D7AA} + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True @@ -118,4 +101,4 @@ - \ No newline at end of file + diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index c8d085b873..494e5d9d2a 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build @@ -3,15 +3,22 @@ - + + + + + + + - - - + + + + @@ -20,8 +27,6 @@ - - diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj index 724cc92f0e..e30ce45baa 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {28479E7D-AB48-4531-966A-1F7F45959280} + {20C5B7F5-EBFD-46BD-8F4C-C5FE29D10F92} Debug AnyCPU - - + OpenSim.GridInterfaces.Remote - - JScript Grid IE50 false Library + OpenSim.GridInterfaces.Remote - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,38 +55,29 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll - - System.Xml.dll + \System.Xml.dll.dll - True - - libsecondlife.dll + \libsecondlife.dll.dll - True OpenSim.Framework - {A3BA45EE-E862-43DA-8FC6-B4A7095232E1} + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True OpenSim.Framework.Console - {E6DE88A1-3D78-409A-A3FB-70B3CAD1D7AA} + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True @@ -113,4 +98,4 @@ - \ No newline at end of file + diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index fcb50b8086..24cb25b374 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build @@ -3,15 +3,22 @@ - + + + + + + + - - - + + + + @@ -19,8 +26,6 @@ - - diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index d4fc89143f..4ea4649b48 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {27E1A9E0-2F17-4624-B623-A5AC54C64CD7} + {4E6EF664-0598-4222-9AC8-BD77DDE3E17C} Debug AnyCPU - - + OpenSim.Physics.BasicPhysicsPlugin - - JScript Grid IE50 false Library + OpenSim.Physics.BasicPhysicsPlugin - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,27 +55,21 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll - - Axiom.MathLib.dll + \Axiom.MathLib.dll.dll - False OpenSim.Physics.Manager - {90BDBEB8-6FDD-46FC-8C97-B9DF3DDC8ECB} + {4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False @@ -99,4 +87,4 @@ - \ No newline at end of file + diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user index 3fd81a6c2d..13e65a84bd 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user @@ -1,12 +1,12 @@ - - Debug - AnyCPU - C:\Documents and Settings\Stefan\My Documents\Projects\source\opensim\branches\zircon\bin\ - 8.0.50727 - ProjectFiles - 0 - - - + + Debug + AnyCPU + C:\Documents and Settings\Stefan\My Documents\Projects\source\opensim\branches\zircon\bin\ + 8.0.50727 + ProjectFiles + 0 + + + diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index 99cfad0770..fda56691b4 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build @@ -3,21 +3,26 @@ - + + + + + + + - - + + + - - diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj index d74de398b1..af911cad77 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {39C05ABD-FC6C-43C6-9909-C3AC856DC42E} + {4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774} Debug AnyCPU - - + OpenSim.Physics.Manager - - JScript Grid IE50 false Library + OpenSim.Physics.Manager - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,32 +55,24 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll - - System.Xml.dll + \System.Xml.dll.dll - True - - Axiom.MathLib.dll + \Axiom.MathLib.dll.dll - True OpenSim.Framework.Console - {E6DE88A1-3D78-409A-A3FB-70B3CAD1D7AA} + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True @@ -113,4 +99,4 @@ - \ No newline at end of file + diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 06a68920a2..f904bd24d8 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build @@ -3,25 +3,30 @@ - + + + + + + + - - - - - + + + + + + - - diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXplugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXplugin.csproj index 89708efe67..752261bca1 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXplugin.csproj +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXplugin.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {2E63C4DE-8803-4EB6-99AA-2DEFE4D5F495} + {667016C2-FA4E-410F-8AA2-4FD24F9F8091} Debug AnyCPU - - + OpenSim.Physics.PhysXplugin - - JScript Grid IE50 false Library + OpenSim.Physics.PhysXplugin - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,32 +55,24 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll - - Axiom.MathLib.dll + \Axiom.MathLib.dll.dll - False - - PhysX_Wrapper_Dotnet.dll + \PhysX_Wrapper_Dotnet.dll.dll - False OpenSim.Physics.Manager - {90BDBEB8-6FDD-46FC-8C97-B9DF3DDC8ECB} + {4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False @@ -104,4 +90,4 @@ - \ No newline at end of file + diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXplugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXplugin.dll.build index 5a457088d5..17305f5b9c 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXplugin.dll.build +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXplugin.dll.build @@ -3,22 +3,27 @@ - + + + + + + + - - + + + - - diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 5068a2bcb3..cdd1cde3ba 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {1DA613F3-C99E-427E-A9E1-9058BBD2CEE0} + {7F3535FA-3EEA-4236-BFB2-5B59CE78F87F} Debug AnyCPU - - + OpenSim.RegionServer - - JScript Grid IE50 false Exe + OpenSim.RegionServer - - + OpenSim.RegionServer @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,54 +55,40 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll - - System.Xml.dll + \System.Xml.dll.dll - True - - libsecondlife.dll + \libsecondlife.dll.dll - True - - Axiom.MathLib.dll + \Axiom.MathLib.dll.dll - True - - Db4objects.Db4o.dll + \Db4objects.Db4o.dll.dll - True OpenSim.Framework.Console - {E6DE88A1-3D78-409A-A3FB-70B3CAD1D7AA} + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True OpenSim.Physics.Manager - {90BDBEB8-6FDD-46FC-8C97-B9DF3DDC8ECB} + {4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True OpenSim.Framework - {A3BA45EE-E862-43DA-8FC6-B4A7095232E1} + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True @@ -186,4 +166,4 @@ - \ No newline at end of file + diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.exe.build b/OpenSim.RegionServer/OpenSim.RegionServer.exe.build index 3f887de3bb..1b6e7ce48a 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.exe.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.exe.build @@ -3,34 +3,41 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -41,8 +48,6 @@ - - diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index 93c8665a10..bfa32067d2 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs @@ -84,7 +84,7 @@ namespace OpenSim private AsyncCallback ReceivedData; private System.Timers.Timer timer1 = new System.Timers.Timer(); - private string ConfigDll = "SimConfig.dll"; + private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll"; private string _physicsEngine = "basicphysics"; public bool sandbox = false; public bool loginserver = false; @@ -126,15 +126,15 @@ namespace OpenSim OpenSimRoot.Instance.GridServers = new Grid(); if (sim.sandbox) { - OpenSimRoot.Instance.GridServers.AssetDll = "LocalGridServers.dll"; - OpenSimRoot.Instance.GridServers.GridDll = "LocalGridServers.dll"; + OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; + OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; OpenSimRoot.Instance.GridServers.Initialise(); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Sandbox mode"); } else { - OpenSimRoot.Instance.GridServers.AssetDll = "RemoteGridServers.dll"; - OpenSimRoot.Instance.GridServers.GridDll = "RemoteGridServers.dll"; + OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll"; + OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll"; OpenSimRoot.Instance.GridServers.Initialise(); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode"); } @@ -184,7 +184,7 @@ namespace OpenSim OpenSimRoot.Instance.GridServers.AssetServer.SetServerInfo(OpenSimRoot.Instance.Cfg.AssetURL, OpenSimRoot.Instance.Cfg.AssetSendKey); OpenSimRoot.Instance.GridServers.GridServer.SetServerInfo(OpenSimRoot.Instance.Cfg.GridURL, OpenSimRoot.Instance.Cfg.GridSendKey, OpenSimRoot.Instance.Cfg.GridRecvKey); - OpenSimRoot.Instance.LocalWorld.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded. + OpenSimRoot.Instance.LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. OpenSimRoot.Instance.LocalWorld.LoadPrimsFromStorage(); if (this.sandbox) diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index ef4745fbac..61fddf325e 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj @@ -1,26 +1,23 @@ - + Local 8.0.50727 2.0 - {77482184-6B4F-4F3C-B4C6-F8B1C256DA72} + {C4041B28-BEBA-4171-A64A-8855B612BD7C} Debug AnyCPU - - + OpenSim.Storage.LocalStorageDb4o - - JScript Grid IE50 false Library + OpenSim.Storage.LocalStorageDb4o - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,43 +55,32 @@ False False 4 - - + - - System.dll - \System.dll.dll - True + + \System.dll - - System.Xml.dll + \System.Xml.dll.dll - True - - Db4objects.Db4o.dll + \Db4objects.Db4o.dll.dll - True - - libsecondlife.dll + \libsecondlife.dll.dll - True OpenSim.Framework - {A3BA45EE-E862-43DA-8FC6-B4A7095232E1} + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True OpenSim.Framework.Console - {E6DE88A1-3D78-409A-A3FB-70B3CAD1D7AA} + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - True @@ -118,4 +101,4 @@ - \ No newline at end of file + diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 06d11080c9..822d66b5b7 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build @@ -3,15 +3,22 @@ - + + + + + + + - - - + + + + @@ -20,8 +27,6 @@ - - diff --git a/OpenSim.build b/OpenSim.build index 0f3cf607df..6eb3a711e0 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -4,6 +4,7 @@ + @@ -43,47 +44,51 @@ - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/OpenSim.sln b/OpenSim.sln index 6134fdd6f4..6d4c0cd9f0 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,89 +1,89 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "..\zircon\OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{147B65A0-BDD0-4569-86E8-B04A3120FB62}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{C4041B28-BEBA-4171-A64A-8855B612BD7C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "..\zircon\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{61ED0F60-1E9B-4F1F-B45B-FB6418F92845}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "..\zircon\OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{B4011E4F-E363-48C0-9B99-D65B8E6E67BA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{036E3EE7-2879-4975-AF77-FE1112ECD3E9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "..\zircon\OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{93756CDD-663B-48F6-8B72-0B730773DC82}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4E6EF664-0598-4222-9AC8-BD77DDE3E17C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "..\zircon\OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{7E55E413-3E75-4FF0-8322-6D179A49C5BF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{20C5B7F5-EBFD-46BD-8F4C-C5FE29D10F92}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "..\zircon\OpenSim.Framework\OpenSim.Framework.csproj", "{15BCBDD6-3591-4443-B060-C34B46E719D4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{B08C9FD1-28C4-4EA3-8317-7D81564DDC07}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXplugin", "..\zircon\OpenSim.Physics\PhysXplugin\OpenSim.Physics.PhysXplugin.csproj", "{65AD77F6-5E41-42CB-A6C9-D88009A5159B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXplugin", "OpenSim.Physics\PhysXplugin\OpenSim.Physics.PhysXplugin.csproj", "{667016C2-FA4E-410F-8AA2-4FD24F9F8091}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "..\zircon\OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{E02DFEDE-1F61-470C-8556-6EE467C2884E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{7F3535FA-3EEA-4236-BFB2-5B59CE78F87F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "..\zircon\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "..\zircon\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{536BD9EC-9F5D-4D96-B6D5-883D5B7E0DAE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{13DD8941-91C2-419C-B9EC-56D79EA1B1E2}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - ({147B65A0-BDD0-4569-86E8-B04A3120FB62}).4 = ({15BCBDD6-3591-4443-B060-C34B46E719D4}) - ({147B65A0-BDD0-4569-86E8-B04A3120FB62}).5 = ({F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}) - ({B4011E4F-E363-48C0-9B99-D65B8E6E67BA}).5 = ({15BCBDD6-3591-4443-B060-C34B46E719D4}) - ({B4011E4F-E363-48C0-9B99-D65B8E6E67BA}).6 = ({F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}) - ({93756CDD-663B-48F6-8B72-0B730773DC82}).2 = ({47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}) - ({7E55E413-3E75-4FF0-8322-6D179A49C5BF}).3 = ({15BCBDD6-3591-4443-B060-C34B46E719D4}) - ({7E55E413-3E75-4FF0-8322-6D179A49C5BF}).4 = ({F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}) - ({65AD77F6-5E41-42CB-A6C9-D88009A5159B}).3 = ({47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}) - ({E02DFEDE-1F61-470C-8556-6EE467C2884E}).5 = ({F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}) - ({E02DFEDE-1F61-470C-8556-6EE467C2884E}).6 = ({47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}) - ({E02DFEDE-1F61-470C-8556-6EE467C2884E}).7 = ({15BCBDD6-3591-4443-B060-C34B46E719D4}) - ({47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}).3 = ({F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}) - ({536BD9EC-9F5D-4D96-B6D5-883D5B7E0DAE}).4 = ({15BCBDD6-3591-4443-B060-C34B46E719D4}) - ({536BD9EC-9F5D-4D96-B6D5-883D5B7E0DAE}).5 = ({F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {147B65A0-BDD0-4569-86E8-B04A3120FB62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {147B65A0-BDD0-4569-86E8-B04A3120FB62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {147B65A0-BDD0-4569-86E8-B04A3120FB62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {147B65A0-BDD0-4569-86E8-B04A3120FB62}.Release|Any CPU.Build.0 = Release|Any CPU - {F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1B7CF0A-F6CA-419F-AC2E-95FFF2CAE7B7}.Release|Any CPU.Build.0 = Release|Any CPU - {B4011E4F-E363-48C0-9B99-D65B8E6E67BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B4011E4F-E363-48C0-9B99-D65B8E6E67BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4011E4F-E363-48C0-9B99-D65B8E6E67BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4011E4F-E363-48C0-9B99-D65B8E6E67BA}.Release|Any CPU.Build.0 = Release|Any CPU - {93756CDD-663B-48F6-8B72-0B730773DC82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93756CDD-663B-48F6-8B72-0B730773DC82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93756CDD-663B-48F6-8B72-0B730773DC82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93756CDD-663B-48F6-8B72-0B730773DC82}.Release|Any CPU.Build.0 = Release|Any CPU - {7E55E413-3E75-4FF0-8322-6D179A49C5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E55E413-3E75-4FF0-8322-6D179A49C5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E55E413-3E75-4FF0-8322-6D179A49C5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E55E413-3E75-4FF0-8322-6D179A49C5BF}.Release|Any CPU.Build.0 = Release|Any CPU - {15BCBDD6-3591-4443-B060-C34B46E719D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15BCBDD6-3591-4443-B060-C34B46E719D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15BCBDD6-3591-4443-B060-C34B46E719D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15BCBDD6-3591-4443-B060-C34B46E719D4}.Release|Any CPU.Build.0 = Release|Any CPU - {65AD77F6-5E41-42CB-A6C9-D88009A5159B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65AD77F6-5E41-42CB-A6C9-D88009A5159B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65AD77F6-5E41-42CB-A6C9-D88009A5159B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65AD77F6-5E41-42CB-A6C9-D88009A5159B}.Release|Any CPU.Build.0 = Release|Any CPU - {E02DFEDE-1F61-470C-8556-6EE467C2884E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E02DFEDE-1F61-470C-8556-6EE467C2884E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E02DFEDE-1F61-470C-8556-6EE467C2884E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E02DFEDE-1F61-470C-8556-6EE467C2884E}.Release|Any CPU.Build.0 = Release|Any CPU - {47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47EF519F-E5E1-4520-9EC4-2FAEB4CA44FB}.Release|Any CPU.Build.0 = Release|Any CPU - {536BD9EC-9F5D-4D96-B6D5-883D5B7E0DAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {536BD9EC-9F5D-4D96-B6D5-883D5B7E0DAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {536BD9EC-9F5D-4D96-B6D5-883D5B7E0DAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {536BD9EC-9F5D-4D96-B6D5-883D5B7E0DAE}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + ({C4041B28-BEBA-4171-A64A-8855B612BD7C}).4 = ({B08C9FD1-28C4-4EA3-8317-7D81564DDC07}) + ({C4041B28-BEBA-4171-A64A-8855B612BD7C}).5 = ({61ED0F60-1E9B-4F1F-B45B-FB6418F92845}) + ({036E3EE7-2879-4975-AF77-FE1112ECD3E9}).5 = ({B08C9FD1-28C4-4EA3-8317-7D81564DDC07}) + ({036E3EE7-2879-4975-AF77-FE1112ECD3E9}).6 = ({61ED0F60-1E9B-4F1F-B45B-FB6418F92845}) + ({4E6EF664-0598-4222-9AC8-BD77DDE3E17C}).2 = ({4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}) + ({20C5B7F5-EBFD-46BD-8F4C-C5FE29D10F92}).3 = ({B08C9FD1-28C4-4EA3-8317-7D81564DDC07}) + ({20C5B7F5-EBFD-46BD-8F4C-C5FE29D10F92}).4 = ({61ED0F60-1E9B-4F1F-B45B-FB6418F92845}) + ({667016C2-FA4E-410F-8AA2-4FD24F9F8091}).3 = ({4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}) + ({7F3535FA-3EEA-4236-BFB2-5B59CE78F87F}).5 = ({61ED0F60-1E9B-4F1F-B45B-FB6418F92845}) + ({7F3535FA-3EEA-4236-BFB2-5B59CE78F87F}).6 = ({4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}) + ({7F3535FA-3EEA-4236-BFB2-5B59CE78F87F}).7 = ({B08C9FD1-28C4-4EA3-8317-7D81564DDC07}) + ({4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}).3 = ({61ED0F60-1E9B-4F1F-B45B-FB6418F92845}) + ({13DD8941-91C2-419C-B9EC-56D79EA1B1E2}).4 = ({B08C9FD1-28C4-4EA3-8317-7D81564DDC07}) + ({13DD8941-91C2-419C-B9EC-56D79EA1B1E2}).5 = ({61ED0F60-1E9B-4F1F-B45B-FB6418F92845}) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C4041B28-BEBA-4171-A64A-8855B612BD7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4041B28-BEBA-4171-A64A-8855B612BD7C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4041B28-BEBA-4171-A64A-8855B612BD7C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4041B28-BEBA-4171-A64A-8855B612BD7C}.Release|Any CPU.Build.0 = Release|Any CPU + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61ED0F60-1E9B-4F1F-B45B-FB6418F92845}.Release|Any CPU.Build.0 = Release|Any CPU + {036E3EE7-2879-4975-AF77-FE1112ECD3E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {036E3EE7-2879-4975-AF77-FE1112ECD3E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {036E3EE7-2879-4975-AF77-FE1112ECD3E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {036E3EE7-2879-4975-AF77-FE1112ECD3E9}.Release|Any CPU.Build.0 = Release|Any CPU + {4E6EF664-0598-4222-9AC8-BD77DDE3E17C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4E6EF664-0598-4222-9AC8-BD77DDE3E17C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E6EF664-0598-4222-9AC8-BD77DDE3E17C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4E6EF664-0598-4222-9AC8-BD77DDE3E17C}.Release|Any CPU.Build.0 = Release|Any CPU + {20C5B7F5-EBFD-46BD-8F4C-C5FE29D10F92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20C5B7F5-EBFD-46BD-8F4C-C5FE29D10F92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20C5B7F5-EBFD-46BD-8F4C-C5FE29D10F92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20C5B7F5-EBFD-46BD-8F4C-C5FE29D10F92}.Release|Any CPU.Build.0 = Release|Any CPU + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B08C9FD1-28C4-4EA3-8317-7D81564DDC07}.Release|Any CPU.Build.0 = Release|Any CPU + {667016C2-FA4E-410F-8AA2-4FD24F9F8091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {667016C2-FA4E-410F-8AA2-4FD24F9F8091}.Debug|Any CPU.Build.0 = Debug|Any CPU + {667016C2-FA4E-410F-8AA2-4FD24F9F8091}.Release|Any CPU.ActiveCfg = Release|Any CPU + {667016C2-FA4E-410F-8AA2-4FD24F9F8091}.Release|Any CPU.Build.0 = Release|Any CPU + {7F3535FA-3EEA-4236-BFB2-5B59CE78F87F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F3535FA-3EEA-4236-BFB2-5B59CE78F87F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F3535FA-3EEA-4236-BFB2-5B59CE78F87F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F3535FA-3EEA-4236-BFB2-5B59CE78F87F}.Release|Any CPU.Build.0 = Release|Any CPU + {4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4061B5D6-24D0-4C7A-88D7-B0FE7FAE1774}.Release|Any CPU.Build.0 = Release|Any CPU + {13DD8941-91C2-419C-B9EC-56D79EA1B1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13DD8941-91C2-419C-B9EC-56D79EA1B1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13DD8941-91C2-419C-B9EC-56D79EA1B1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13DD8941-91C2-419C-B9EC-56D79EA1B1E2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build new file mode 100644 index 0000000000..395fb31e54 --- /dev/null +++ b/Prebuild/Prebuild.build @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln new file mode 100644 index 0000000000..d5f39452f6 --- /dev/null +++ b/Prebuild/Prebuild.sln @@ -0,0 +1,25 @@ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{0E325E61-D8C0-4AC6-BE7D-8D6EBF49FDC6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{468F1D07-AD17-4CC3-ABD0-2CA268E4E1A6}" + ProjectSection(SolutionItems) = preProject + prebuild = prebuild + prebuild.xml = prebuild.xml + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E325E61-D8C0-4AC6-BE7D-8D6EBF49FDC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E325E61-D8C0-4AC6-BE7D-8D6EBF49FDC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E325E61-D8C0-4AC6-BE7D-8D6EBF49FDC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E325E61-D8C0-4AC6-BE7D-8D6EBF49FDC6}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Prebuild/README b/Prebuild/README new file mode 100644 index 0000000000..eca6be17e2 --- /dev/null +++ b/Prebuild/README @@ -0,0 +1,230 @@ +Prebuild Instructions + +Prebuild is an XML-driven pre-build tool allowing developers to easily generate project or make files for major IDE's and .NET development tools including: Visual Studio 2005, Visual Studio 2003, Visual Studio 2002, SharpDevelop, SharpDevelop2, MonoDevelop, and NAnt. + +_________________________________________________________________________________ +Overview + +Prebuild can be either be run from the command line to generate the project and make files or you can execute the included batch (*.bat) and Unix Shell script (*.sh) files. +The Prebuild file + +_________________________________________________________________________________ +The currently supported developement tools and their associated batch and shell script files. + +Visual Studio .NET 2005 (VS2005.bat) +Visual Studio .NET 2003 (VS2003.bat) +Visual Studio .NET 2002 (VS2002.bat) +SharpDevelop (SharpDevelop.bat) - http://www.icsharpcode.net/OpenSource/SD/ +SharpDevelop2 (SharpDevelop.bat) - http://www.icsharpcode.net/OpenSource/SD/ +MonoDevelop (MonoDevelop.sh) - http://www.monodevelop.com/ +NAnt (nant.sh and nant.bat) - http://nant.sourceforge.net/ +Autotools (autotools.bat and autotools.sh) http://www.gnu.org. Only partial support + +Notes: +A Unix Shell script is provided for MonoDevelop, as this is more appropriate than a windows batch file. +Visual Studio .NET 2005 and the Visual Express IDE's can import solutions from older versions of Visual Studio .NET. +Makefiles are not currently supported. + +_________________________________________________________________________________ +Command Line Syntax: + +Example: +>Prebuild /target vs2003 + +This will generate the project files for Visual Studio.NET 2003 and place the redirect the log to a file named PrebuildLog.txt in the parent directory + + +The syntax structure is as below, where commandParameter is optional depending on the command and you can provide several option-value pairs. +Note: The '>' signified the command line, do not actually enter this manually + +>Prebuild /