diff options
author | lbsa71 | 2007-03-27 08:10:15 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-27 08:10:15 +0000 |
commit | a4fc6b5fbba7fd9a7b147b11a0d1c3ded1834d54 (patch) | |
tree | 560961306b9d80636d8ec976c05fcb8b54304f33 /OpenGridServices.ServerConsole | |
parent | Heightfield needs fixing, or i'll re-implement it (probably actually the coll... (diff) | |
download | opensim-SC_OLD-a4fc6b5fbba7fd9a7b147b11a0d1c3ded1834d54.zip opensim-SC_OLD-a4fc6b5fbba7fd9a7b147b11a0d1c3ded1834d54.tar.gz opensim-SC_OLD-a4fc6b5fbba7fd9a7b147b11a0d1c3ded1834d54.tar.bz2 opensim-SC_OLD-a4fc6b5fbba7fd9a7b147b11a0d1c3ded1834d54.tar.xz |
* Now there's one Console class, and instead the apps responds to cmd's and show's
* Removed Golden Future TCP/SimChat options
* Moved Ode.NET.dll to bin and changed prebuild accordingly (due to Prebuild limitations)
* Normalized some namespaces
* Added FxCop project
* Added (temp disabled) Servers project (for great justice)
Diffstat (limited to '')
-rw-r--r-- | OpenGridServices.ServerConsole/Properties/AssemblyInfo.cs | 33 | ||||
-rw-r--r-- | OpenGridServices.ServerConsole/ServerConsole.cs | 98 | ||||
-rw-r--r-- | OpenGridServices.ServerConsole/ServerConsole.csproj | 40 | ||||
-rw-r--r-- | OpenGridServices.ServerConsole/default.build | 48 | ||||
-rw-r--r-- | Servers/OpenSim.Servers.csproj (renamed from OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.csproj) | 60 | ||||
-rw-r--r-- | Servers/OpenSim.Servers.dll.build (renamed from OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build) | 86 |
6 files changed, 69 insertions, 296 deletions
diff --git a/OpenGridServices.ServerConsole/Properties/AssemblyInfo.cs b/OpenGridServices.ServerConsole/Properties/AssemblyInfo.cs deleted file mode 100644 index 0028e2a..0000000 --- a/OpenGridServices.ServerConsole/Properties/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("ServerConsole")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("")] | ||
12 | [assembly: AssemblyProduct("ServerConsole")] | ||
13 | [assembly: AssemblyCopyright("Copyright © 2007")] | ||
14 | [assembly: AssemblyTrademark("")] | ||
15 | [assembly: AssemblyCulture("")] | ||
16 | |||
17 | // Setting ComVisible to false makes the types in this assembly not visible | ||
18 | // to COM components. If you need to access a type in this assembly from | ||
19 | // COM, set the ComVisible attribute to true on that type. | ||
20 | [assembly: ComVisible(false)] | ||
21 | |||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
23 | [assembly: Guid("c4d85def-4c2e-449d-bf4a-449b8cf03736")] | ||
24 | |||
25 | // Version information for an assembly consists of the following four values: | ||
26 | // | ||
27 | // Major Version | ||
28 | // Minor Version | ||
29 | // Build Number | ||
30 | // Revision | ||
31 | // | ||
32 | [assembly: AssemblyVersion("1.0.0.0")] | ||
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
diff --git a/OpenGridServices.ServerConsole/ServerConsole.cs b/OpenGridServices.ServerConsole/ServerConsole.cs deleted file mode 100644 index d50a7e2..0000000 --- a/OpenGridServices.ServerConsole/ServerConsole.cs +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) OpenSim project, http://sim.opensecondlife.org/ | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions are met: | ||
6 | * * Redistributions of source code must retain the above copyright | ||
7 | * notice, this list of conditions and the following disclaimer. | ||
8 | * * Redistributions in binary form must reproduce the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer in the | ||
10 | * documentation and/or other materials provided with the distribution. | ||
11 | * * Neither the name of the <organization> nor the | ||
12 | * names of its contributors may be used to endorse or promote products | ||
13 | * derived from this software without specific prior written permission. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
16 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
18 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
19 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
22 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
24 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | * | ||
26 | */ | ||
27 | using System; | ||
28 | |||
29 | namespace ServerConsole | ||
30 | { | ||
31 | public class MainConsole { | ||
32 | |||
33 | private static ConsoleBase instance; | ||
34 | |||
35 | public static ConsoleBase Instance | ||
36 | { | ||
37 | get | ||
38 | { | ||
39 | return instance; | ||
40 | } | ||
41 | set | ||
42 | { | ||
43 | instance = value; | ||
44 | } | ||
45 | } | ||
46 | |||
47 | public MainConsole() | ||
48 | { | ||
49 | |||
50 | } | ||
51 | } | ||
52 | |||
53 | public abstract class conscmd_callback { | ||
54 | public abstract void RunCmd(string cmd, string[] cmdparams); | ||
55 | public abstract void Show(string ShowWhat); | ||
56 | } | ||
57 | |||
58 | public abstract class ConsoleBase | ||
59 | { | ||
60 | |||
61 | public enum ConsoleType { | ||
62 | Local, // Use stdio | ||
63 | TCP, // Use TCP/telnet | ||
64 | SimChat // Use in-world chat (for gods) | ||
65 | } | ||
66 | |||
67 | public abstract void Close(); | ||
68 | |||
69 | // You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here | ||
70 | public abstract void WriteLine(string Line) ; | ||
71 | |||
72 | public abstract string ReadLine(); | ||
73 | |||
74 | public abstract int Read() ; | ||
75 | |||
76 | public abstract void Write(string Line) ; | ||
77 | |||
78 | public abstract string PasswdPrompt(string prompt); | ||
79 | |||
80 | // Displays a command prompt and waits for the user to enter a string, then returns that string | ||
81 | public abstract string CmdPrompt(string prompt) ; | ||
82 | |||
83 | // Displays a command prompt and returns a default value if the user simply presses enter | ||
84 | public abstract string CmdPrompt(string prompt, string defaultresponse); | ||
85 | |||
86 | // Displays a command prompt and returns a default value, user may only enter 1 of 2 options | ||
87 | public abstract string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) ; | ||
88 | |||
89 | // Runs a command with a number of parameters | ||
90 | public abstract Object RunCmd(string Cmd, string[] cmdparams) ; | ||
91 | |||
92 | // Shows data about something | ||
93 | public abstract void ShowCommands(string ShowWhat) ; | ||
94 | |||
95 | // Displays a prompt to the user and then runs the command they entered | ||
96 | public abstract void MainConsolePrompt() ; | ||
97 | } | ||
98 | } | ||
diff --git a/OpenGridServices.ServerConsole/ServerConsole.csproj b/OpenGridServices.ServerConsole/ServerConsole.csproj deleted file mode 100644 index d23ca52..0000000 --- a/OpenGridServices.ServerConsole/ServerConsole.csproj +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ProductVersion>8.0.50727</ProductVersion> | ||
6 | <SchemaVersion>2.0</SchemaVersion> | ||
7 | <ProjectGuid>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</ProjectGuid> | ||
8 | <OutputType>Library</OutputType> | ||
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | ||
10 | <RootNamespace>ServerConsole</RootNamespace> | ||
11 | <AssemblyName>ServerConsole</AssemblyName> | ||
12 | </PropertyGroup> | ||
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
14 | <DebugSymbols>true</DebugSymbols> | ||
15 | <DebugType>full</DebugType> | ||
16 | <Optimize>false</Optimize> | ||
17 | <OutputPath>bin\Debug\</OutputPath> | ||
18 | <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
19 | <ErrorReport>prompt</ErrorReport> | ||
20 | <WarningLevel>4</WarningLevel> | ||
21 | </PropertyGroup> | ||
22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
23 | <DebugType>pdbonly</DebugType> | ||
24 | <Optimize>true</Optimize> | ||
25 | <OutputPath>..\common\bin\</OutputPath> | ||
26 | <DefineConstants>TRACE</DefineConstants> | ||
27 | <ErrorReport>prompt</ErrorReport> | ||
28 | <WarningLevel>4</WarningLevel> | ||
29 | </PropertyGroup> | ||
30 | <ItemGroup> | ||
31 | <Reference Include="System" /> | ||
32 | <Reference Include="System.Data" /> | ||
33 | <Reference Include="System.Xml" /> | ||
34 | </ItemGroup> | ||
35 | <ItemGroup> | ||
36 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
37 | <Compile Include="ServerConsole.cs" /> | ||
38 | </ItemGroup> | ||
39 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
40 | </Project> \ No newline at end of file | ||
diff --git a/OpenGridServices.ServerConsole/default.build b/OpenGridServices.ServerConsole/default.build deleted file mode 100644 index 64a4f04..0000000 --- a/OpenGridServices.ServerConsole/default.build +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <project name="ServerConsole" default="build" basedir="."> | ||
3 | <property name="debug" value="true" overwrite="false" /> | ||
4 | <target name="clean" description="remove all generated files"> | ||
5 | <delete file="../common/bin/ServerConsole.dll" failonerror="false" /> | ||
6 | <delete file="../common/bin/ServerConsole.dll.mdb" failonerror="false" /> | ||
7 | </target> | ||
8 | |||
9 | <target name="svnupdate" description="updates to latest SVN"> | ||
10 | <exec program="svn"> | ||
11 | <arg value="update" /> | ||
12 | </exec> | ||
13 | </target> | ||
14 | |||
15 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> | ||
16 | |||
17 | </target> | ||
18 | |||
19 | <target name="build" description="compiles the source code"> | ||
20 | |||
21 | <loadfile file="../VERSION" property="svnver"/> | ||
22 | <asminfo output="AssemblyInfo.cs" language="CSharp"> | ||
23 | <imports> | ||
24 | <import namespace="System" /> | ||
25 | <import namespace="System.Reflection" /> | ||
26 | <import namespace="System.Runtime.InteropServices" /> | ||
27 | </imports> | ||
28 | <attributes> | ||
29 | <attribute type="ComVisibleAttribute" value="false" /> | ||
30 | <attribute type="CLSCompliantAttribute" value="false" /> | ||
31 | <attribute type="AssemblyVersionAttribute" value="${svnver}" /> | ||
32 | <attribute type="AssemblyTitleAttribute" value="ogs-serverconsole" /> | ||
33 | <attribute type="AssemblyDescriptionAttribute" value="The default server console" /> | ||
34 | <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> | ||
35 | </attributes> | ||
36 | </asminfo> | ||
37 | |||
38 | <csc target="library" output="../common/bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4"> | ||
39 | <references> | ||
40 | <include name="System" /> | ||
41 | <include name="System.Xml" /> | ||
42 | </references> | ||
43 | <sources> | ||
44 | <include name="*.cs" /> | ||
45 | </sources> | ||
46 | </csc> | ||
47 | </target> | ||
48 | </project> | ||
diff --git a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.csproj b/Servers/OpenSim.Servers.csproj index 0cabeb0..9c66943 100644 --- a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.csproj +++ b/Servers/OpenSim.Servers.csproj | |||
@@ -1,26 +1,23 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{7DC4E7C8-89A4-4A8D-9617-3DF262990663}</ProjectGuid> | 6 | <ProjectGuid>{A8E12EC9-CB2F-4D25-AFD0-626BF2162F5D}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenGridServices.ServerConsole</AssemblyName> | 12 | <AssemblyName>OpenSim.Servers</AssemblyName> |
14 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
15 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | 19 | <RootNamespace>OpenSim.Servers</RootNamespace> |
21 | <RootNamespace>OpenGridServices.ServerConsole</RootNamespace> | 20 | <StartupObject></StartupObject> |
22 | <StartupObject> | ||
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,39 +55,37 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Data"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Data.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="System.Xml"> | 69 | <Reference Include="OpenSim.Framework.dll" > |
77 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>..\bin\OpenSim.Framework.dll</HintPath> |
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="OpenSim.Framework.Console.dll" > | ||
74 | <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="libsecondlife.dll" > | ||
78 | <HintPath>..\bin\libsecondlife.dll</HintPath> | ||
78 | <Private>False</Private> | 79 | <Private>False</Private> |
79 | </Reference> | 80 | </Reference> |
80 | </ItemGroup> | 81 | </ItemGroup> |
81 | <ItemGroup> | 82 | <ItemGroup> |
82 | </ItemGroup> | 83 | </ItemGroup> |
83 | <ItemGroup> | 84 | <ItemGroup> |
84 | <Compile Include="ServerConsole.cs"> | 85 | <Compile Include="CapsHttpServer.cs"> |
85 | <SubType>Code</SubType> | ||
86 | </Compile> | ||
87 | <Compile Include="Properties\AssemblyInfo.cs"> | ||
88 | <SubType>Code</SubType> | 86 | <SubType>Code</SubType> |
89 | </Compile> | 87 | </Compile> |
90 | </ItemGroup> | 88 | </ItemGroup> |
91 | <ItemGroup> | ||
92 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
93 | <Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> | ||
94 | <Name>OpenSim.Framework</Name> | ||
95 | </ProjectReference> | ||
96 | </ItemGroup> | ||
97 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 89 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
98 | <PropertyGroup> | 90 | <PropertyGroup> |
99 | <PreBuildEvent> | 91 | <PreBuildEvent> |
@@ -101,4 +93,4 @@ | |||
101 | <PostBuildEvent> | 93 | <PostBuildEvent> |
102 | </PostBuildEvent> | 94 | </PostBuildEvent> |
103 | </PropertyGroup> | 95 | </PropertyGroup> |
104 | </Project> \ No newline at end of file | 96 | </Project> |
diff --git a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build b/Servers/OpenSim.Servers.dll.build index 2e6ec3e..1321629 100644 --- a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build +++ b/Servers/OpenSim.Servers.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.ServerConsole" default="build"> | 2 | <project name="OpenSim.Servers" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGridServices.ServerConsole" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Servers" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ServerConsole.cs" /> | 14 | <include name="CapsHttpServer.cs" /> |
15 | <include name="Properties/AssemblyInfo.cs" /> | 15 | </sources> |
16 | </sources> | 16 | <references basedir="${project::get-base-directory()}"> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <lib> |
18 | <lib> | 18 | <include name="${project::get-base-directory()}" /> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}/${build.dir}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | </lib> |
21 | </lib> | 21 | <include name="System.dll" /> |
22 | <include name="System.dll" /> | 22 | <include name="System.Xml.dll" /> |
23 | <include name="System.Data.dll" /> | 23 | <include name="../bin/OpenSim.Framework.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
25 | <include name="../bin/OpenSim.Framework.dll" /> | 25 | <include name="../bin/libsecondlife.dll" /> |
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
30 | <copy todir="${project::get-base-directory()}/../bin/"> | 30 | <copy todir="${project::get-base-directory()}/../bin/"> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
32 | <include name="*.dll"/> | 32 | <include name="*.dll"/> |
33 | <include name="*.exe"/> | 33 | <include name="*.exe"/> |
34 | </fileset> | 34 | </fileset> |
35 | </copy> | 35 | </copy> |
36 | </target> | 36 | </target> |
37 | <target name="clean"> | 37 | <target name="clean"> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <delete dir="${bin.dir}" failonerror="false" /> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${obj.dir}" failonerror="false" /> |
40 | </target> | 40 | </target> |
41 | <target name="doc" description="Creates documentation."> | 41 | <target name="doc" description="Creates documentation."> |
42 | </target> | 42 | </target> |
43 | </project> | 43 | </project> |