* Added separate exe project

* Prebuild exe is now built in /bin dir

3 files changed, 106 insertions, 100 deletions

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 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{50D8594C-39E2-4695-B28D-AC8ADE15BC5A}</ProjectGuid>

+    <ProjectGuid>{457CE564-0922-4F15-846F-147E5BE62D67}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenSim</AssemblyName>

+    <AssemblyName>OpenSim.RegionServer</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.RegionServer</RootNamespace>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -29,8 +28,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -39,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -49,8 +46,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -59,41 +55,48 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System">

-      <HintPath>\System.dll</HintPath>

+    <Reference Include="System" >

+      <HintPath>System.dll</HintPath>

+      <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml.dll">

-      <HintPath>\System.Xml.dll.dll</HintPath>

+    <Reference Include="System.Xml" >

+      <HintPath>System.Xml.dll</HintPath>

+      <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll">

-      <HintPath>\libsecondlife.dll.dll</HintPath>

+    <Reference Include="libsecondlife.dll" >

+      <HintPath>..\bin\libsecondlife.dll</HintPath>

+      <Private>False</Private>

     </Reference>

-    <Reference Include="Axiom.MathLib.dll">

-      <HintPath>\Axiom.MathLib.dll.dll</HintPath>

+    <Reference Include="Axiom.MathLib.dll" >

+      <HintPath>..\bin\Axiom.MathLib.dll</HintPath>

+      <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll">

-      <HintPath>\Db4objects.Db4o.dll.dll</HintPath>

+    <Reference Include="Db4objects.Db4o.dll" >

+      <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>

+      <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

-      <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project>

+      <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

       <Name>OpenSim.Physics.Manager</Name>

-      <Project>{58360A80-9333-4E0F-8F83-3CF937E51633}</Project>

+      <Project>{79C8C9A7-EF80-426D-B815-AC88E7998DFE}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

-      <Project>{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}</Project>

+      <Project>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -145,6 +148,9 @@
     <Compile Include="world\Avatar.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="world\AvatarAnimations.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="world\Entity.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -171,4 +177,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

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 @@
+<?xml version="1.0" ?>

+<project name="OpenSim.RegionServer" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

+            <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="Grid.cs" />

+                <include name="OpenSimApplication.cs" />

+                <include name="OpenSimMain.cs" />

+                <include name="OpenSimRoot.cs" />

+                <include name="QueItem.cs" />

+                <include name="SimClient.cs" />

+                <include name="SimConsole.cs" />

+                <include name="VersionInfo.cs" />

+                <include name="Assets/AssetCache.cs" />

+                <include name="Assets/InventoryCache.cs" />

+                <include name="CAPS/SimHttp.cs" />

+                <include name="types/Mesh.cs" />

+                <include name="types/Triangle.cs" />

+                <include name="UserServer/LocalUserProfileManager.cs" />

+                <include name="UserServer/LoginServer.cs" />

+                <include name="world/Avatar.cs" />

+                <include name="world/AvatarAnimations.cs" />

+                <include name="world/Entity.cs" />

+                <include name="world/Primitive.cs" />

+                <include name="world/ScriptEngine.cs" />

+                <include name="world/SurfacePatch.cs" />

+                <include name="world/World.cs" />

+                <include name="world/scripting/IScript.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.Xml.dll" />

+                <include name="../bin/libsecondlife.dll" />

+                <include name="../bin/Axiom.MathLib.dll" />

+                <include name="../bin/Db4objects.Db4o.dll" />

+                <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />

+                <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />

+                <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.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.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

 {

-    /// <summary>

-    /// 

-    /// </summary>

     public class OpenSimMain : OpenSimApplication

     {

         private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();

@@ -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()

         {

         }