aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712007-03-24 08:06:41 +0000
committerlbsa712007-03-24 08:06:41 +0000
commit50f5686d918dbd519f21c0c611bea3f28daf4657 (patch)
tree769f71b6f5854b524fd5895fc05718da6a1991da /OpenSim
parentAdded Fly animation (diff)
downloadopensim-SC_OLD-50f5686d918dbd519f21c0c611bea3f28daf4657.zip
opensim-SC_OLD-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.gz
opensim-SC_OLD-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.bz2
opensim-SC_OLD-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.xz
* Added separate exe project
* Prebuild exe is now built in /bin dir
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.csproj120
-rw-r--r--OpenSim/OpenSim.exe.build47
-rw-r--r--OpenSim/RegionServer.cs75
3 files changed, 242 insertions, 0 deletions
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 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{778D384D-088A-42DF-A683-2244BD9530DE}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenSim</RootNamespace>
20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
59 </PropertyGroup>
60 <ItemGroup>
61 <Reference Include="System" >
62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
64 </Reference>
65 <Reference Include="System.Xml" >
66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="libsecondlife.dll" >
70 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="Axiom.MathLib.dll" >
74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="Db4objects.Db4o.dll" >
78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 </ItemGroup>
82 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name>
85 <Project>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
88 </ProjectReference>
89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private>
94 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
96 <Name>OpenSim.Physics.Manager</Name>
97 <Project>{79C8C9A7-EF80-426D-B815-AC88E7998DFE}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private>
100 </ProjectReference>
101 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
102 <Name>OpenSim.RegionServer</Name>
103 <Project>{457CE564-0922-4F15-846F-147E5BE62D67}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private>
106 </ProjectReference>
107 </ItemGroup>
108 <ItemGroup>
109 <Compile Include="RegionServer.cs">
110 <SubType>Code</SubType>
111 </Compile>
112 </ItemGroup>
113 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
114 <PropertyGroup>
115 <PreBuildEvent>
116 </PreBuildEvent>
117 <PostBuildEvent>
118 </PostBuildEvent>
119 </PropertyGroup>
120</Project>
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 @@
1<?xml version="1.0" ?>
2<project name="OpenSim" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="OpenSim" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="RegionServer.cs" />
15 </sources>
16 <references basedir="${project::get-base-directory()}">
17 <lib>
18 <include name="${project::get-base-directory()}" />
19 <include name="${project::get-base-directory()}/${build.dir}" />
20 </lib>
21 <include name="System.dll" />
22 <include name="System.Xml.dll" />
23 <include name="../bin/libsecondlife.dll" />
24 <include name="../bin/Axiom.MathLib.dll" />
25 <include name="../bin/Db4objects.Db4o.dll" />
26 <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
27 <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
28 <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
29 <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.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/RegionServer.cs b/OpenSim/RegionServer.cs
new file mode 100644
index 0000000..6fabe3f
--- /dev/null
+++ b/OpenSim/RegionServer.cs
@@ -0,0 +1,75 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.UserServer;
5
6namespace OpenSim
7{
8 public class RegionServer : OpenSimMain
9 {
10 [STAThread]
11 public static void Main(string[] args)
12 {
13 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
14 Console.WriteLine("Starting...\n");
15 OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0);
16
17 //OpenSimRoot.instance = new OpenSimRoot();
18 OpenSimMain sim = new OpenSimMain();
19 OpenSimRoot.Instance.Application = sim;
20
21 sim.sandbox = false;
22 sim.loginserver = false;
23 sim._physicsEngine = "basicphysics";
24
25 for (int i = 0; i < args.Length; i++)
26 {
27 if (args[i] == "-sandbox")
28 {
29 sim.sandbox = true;
30 OpenSimRoot.Instance.Sandbox = true;
31 }
32
33 if (args[i] == "-loginserver")
34 {
35 sim.loginserver = true;
36 }
37 if (args[i] == "-realphysx")
38 {
39 sim._physicsEngine = "RealPhysX";
40 OpenSim.world.Avatar.PhysicsEngineFlying = true;
41 }
42 }
43
44
45 OpenSimRoot.Instance.GridServers = new Grid();
46 if (sim.sandbox)
47 {
48 OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
49 OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
50 OpenSimRoot.Instance.GridServers.Initialise();
51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Sandbox mode");
52 }
53 else
54 {
55 OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
56 OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
57 OpenSimRoot.Instance.GridServers.Initialise();
58 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode");
59 }
60
61 if (sim.loginserver && sim.sandbox)
62 {
63 LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer);
64 loginServer.Startup();
65 }
66
67 OpenSimRoot.Instance.StartUp();
68
69 while (true)
70 {
71 OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
72 }
73 }
74 }
75}