From 50f5686d918dbd519f21c0c611bea3f28daf4657 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Sat, 24 Mar 2007 08:06:41 +0000 Subject: * Added separate exe project * Prebuild exe is now built in /bin dir --- .../OpenSim.Config.SimConfigDb4o.csproj | 6 +- .../OpenSim.Config.SimConfigDb4o.dll.build | 2 +- .../OpenSim.Framework.Console.csproj | 2 +- OpenSim.Framework/OpenSim.Framework.csproj | 2 +- OpenSim.Framework/OpenSim.Framework.dll.build | 4 +- .../Local/OpenSim.GridInterfaces.Local.csproj | 6 +- .../Local/OpenSim.GridInterfaces.Local.dll.build | 2 +- .../Remote/OpenSim.GridInterfaces.Remote.csproj | 6 +- .../Remote/OpenSim.GridInterfaces.Remote.dll.build | 2 +- .../OpenSim.Physics.BasicPhysicsPlugin.csproj | 4 +- .../Manager/OpenSim.Physics.Manager.csproj | 4 +- .../Manager/OpenSim.Physics.Manager.dll.build | 2 +- .../PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | 4 +- OpenSim.RegionServer/OpenSim.RegionServer.csproj | 66 +++++----- .../OpenSim.RegionServer.dll.build | 68 ++++++++++ OpenSim.RegionServer/OpenSimMain.cs | 72 +---------- .../OpenSim.Storage.LocalStorageDb4o.csproj | 6 +- .../OpenSim.Storage.LocalStorageDb4o.dll.build | 2 +- OpenSim.build | 9 +- OpenSim.sln | 144 ++++++++++++--------- OpenSim/OpenSim.csproj | 120 +++++++++++++++++ OpenSim/OpenSim.exe.build | 47 +++++++ OpenSim/RegionServer.cs | 75 +++++++++++ Prebuild/Prebuild.sln | 30 ++--- Prebuild/src/Prebuild.csproj | 38 +++--- Prebuild/src/Prebuild.exe.build | 6 +- README.txt | 5 +- prebuild.xml | 41 +++++- 28 files changed, 544 insertions(+), 231 deletions(-) create mode 100644 OpenSim.RegionServer/OpenSim.RegionServer.dll.build create mode 100644 OpenSim/OpenSim.csproj create mode 100644 OpenSim/OpenSim.exe.build create mode 100644 OpenSim/RegionServer.cs diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj index ddb5415..cf13d5b 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0} + {C77FAE85-A786-4DEB-9AEB-46B75169079C} Debug AnyCPU @@ -82,13 +82,13 @@ OpenSim.Framework - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978} + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {1492353A-6133-4557-9AD8-6E24386D70F8} + {CE124F22-69FC-4499-AE68-1B877C5898C4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build index 288e877..3dfa7ce 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build @@ -22,7 +22,7 @@ - + diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index 2679789..dee9a8c 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {1492353A-6133-4557-9AD8-6E24386D70F8} + {CE124F22-69FC-4499-AE68-1B877C5898C4} Debug AnyCPU diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index 7b805ef..745874c 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978} + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE} Debug AnyCPU diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index 1418947..4963892 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build @@ -40,8 +40,8 @@ - - + + diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index 7a319c7..ebf950a 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {9257C89E-0894-4CE5-B25D-3D6EA50F38D0} + {5A852B3E-E770-4B00-A34B-1F8B4ABDA570} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978} + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {1492353A-6133-4557-9AD8-6E24386D70F8} + {CE124F22-69FC-4499-AE68-1B877C5898C4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index eff1fac..ec65ba8 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build @@ -21,7 +21,7 @@ - + diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj index ae03440..1de7ae0 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {B1BC5710-EA90-4566-A6A4-93D90EC19449} + {E0C662BD-1B64-4782-B8F2-9511255DB971} Debug AnyCPU @@ -74,13 +74,13 @@ OpenSim.Framework - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978} + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {1492353A-6133-4557-9AD8-6E24386D70F8} + {CE124F22-69FC-4499-AE68-1B877C5898C4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index e0d24ff..2060454 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build @@ -21,7 +21,7 @@ - + diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index 996ed5f..608c0a7 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {B045B311-34DF-4643-9C06-10E5BCF1B227} + {0A4D5E28-88B6-474E-AC5F-3F99822DD976} Debug AnyCPU @@ -70,7 +70,7 @@ OpenSim.Physics.Manager - {0FD686EA-1917-469E-A885-1D9DEEA1D340} + {79C8C9A7-EF80-426D-B815-AC88E7998DFE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj index 56e09e9..3a7925c 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {0FD686EA-1917-469E-A885-1D9DEEA1D340} + {79C8C9A7-EF80-426D-B815-AC88E7998DFE} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Framework.Console - {1492353A-6133-4557-9AD8-6E24386D70F8} + {CE124F22-69FC-4499-AE68-1B877C5898C4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 0f6565b..47e5534 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build @@ -23,7 +23,7 @@ - + diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj index 95dff0b..463700e 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {401245BB-2D4A-47D2-B377-179F62277E3E} + {62652FE9-20CC-4855-9D1C-6C1CCD706CC1} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {0FD686EA-1917-469E-A885-1D9DEEA1D340} + {79C8C9A7-EF80-426D-B815-AC88E7998DFE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 8129741..b191922 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -1,24 +1,23 @@ - + Local 8.0.50727 2.0 - {50D8594C-39E2-4695-B28D-AC8ADE15BC5A} + {457CE564-0922-4F15-846F-147E5BE62D67} Debug AnyCPU - - + - OpenSim + OpenSim.RegionServer JScript Grid IE50 false - Exe - - + Library + OpenSim.RegionServer + @@ -29,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -39,8 +37,7 @@ False False 4 - - + False @@ -49,8 +46,7 @@ TRACE - - + False 4096 True @@ -59,41 +55,48 @@ False False 4 - - + - - \System.dll + + System.dll + False - - \System.Xml.dll.dll + + System.Xml.dll + False - - \libsecondlife.dll.dll + + ..\bin\libsecondlife.dll + False - - \Axiom.MathLib.dll.dll + + ..\bin\Axiom.MathLib.dll + False - - \Db4objects.Db4o.dll.dll + + ..\bin\Db4objects.Db4o.dll + False OpenSim.Framework.Console - {C8405E1A-EC19-48B6-9C8C-CA03624B9916} + {CE124F22-69FC-4499-AE68-1B877C5898C4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False OpenSim.Physics.Manager - {58360A80-9333-4E0F-8F83-3CF937E51633} + {79C8C9A7-EF80-426D-B815-AC88E7998DFE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False OpenSim.Framework - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF} + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False @@ -145,6 +148,9 @@ Code + + Code + Code @@ -171,4 +177,4 @@ - \ No newline at end of file + diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build new file mode 100644 index 0000000..dce4dc1 --- /dev/null +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index b2bc0b3..cb184e8 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs @@ -48,9 +48,6 @@ using OpenSim.Physics.Manager; namespace OpenSim { - /// - /// - /// public class OpenSimMain : OpenSimApplication { private Dictionary clientCircuits = new Dictionary(); @@ -66,76 +63,11 @@ namespace OpenSim private System.Timers.Timer timer1 = new System.Timers.Timer(); private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll"; - private string _physicsEngine = "basicphysics"; + public string _physicsEngine = "basicphysics"; public bool sandbox = false; public bool loginserver = false; - [STAThread] - public static void Main(string[] args) - { - Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); - Console.WriteLine("Starting...\n"); - OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0); - - //OpenSimRoot.instance = new OpenSimRoot(); - OpenSimMain sim = new OpenSimMain(); - OpenSimRoot.Instance.Application = sim; - - sim.sandbox = false; - sim.loginserver = false; - sim._physicsEngine = "basicphysics"; - - for (int i = 0; i < args.Length; i++) - { - if (args[i] == "-sandbox") - { - sim.sandbox = true; - OpenSimRoot.Instance.Sandbox = true; - } - - if (args[i] == "-loginserver") - { - sim.loginserver = true; - } - if (args[i] == "-realphysx") - { - sim._physicsEngine = "RealPhysX"; - OpenSim.world.Avatar.PhysicsEngineFlying = true; - } - } - - - OpenSimRoot.Instance.GridServers = new Grid(); - if (sim.sandbox) - { - 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 = "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"); - } - - if (sim.loginserver && sim.sandbox) - { - LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer); - loginServer.Startup(); - } - - OpenSimRoot.Instance.StartUp(); - - while (true) - { - OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); - } - } - - private OpenSimMain() + public OpenSimMain() { } diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 993df11..6c9a3fb 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {F6AA425C-A307-4685-85E4-556C7CCEDD93} + {455B4201-F942-48A1-ADE3-E38641ABB4D2} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978} + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {1492353A-6133-4557-9AD8-6E24386D70F8} + {CE124F22-69FC-4499-AE68-1B877C5898C4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 752d0ab..44e8597 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build @@ -21,7 +21,7 @@ - + diff --git a/OpenSim.build b/OpenSim.build index 8f5c415..e0738a6 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -53,9 +53,10 @@ + - + @@ -67,7 +68,8 @@ - + + @@ -86,9 +88,10 @@ + - + diff --git a/OpenSim.sln b/OpenSim.sln index dd08d0b..bd0abb1 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,73 +1,99 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{401245BB-2D4A-47D2-B377-179F62277E3E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{62652FE9-20CC-4855-9D1C-6C1CCD706CC1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{1492353A-6133-4557-9AD8-6E24386D70F8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{CE124F22-69FC-4499-AE68-1B877C5898C4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C77FAE85-A786-4DEB-9AEB-46B75169079C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{B045B311-34DF-4643-9C06-10E5BCF1B227}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{0A4D5E28-88B6-474E-AC5F-3F99822DD976}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B1BC5710-EA90-4566-A6A4-93D90EC19449}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{E0C662BD-1B64-4782-B8F2-9511255DB971}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{F6AA425C-A307-4685-85E4-556C7CCEDD93}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{455B4201-F942-48A1-ADE3-E38641ABB4D2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{E267CE4E-F355-4A27-8D0D-CA48FEE7F978}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{0FD686EA-1917-469E-A885-1D9DEEA1D340}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{457CE564-0922-4F15-846F-147E5BE62D67}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{9257C89E-0894-4CE5-B25D-3D6EA50F38D0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{79C8C9A7-EF80-426D-B815-AC88E7998DFE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim.RegionServer\OpenSim.csproj", "{6E597AD4-1F7D-4389-B04C-403EF1046AAB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{5A852B3E-E770-4B00-A34B-1F8B4ABDA570}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{778D384D-088A-42DF-A683-2244BD9530DE}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {401245BB-2D4A-47D2-B377-179F62277E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {401245BB-2D4A-47D2-B377-179F62277E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {401245BB-2D4A-47D2-B377-179F62277E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {401245BB-2D4A-47D2-B377-179F62277E3E}.Release|Any CPU.Build.0 = Release|Any CPU - {1492353A-6133-4557-9AD8-6E24386D70F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1492353A-6133-4557-9AD8-6E24386D70F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1492353A-6133-4557-9AD8-6E24386D70F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1492353A-6133-4557-9AD8-6E24386D70F8}.Release|Any CPU.Build.0 = Release|Any CPU - {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}.Release|Any CPU.Build.0 = Release|Any CPU - {B045B311-34DF-4643-9C06-10E5BCF1B227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B045B311-34DF-4643-9C06-10E5BCF1B227}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B045B311-34DF-4643-9C06-10E5BCF1B227}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B045B311-34DF-4643-9C06-10E5BCF1B227}.Release|Any CPU.Build.0 = Release|Any CPU - {B1BC5710-EA90-4566-A6A4-93D90EC19449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1BC5710-EA90-4566-A6A4-93D90EC19449}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1BC5710-EA90-4566-A6A4-93D90EC19449}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1BC5710-EA90-4566-A6A4-93D90EC19449}.Release|Any CPU.Build.0 = Release|Any CPU - {F6AA425C-A307-4685-85E4-556C7CCEDD93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6AA425C-A307-4685-85E4-556C7CCEDD93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6AA425C-A307-4685-85E4-556C7CCEDD93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6AA425C-A307-4685-85E4-556C7CCEDD93}.Release|Any CPU.Build.0 = Release|Any CPU - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E267CE4E-F355-4A27-8D0D-CA48FEE7F978}.Release|Any CPU.Build.0 = Release|Any CPU - {0FD686EA-1917-469E-A885-1D9DEEA1D340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FD686EA-1917-469E-A885-1D9DEEA1D340}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FD686EA-1917-469E-A885-1D9DEEA1D340}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FD686EA-1917-469E-A885-1D9DEEA1D340}.Release|Any CPU.Build.0 = Release|Any CPU - {9257C89E-0894-4CE5-B25D-3D6EA50F38D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9257C89E-0894-4CE5-B25D-3D6EA50F38D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9257C89E-0894-4CE5-B25D-3D6EA50F38D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9257C89E-0894-4CE5-B25D-3D6EA50F38D0}.Release|Any CPU.Build.0 = Release|Any CPU - {6E597AD4-1F7D-4389-B04C-403EF1046AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E597AD4-1F7D-4389-B04C-403EF1046AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E597AD4-1F7D-4389-B04C-403EF1046AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E597AD4-1F7D-4389-B04C-403EF1046AAB}.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 + ({62652FE9-20CC-4855-9D1C-6C1CCD706CC1}).3 = ({79C8C9A7-EF80-426D-B815-AC88E7998DFE}) + ({C77FAE85-A786-4DEB-9AEB-46B75169079C}).5 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE}) + ({C77FAE85-A786-4DEB-9AEB-46B75169079C}).6 = ({CE124F22-69FC-4499-AE68-1B877C5898C4}) + ({0A4D5E28-88B6-474E-AC5F-3F99822DD976}).2 = ({79C8C9A7-EF80-426D-B815-AC88E7998DFE}) + ({E0C662BD-1B64-4782-B8F2-9511255DB971}).3 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE}) + ({E0C662BD-1B64-4782-B8F2-9511255DB971}).4 = ({CE124F22-69FC-4499-AE68-1B877C5898C4}) + ({455B4201-F942-48A1-ADE3-E38641ABB4D2}).4 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE}) + ({455B4201-F942-48A1-ADE3-E38641ABB4D2}).5 = ({CE124F22-69FC-4499-AE68-1B877C5898C4}) + ({457CE564-0922-4F15-846F-147E5BE62D67}).5 = ({CE124F22-69FC-4499-AE68-1B877C5898C4}) + ({457CE564-0922-4F15-846F-147E5BE62D67}).6 = ({79C8C9A7-EF80-426D-B815-AC88E7998DFE}) + ({457CE564-0922-4F15-846F-147E5BE62D67}).7 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE}) + ({79C8C9A7-EF80-426D-B815-AC88E7998DFE}).3 = ({CE124F22-69FC-4499-AE68-1B877C5898C4}) + ({5A852B3E-E770-4B00-A34B-1F8B4ABDA570}).4 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE}) + ({5A852B3E-E770-4B00-A34B-1F8B4ABDA570}).5 = ({CE124F22-69FC-4499-AE68-1B877C5898C4}) + ({778D384D-088A-42DF-A683-2244BD9530DE}).5 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE}) + ({778D384D-088A-42DF-A683-2244BD9530DE}).6 = ({CE124F22-69FC-4499-AE68-1B877C5898C4}) + ({778D384D-088A-42DF-A683-2244BD9530DE}).7 = ({79C8C9A7-EF80-426D-B815-AC88E7998DFE}) + ({778D384D-088A-42DF-A683-2244BD9530DE}).8 = ({457CE564-0922-4F15-846F-147E5BE62D67}) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {62652FE9-20CC-4855-9D1C-6C1CCD706CC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62652FE9-20CC-4855-9D1C-6C1CCD706CC1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62652FE9-20CC-4855-9D1C-6C1CCD706CC1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62652FE9-20CC-4855-9D1C-6C1CCD706CC1}.Release|Any CPU.Build.0 = Release|Any CPU + {CE124F22-69FC-4499-AE68-1B877C5898C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE124F22-69FC-4499-AE68-1B877C5898C4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE124F22-69FC-4499-AE68-1B877C5898C4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE124F22-69FC-4499-AE68-1B877C5898C4}.Release|Any CPU.Build.0 = Release|Any CPU + {C77FAE85-A786-4DEB-9AEB-46B75169079C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C77FAE85-A786-4DEB-9AEB-46B75169079C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C77FAE85-A786-4DEB-9AEB-46B75169079C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C77FAE85-A786-4DEB-9AEB-46B75169079C}.Release|Any CPU.Build.0 = Release|Any CPU + {0A4D5E28-88B6-474E-AC5F-3F99822DD976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A4D5E28-88B6-474E-AC5F-3F99822DD976}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A4D5E28-88B6-474E-AC5F-3F99822DD976}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A4D5E28-88B6-474E-AC5F-3F99822DD976}.Release|Any CPU.Build.0 = Release|Any CPU + {E0C662BD-1B64-4782-B8F2-9511255DB971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0C662BD-1B64-4782-B8F2-9511255DB971}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0C662BD-1B64-4782-B8F2-9511255DB971}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0C662BD-1B64-4782-B8F2-9511255DB971}.Release|Any CPU.Build.0 = Release|Any CPU + {455B4201-F942-48A1-ADE3-E38641ABB4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {455B4201-F942-48A1-ADE3-E38641ABB4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {455B4201-F942-48A1-ADE3-E38641ABB4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {455B4201-F942-48A1-ADE3-E38641ABB4D2}.Release|Any CPU.Build.0 = Release|Any CPU + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}.Release|Any CPU.Build.0 = Release|Any CPU + {457CE564-0922-4F15-846F-147E5BE62D67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {457CE564-0922-4F15-846F-147E5BE62D67}.Debug|Any CPU.Build.0 = Debug|Any CPU + {457CE564-0922-4F15-846F-147E5BE62D67}.Release|Any CPU.ActiveCfg = Release|Any CPU + {457CE564-0922-4F15-846F-147E5BE62D67}.Release|Any CPU.Build.0 = Release|Any CPU + {79C8C9A7-EF80-426D-B815-AC88E7998DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {79C8C9A7-EF80-426D-B815-AC88E7998DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {79C8C9A7-EF80-426D-B815-AC88E7998DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {79C8C9A7-EF80-426D-B815-AC88E7998DFE}.Release|Any CPU.Build.0 = Release|Any CPU + {5A852B3E-E770-4B00-A34B-1F8B4ABDA570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A852B3E-E770-4B00-A34B-1F8B4ABDA570}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A852B3E-E770-4B00-A34B-1F8B4ABDA570}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A852B3E-E770-4B00-A34B-1F8B4ABDA570}.Release|Any CPU.Build.0 = Release|Any CPU + {778D384D-088A-42DF-A683-2244BD9530DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {778D384D-088A-42DF-A683-2244BD9530DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {778D384D-088A-42DF-A683-2244BD9530DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {778D384D-088A-42DF-A683-2244BD9530DE}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj new file mode 100644 index 0000000..12ead94 --- /dev/null +++ b/OpenSim/OpenSim.csproj @@ -0,0 +1,120 @@ + + + Local + 8.0.50727 + 2.0 + {778D384D-088A-42DF-A683-2244BD9530DE} + Debug + AnyCPU + + + + OpenSim + JScript + Grid + IE50 + false + Exe + + OpenSim + + + + + + False + 285212672 + False + + + TRACE;DEBUG + + True + 4096 + False + ..\bin\ + False + False + False + 4 + + + + False + 285212672 + False + + + TRACE + + False + 4096 + True + ..\bin\ + False + False + False + 4 + + + + + System.dll + False + + + System.Xml.dll + False + + + ..\bin\libsecondlife.dll + False + + + ..\bin\Axiom.MathLib.dll + False + + + ..\bin\Db4objects.Db4o.dll + False + + + + + OpenSim.Framework + {71848571-2BC0-41DC-A69C-28B6DDB8C8CE} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.Framework.Console + {CE124F22-69FC-4499-AE68-1B877C5898C4} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.Physics.Manager + {79C8C9A7-EF80-426D-B815-AC88E7998DFE} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.RegionServer + {457CE564-0922-4F15-846F-147E5BE62D67} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + + + Code + + + + + + + + + + diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build new file mode 100644 index 0000000..7d69d90 --- /dev/null +++ b/OpenSim/OpenSim.exe.build @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs new file mode 100644 index 0000000..6fabe3f --- /dev/null +++ b/OpenSim/RegionServer.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim.UserServer; + +namespace OpenSim +{ + public class RegionServer : OpenSimMain + { + [STAThread] + public static void Main(string[] args) + { + Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); + Console.WriteLine("Starting...\n"); + OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0); + + //OpenSimRoot.instance = new OpenSimRoot(); + OpenSimMain sim = new OpenSimMain(); + OpenSimRoot.Instance.Application = sim; + + sim.sandbox = false; + sim.loginserver = false; + sim._physicsEngine = "basicphysics"; + + for (int i = 0; i < args.Length; i++) + { + if (args[i] == "-sandbox") + { + sim.sandbox = true; + OpenSimRoot.Instance.Sandbox = true; + } + + if (args[i] == "-loginserver") + { + sim.loginserver = true; + } + if (args[i] == "-realphysx") + { + sim._physicsEngine = "RealPhysX"; + OpenSim.world.Avatar.PhysicsEngineFlying = true; + } + } + + + OpenSimRoot.Instance.GridServers = new Grid(); + if (sim.sandbox) + { + 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 = "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"); + } + + if (sim.loginserver && sim.sandbox) + { + LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer); + loginServer.Startup(); + } + + OpenSimRoot.Instance.StartUp(); + + while (true) + { + OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); + } + } + } +} diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index a0bea09..95a3f0f 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln @@ -1,25 +1,25 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{F7B3D806-20FD-4181-86F1-96E24A9EC850}" 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 + prebuild = prebuild EndProjectSection EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}.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(ProjectConfigurationPlatforms) = postSolution + {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index 82589c2..17d5089 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj @@ -1,9 +1,9 @@ - + Local 8.0.50727 2.0 - {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78} + {F7B3D806-20FD-4181-86F1-96E24A9EC850} Debug AnyCPU App.ico @@ -17,8 +17,7 @@ IE50 false Exe - - + Prebuild Prebuild.Prebuild @@ -31,12 +30,11 @@ DEBUG;TRACE - - + True 4096 False - ..\bin\ + ..\..\bin\ False False False @@ -50,12 +48,11 @@ TRACE - - + False 4096 True - ..\bin\ + ..\..\bin\ False False False @@ -63,6 +60,20 @@ 1595 + + System.EnterpriseServices.dll + False + + + System.Xml.dll + False + + + System.dll + False + + + @@ -184,11 +195,6 @@ Code - - - - - @@ -196,4 +202,4 @@ - \ No newline at end of file + diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index fda34b9..43f5516 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build @@ -62,9 +62,9 @@ - - - + + + diff --git a/README.txt b/README.txt index c7c5a93..da62bc7 100644 --- a/README.txt +++ b/README.txt @@ -42,9 +42,9 @@ To build it with nant : * cd to /Prebuild/ * type 'nant' -After you've built it, move it from /Prebuild/src/bin to /bin/ directory, +After you've built it, it will land in the root /bin/ directory, -after that you just modify the prebuild.xml and then execute +When adding or changing projects, modify the prebuild.xml and then execute bin/Prebuild.exe /target {target} @@ -52,4 +52,5 @@ where target is either vs2005 - to generate new vs2005 solutions and projects nant - to generate new nant build scripts +Remember to run prebuild whenever you've added or removed files as well. diff --git a/prebuild.xml b/prebuild.xml index 2ac874f..df02b59 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -214,8 +214,7 @@ - - + ../bin/ @@ -242,6 +241,35 @@ + + + + + ../bin/ + + + + + ../bin/ + + + + ../bin/ + + + + + + + + + + + + + + + @@ -277,7 +305,7 @@ - + -- cgit v1.1