diff options
author | gareth | 2007-03-24 18:10:05 +0000 |
---|---|---|
committer | gareth | 2007-03-24 18:10:05 +0000 |
commit | d1fbe870afc5b89c7b1f8bf33d27e431f886ec07 (patch) | |
tree | 5c0dc4125f90ce2f8de79d84e25ce39524cba7d6 | |
parent | Uncommented line (diff) | |
download | opensim-SC_OLD-d1fbe870afc5b89c7b1f8bf33d27e431f886ec07.zip opensim-SC_OLD-d1fbe870afc5b89c7b1f8bf33d27e431f886ec07.tar.gz opensim-SC_OLD-d1fbe870afc5b89c7b1f8bf33d27e431f886ec07.tar.bz2 opensim-SC_OLD-d1fbe870afc5b89c7b1f8bf33d27e431f886ec07.tar.xz |
Brought in the OGS user server into the main trunk (in a rather messy way)
Diffstat (limited to '')
27 files changed, 1714 insertions, 778 deletions
diff --git a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build b/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build new file mode 100644 index 0000000..2e6ec3e --- /dev/null +++ b/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build | |||
@@ -0,0 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenGridServices.ServerConsole" 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="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenGridServices.ServerConsole" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="ServerConsole.cs" /> | ||
15 | <include name="Properties/AssemblyInfo.cs" /> | ||
16 | </sources> | ||
17 | <references basedir="${project::get-base-directory()}"> | ||
18 | <lib> | ||
19 | <include name="${project::get-base-directory()}" /> | ||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
21 | </lib> | ||
22 | <include name="System.dll" /> | ||
23 | <include name="System.Data.dll" /> | ||
24 | <include name="System.Xml.dll" /> | ||
25 | <include name="../bin/OpenSim.Framework.dll" /> | ||
26 | </references> | ||
27 | </csc> | ||
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/"/> | ||
30 | <copy todir="${project::get-base-directory()}/../bin/"> | ||
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
32 | <include name="*.dll"/> | ||
33 | <include name="*.exe"/> | ||
34 | </fileset> | ||
35 | </copy> | ||
36 | </target> | ||
37 | <target name="clean"> | ||
38 | <delete dir="${bin.dir}" failonerror="false" /> | ||
39 | <delete dir="${obj.dir}" failonerror="false" /> | ||
40 | </target> | ||
41 | <target name="doc" description="Creates documentation."> | ||
42 | </target> | ||
43 | </project> | ||
diff --git a/OpenGridServices.ServerConsole/Properties/AssemblyInfo.cs b/OpenGridServices.ServerConsole/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..0028e2a --- /dev/null +++ b/OpenGridServices.ServerConsole/Properties/AssemblyInfo.cs | |||
@@ -0,0 +1,33 @@ | |||
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 new file mode 100644 index 0000000..d50a7e2 --- /dev/null +++ b/OpenGridServices.ServerConsole/ServerConsole.cs | |||
@@ -0,0 +1,98 @@ | |||
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 new file mode 100644 index 0000000..d23ca52 --- /dev/null +++ b/OpenGridServices.ServerConsole/ServerConsole.csproj | |||
@@ -0,0 +1,40 @@ | |||
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 new file mode 100644 index 0000000..64a4f04 --- /dev/null +++ b/OpenGridServices.ServerConsole/default.build | |||
@@ -0,0 +1,48 @@ | |||
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.UserServer/ConsoleCmds.cs b/OpenGridServices.UserServer/ConsoleCmds.cs new file mode 100644 index 0000000..f2568fc --- /dev/null +++ b/OpenGridServices.UserServer/ConsoleCmds.cs | |||
@@ -0,0 +1,57 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using ServerConsole; | ||
33 | |||
34 | namespace OpenGridServices | ||
35 | { | ||
36 | |||
37 | public class UserConsole : conscmd_callback { | ||
38 | public UserConsole() { } | ||
39 | |||
40 | public override void RunCmd(string cmd, string[] cmdparams) { | ||
41 | switch(cmd) { | ||
42 | case "help": | ||
43 | ServerConsole.MainConsole.Instance.WriteLine("shutdown - shutdown the user server (USE CAUTION!)" | ||
44 | ); | ||
45 | break; | ||
46 | |||
47 | case "shutdown": | ||
48 | ServerConsole.MainConsole.Instance.Close(); | ||
49 | Environment.Exit(0); | ||
50 | break; | ||
51 | } | ||
52 | } | ||
53 | |||
54 | public override void Show(string ShowWhat) { | ||
55 | } | ||
56 | } | ||
57 | } | ||
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs new file mode 100644 index 0000000..d27f34e --- /dev/null +++ b/OpenGridServices.UserServer/Main.cs | |||
@@ -0,0 +1,259 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Collections; | ||
32 | using System.Collections.Generic; | ||
33 | using System.IO; | ||
34 | using System.Text; | ||
35 | using libsecondlife; | ||
36 | using ServerConsole; | ||
37 | using OpenSim.Framework.User; | ||
38 | using OpenSim.Framework.Sims; | ||
39 | using OpenSim.Framework.Inventory; | ||
40 | |||
41 | namespace OpenGridServices | ||
42 | { | ||
43 | /// <summary> | ||
44 | /// </summary> | ||
45 | public class OpenUser_Main | ||
46 | { | ||
47 | |||
48 | public static OpenUser_Main userserver; | ||
49 | |||
50 | public UserHTTPServer _httpd; | ||
51 | public UserProfileManager _profilemanager; | ||
52 | public UserProfile GridGod; | ||
53 | public string DefaultStartupMsg; | ||
54 | public string GridURL; | ||
55 | public string GridSendKey; | ||
56 | public string GridRecvKey; | ||
57 | |||
58 | public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); | ||
59 | |||
60 | [STAThread] | ||
61 | public static void Main( string[] args ) | ||
62 | { | ||
63 | Console.WriteLine("Starting...\n"); | ||
64 | ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenUser", new UserConsole()); | ||
65 | |||
66 | userserver = new OpenUser_Main(); | ||
67 | userserver.Startup(); | ||
68 | |||
69 | ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n"); | ||
70 | |||
71 | while(true) { | ||
72 | ServerConsole.MainConsole.Instance.MainConsolePrompt(); | ||
73 | } | ||
74 | } | ||
75 | |||
76 | public void Startup() { | ||
77 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings"); | ||
78 | |||
79 | this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: "); | ||
80 | this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: "); | ||
81 | this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: "); | ||
82 | |||
83 | this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!"); | ||
84 | |||
85 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager"); | ||
86 | _profilemanager = new UserProfileManager(); | ||
87 | _profilemanager.InitUserProfiles(); | ||
88 | _profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg); | ||
89 | |||
90 | |||
91 | string tempfirstname; | ||
92 | string templastname; | ||
93 | string tempMD5Passwd; | ||
94 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please configure the grid god user:"); | ||
95 | tempfirstname=ServerConsole.MainConsole.Instance.CmdPrompt("First name: "); | ||
96 | templastname=ServerConsole.MainConsole.Instance.CmdPrompt("Last name: "); | ||
97 | tempMD5Passwd=ServerConsole.MainConsole.Instance.PasswdPrompt("Password: "); | ||
98 | |||
99 | System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider(); | ||
100 | byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd); | ||
101 | bs = x.ComputeHash(bs); | ||
102 | System.Text.StringBuilder s = new System.Text.StringBuilder(); | ||
103 | foreach (byte b in bs) | ||
104 | { | ||
105 | s.Append(b.ToString("x2").ToLower()); | ||
106 | } | ||
107 | tempMD5Passwd = "$1$" + s.ToString(); | ||
108 | |||
109 | GridGod=_profilemanager.CreateNewProfile(tempfirstname,templastname,tempMD5Passwd); | ||
110 | _profilemanager.SetGod(GridGod.UUID); | ||
111 | GridGod.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f); | ||
112 | GridGod.homepos = new LLVector3(128f,128f,23f); | ||
113 | |||
114 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process"); | ||
115 | _httpd = new UserHTTPServer(); | ||
116 | } | ||
117 | } | ||
118 | |||
119 | public class MServerConsole : ConsoleBase | ||
120 | { | ||
121 | |||
122 | private ConsoleType ConsType; | ||
123 | StreamWriter Log; | ||
124 | public conscmd_callback cmdparser; | ||
125 | public string componentname; | ||
126 | |||
127 | // STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! | ||
128 | // constype - the type of console to use (see enum ConsoleType) | ||
129 | // sparam - depending on the console type: | ||
130 | // TCP - the IP to bind to (127.0.0.1 if blank) | ||
131 | // Local - param ignored | ||
132 | // and for the iparam: | ||
133 | // TCP - the port to bind to | ||
134 | // Local - param ignored | ||
135 | // LogFile - duh | ||
136 | // componentname - which component of the OGS system? (user, asset etc) | ||
137 | // cmdparser - a reference to a conscmd_callback object | ||
138 | |||
139 | public MServerConsole(ConsoleType constype, string sparam, int iparam, string LogFile, string componentname, conscmd_callback cmdparser) { | ||
140 | ConsType = constype; | ||
141 | this.componentname = componentname; | ||
142 | this.cmdparser = cmdparser; | ||
143 | switch(constype) { | ||
144 | case ConsoleType.Local: | ||
145 | Console.WriteLine("ServerConsole.cs - creating new local console"); | ||
146 | Console.WriteLine("Logs will be saved to current directory in " + LogFile); | ||
147 | Log=File.AppendText(LogFile); | ||
148 | Log.WriteLine("========================================================================"); | ||
149 | Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString()); | ||
150 | break; | ||
151 | |||
152 | case ConsoleType.TCP: | ||
153 | break; | ||
154 | |||
155 | default: | ||
156 | Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!"); | ||
157 | break; | ||
158 | } | ||
159 | } | ||
160 | |||
161 | public override void Close() { | ||
162 | Log.WriteLine("Shutdown at " + DateTime.Now.ToString()); | ||
163 | Log.Close(); | ||
164 | } | ||
165 | |||
166 | // 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 | ||
167 | public override void WriteLine(string Line) { | ||
168 | Log.WriteLine(Line); | ||
169 | Console.WriteLine(Line); | ||
170 | return; | ||
171 | } | ||
172 | |||
173 | public override string ReadLine() { | ||
174 | string TempStr=Console.ReadLine(); | ||
175 | Log.WriteLine(TempStr); | ||
176 | return TempStr; | ||
177 | } | ||
178 | |||
179 | public override int Read() { | ||
180 | int TempInt= Console.Read(); | ||
181 | Log.Write((char)TempInt); | ||
182 | return TempInt; | ||
183 | } | ||
184 | |||
185 | public override void Write(string Line) { | ||
186 | Console.Write(Line); | ||
187 | Log.Write(Line); | ||
188 | return; | ||
189 | } | ||
190 | |||
191 | |||
192 | // Displays a prompt and waits for the user to enter a string, then returns that string | ||
193 | // Done with no echo and suitable for passwords | ||
194 | public override string PasswdPrompt(string prompt) { | ||
195 | // FIXME: Needs to be better abstracted | ||
196 | Log.WriteLine(prompt); | ||
197 | this.Write(prompt); | ||
198 | ConsoleColor oldfg=Console.ForegroundColor; | ||
199 | Console.ForegroundColor=Console.BackgroundColor; | ||
200 | string temp=Console.ReadLine(); | ||
201 | Console.ForegroundColor=oldfg; | ||
202 | return temp; | ||
203 | } | ||
204 | |||
205 | // Displays a command prompt and waits for the user to enter a string, then returns that string | ||
206 | public override string CmdPrompt(string prompt) { | ||
207 | this.Write(prompt); | ||
208 | return this.ReadLine(); | ||
209 | } | ||
210 | |||
211 | // Displays a command prompt and returns a default value if the user simply presses enter | ||
212 | public override string CmdPrompt(string prompt, string defaultresponse) { | ||
213 | string temp=CmdPrompt(prompt); | ||
214 | if(temp=="") { | ||
215 | return defaultresponse; | ||
216 | } else { | ||
217 | return temp; | ||
218 | } | ||
219 | } | ||
220 | |||
221 | // Displays a command prompt and returns a default value, user may only enter 1 of 2 options | ||
222 | public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) { | ||
223 | bool itisdone=false; | ||
224 | string temp=CmdPrompt(prompt,defaultresponse); | ||
225 | while(itisdone==false) { | ||
226 | if((temp==OptionA) || (temp==OptionB)) { | ||
227 | itisdone=true; | ||
228 | } else { | ||
229 | this.WriteLine("Valid options are " + OptionA + " or " + OptionB); | ||
230 | temp=CmdPrompt(prompt,defaultresponse); | ||
231 | } | ||
232 | } | ||
233 | return temp; | ||
234 | } | ||
235 | |||
236 | // Runs a command with a number of parameters | ||
237 | public override Object RunCmd(string Cmd, string[] cmdparams) { | ||
238 | cmdparser.RunCmd(Cmd, cmdparams); | ||
239 | return null; | ||
240 | } | ||
241 | |||
242 | // Shows data about something | ||
243 | public override void ShowCommands(string ShowWhat) { | ||
244 | cmdparser.Show(ShowWhat); | ||
245 | } | ||
246 | |||
247 | public override void MainConsolePrompt() { | ||
248 | string[] tempstrarray; | ||
249 | string tempstr = this.CmdPrompt(this.componentname + "# "); | ||
250 | tempstrarray = tempstr.Split(' '); | ||
251 | string cmd=tempstrarray[0]; | ||
252 | Array.Reverse(tempstrarray); | ||
253 | Array.Resize<string>(ref tempstrarray,tempstrarray.Length-1); | ||
254 | Array.Reverse(tempstrarray); | ||
255 | string[] cmdparams=(string[])tempstrarray; | ||
256 | RunCmd(cmd,cmdparams); | ||
257 | } | ||
258 | } | ||
259 | } | ||
diff --git a/OpenGridServices.UserServer/OGS-UserServer.csproj b/OpenGridServices.UserServer/OGS-UserServer.csproj new file mode 100644 index 0000000..f4fa8b6 --- /dev/null +++ b/OpenGridServices.UserServer/OGS-UserServer.csproj | |||
@@ -0,0 +1,63 @@ | |||
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>{D45B6E48-5668-478D-B9CB-6D46E665FACF}</ProjectGuid> | ||
8 | <OutputType>Exe</OutputType> | ||
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | ||
10 | <RootNamespace>OGS_UserServer</RootNamespace> | ||
11 | <AssemblyName>OGS-UserServer</AssemblyName> | ||
12 | <StartupObject>OpenGridServices.OpenUser_Main</StartupObject> | ||
13 | </PropertyGroup> | ||
14 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
15 | <DebugSymbols>true</DebugSymbols> | ||
16 | <DebugType>full</DebugType> | ||
17 | <Optimize>false</Optimize> | ||
18 | <OutputPath>bin\Debug\</OutputPath> | ||
19 | <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
20 | <ErrorReport>prompt</ErrorReport> | ||
21 | <WarningLevel>4</WarningLevel> | ||
22 | </PropertyGroup> | ||
23 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
24 | <DebugType>pdbonly</DebugType> | ||
25 | <Optimize>true</Optimize> | ||
26 | <OutputPath>bin\Release\</OutputPath> | ||
27 | <DefineConstants>TRACE</DefineConstants> | ||
28 | <ErrorReport>prompt</ErrorReport> | ||
29 | <WarningLevel>4</WarningLevel> | ||
30 | </PropertyGroup> | ||
31 | <ItemGroup> | ||
32 | <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
33 | <SpecificVersion>False</SpecificVersion> | ||
34 | <HintPath>..\..\common\bin\libsecondlife.dll</HintPath> | ||
35 | </Reference> | ||
36 | <Reference Include="System" /> | ||
37 | <Reference Include="System.Data" /> | ||
38 | <Reference Include="System.Xml" /> | ||
39 | </ItemGroup> | ||
40 | <ItemGroup> | ||
41 | <Compile Include="..\..\common\src\OGS-Console.cs"> | ||
42 | <Link>OGS-Console.cs</Link> | ||
43 | </Compile> | ||
44 | <Compile Include="..\..\common\VersionInfo\VersionInfo.cs"> | ||
45 | <Link>VersionInfo.cs</Link> | ||
46 | </Compile> | ||
47 | <Compile Include="ConsoleCmds.cs" /> | ||
48 | <Compile Include="Main.cs" /> | ||
49 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
50 | <Compile Include="UserHttp.cs" /> | ||
51 | </ItemGroup> | ||
52 | <ItemGroup> | ||
53 | <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj"> | ||
54 | <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project> | ||
55 | <Name>OpenSim.Framework</Name> | ||
56 | </ProjectReference> | ||
57 | <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj"> | ||
58 | <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project> | ||
59 | <Name>ServerConsole</Name> | ||
60 | </ProjectReference> | ||
61 | </ItemGroup> | ||
62 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
63 | </Project> \ No newline at end of file | ||
diff --git a/OpenGridServices.UserServer/OGS-UserServer.csproj.user b/OpenGridServices.UserServer/OGS-UserServer.csproj.user new file mode 100644 index 0000000..aa75a3d --- /dev/null +++ b/OpenGridServices.UserServer/OGS-UserServer.csproj.user | |||
@@ -0,0 +1,8 @@ | |||
1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <PublishUrlHistory>publish\</PublishUrlHistory> | ||
4 | <ApplicationRevision>0</ApplicationRevision> | ||
5 | <FallbackCulture>en-US</FallbackCulture> | ||
6 | <VerifyUploadedFiles>false</VerifyUploadedFiles> | ||
7 | </PropertyGroup> | ||
8 | </Project> \ No newline at end of file | ||
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build new file mode 100644 index 0000000..710b01b --- /dev/null +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build | |||
@@ -0,0 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenGridServices.UserServer" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="ConsoleCmds.cs" /> | ||
15 | <include name="Main.cs" /> | ||
16 | <include name="UserHttp.cs" /> | ||
17 | <include name="Properties/AssemblyInfo.cs" /> | ||
18 | </sources> | ||
19 | <references basedir="${project::get-base-directory()}"> | ||
20 | <lib> | ||
21 | <include name="${project::get-base-directory()}" /> | ||
22 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
23 | </lib> | ||
24 | <include name="System.dll" /> | ||
25 | <include name="System.Data.dll" /> | ||
26 | <include name="System.Xml.dll" /> | ||
27 | <include name="../bin/OpenSim.Framework.dll" /> | ||
28 | <include name="../bin/OpenSim.Framework.Console.dll" /> | ||
29 | <include name="../bin/OpenGridServices.ServerConsole.dll" /> | ||
30 | <include name="../bin/libsecondlife.dll" /> | ||
31 | </references> | ||
32 | </csc> | ||
33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | ||
34 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | ||
35 | <copy todir="${project::get-base-directory()}/../bin/"> | ||
36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
37 | <include name="*.dll"/> | ||
38 | <include name="*.exe"/> | ||
39 | </fileset> | ||
40 | </copy> | ||
41 | </target> | ||
42 | <target name="clean"> | ||
43 | <delete dir="${bin.dir}" failonerror="false" /> | ||
44 | <delete dir="${obj.dir}" failonerror="false" /> | ||
45 | </target> | ||
46 | <target name="doc" description="Creates documentation."> | ||
47 | </target> | ||
48 | </project> | ||
diff --git a/OpenGridServices.UserServer/Properties/AssemblyInfo.cs b/OpenGridServices.UserServer/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..5d5ce8d --- /dev/null +++ b/OpenGridServices.UserServer/Properties/AssemblyInfo.cs | |||
@@ -0,0 +1,33 @@ | |||
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("OGS-UserServer")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("")] | ||
12 | [assembly: AssemblyProduct("OGS-UserServer")] | ||
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("e266513a-090b-4d38-80f6-8599eef68c8c")] | ||
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.UserServer/UserHttp.cs b/OpenGridServices.UserServer/UserHttp.cs new file mode 100644 index 0000000..ce3cfcd --- /dev/null +++ b/OpenGridServices.UserServer/UserHttp.cs | |||
@@ -0,0 +1,146 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenGrid project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using Nwc.XmlRpc; | ||
33 | using System.Threading; | ||
34 | using System.Text.RegularExpressions; | ||
35 | using System.Net; | ||
36 | using System.IO; | ||
37 | using System.Collections; | ||
38 | using System.Collections.Generic; | ||
39 | using libsecondlife; | ||
40 | using ServerConsole; | ||
41 | using OpenSim.Framework.User; | ||
42 | using OpenSim.Framework.Sims; | ||
43 | using OpenSim.Framework.Inventory; | ||
44 | |||
45 | namespace OpenGridServices | ||
46 | { | ||
47 | public class UserHTTPServer { | ||
48 | public Thread HTTPD; | ||
49 | public HttpListener Listener; | ||
50 | |||
51 | public UserHTTPServer() { | ||
52 | ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server"); | ||
53 | HTTPD = new Thread(new ThreadStart(StartHTTP)); | ||
54 | HTTPD.Start(); | ||
55 | } | ||
56 | |||
57 | public void StartHTTP() { | ||
58 | ServerConsole.MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK"); | ||
59 | Listener = new HttpListener(); | ||
60 | |||
61 | Listener.Prefixes.Add("http://+:8002/userserver/"); | ||
62 | Listener.Prefixes.Add("http://+:8002/usersessions/"); | ||
63 | Listener.Start(); | ||
64 | |||
65 | HttpListenerContext context; | ||
66 | while(true) { | ||
67 | context = Listener.GetContext(); | ||
68 | ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); | ||
69 | } | ||
70 | } | ||
71 | |||
72 | static string ParseXMLRPC(string requestBody) { | ||
73 | return OpenGridServices.OpenUser_Main.userserver._profilemanager.ParseXMLRPC(requestBody); | ||
74 | } | ||
75 | |||
76 | static string ParseREST(HttpListenerRequest www_req) { | ||
77 | Console.WriteLine("INCOMING REST - " + www_req.RawUrl); | ||
78 | |||
79 | char[] splitter = {'/'}; | ||
80 | string[] rest_params = www_req.RawUrl.Split(splitter); | ||
81 | string req_type = rest_params[1]; // First part of the URL is the type of request - usersessions/userprofiles/inventory/blabla | ||
82 | switch(req_type) { | ||
83 | case "usersessions": | ||
84 | LLUUID sessionid = new LLUUID(rest_params[2]); // get usersessions/sessionid | ||
85 | if(www_req.HttpMethod=="DELETE") { | ||
86 | foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys) { | ||
87 | if(OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID==sessionid) { | ||
88 | OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID=null; | ||
89 | OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID=null; | ||
90 | OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear(); | ||
91 | } | ||
92 | } | ||
93 | |||
94 | } | ||
95 | return "OK"; | ||
96 | break; | ||
97 | } | ||
98 | |||
99 | return ""; | ||
100 | } | ||
101 | |||
102 | |||
103 | static void HandleRequest(Object stateinfo) { | ||
104 | HttpListenerContext context=(HttpListenerContext)stateinfo; | ||
105 | |||
106 | HttpListenerRequest request = context.Request; | ||
107 | HttpListenerResponse response = context.Response; | ||
108 | |||
109 | response.KeepAlive=false; | ||
110 | response.SendChunked=false; | ||
111 | |||
112 | System.IO.Stream body = request.InputStream; | ||
113 | System.Text.Encoding encoding = System.Text.Encoding.UTF8; | ||
114 | System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); | ||
115 | |||
116 | string requestBody = reader.ReadToEnd(); | ||
117 | body.Close(); | ||
118 | reader.Close(); | ||
119 | |||
120 | string responseString=""; | ||
121 | switch(request.ContentType) { | ||
122 | case "text/xml": | ||
123 | // must be XML-RPC, so pass to the XML-RPC parser | ||
124 | |||
125 | responseString=ParseXMLRPC(requestBody); | ||
126 | response.AddHeader("Content-type","text/xml"); | ||
127 | break; | ||
128 | |||
129 | case "text/plaintext": | ||
130 | responseString=ParseREST(request); | ||
131 | response.AddHeader("Content-type","text/plaintext"); | ||
132 | break; | ||
133 | } | ||
134 | |||
135 | |||
136 | byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); | ||
137 | System.IO.Stream output = response.OutputStream; | ||
138 | response.SendChunked=false; | ||
139 | response.ContentLength64=buffer.Length; | ||
140 | output.Write(buffer,0,buffer.Length); | ||
141 | output.Close(); | ||
142 | } | ||
143 | } | ||
144 | |||
145 | |||
146 | } | ||
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build index 3dfa7ce..703abe6 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Config.SimConfigDb4o" default="build"> | 2 | <project name="OpenSim.Config.SimConfigDb4o" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="DbSimConfig.cs" /> | 15 | <include name="DbSimConfig.cs" /> |
16 | <include name="MapStorage.cs" /> | 16 | <include name="MapStorage.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll.dll" /> | 24 | <include name="System.Data.dll.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../bin/Db4objects.Db4o.dll" /> | 27 | <include name="../../bin/Db4objects.Db4o.dll" /> |
28 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 28 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
29 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 29 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 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/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
38 | </fileset> | 38 | </fileset> |
39 | </copy> | 39 | </copy> |
40 | </target> | 40 | </target> |
41 | <target name="clean"> | 41 | <target name="clean"> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <delete dir="${bin.dir}" failonerror="false" /> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${obj.dir}" failonerror="false" /> |
44 | </target> | 44 | </target> |
45 | <target name="doc" description="Creates documentation."> | 45 | <target name="doc" description="Creates documentation."> |
46 | </target> | 46 | </target> |
47 | </project> | 47 | </project> |
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build index 9ceaea6..2dfc9b0 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build | |||
@@ -1,41 +1,41 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework.Console" default="build"> | 2 | <project name="OpenSim.Framework.Console" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="ConsoleBase.cs" /> | 15 | <include name="ConsoleBase.cs" /> |
16 | <include name="MainConsole.cs" /> | 16 | <include name="MainConsole.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | </references> | 24 | </references> |
25 | </csc> | 25 | </csc> |
26 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 26 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
27 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 27 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
28 | <copy todir="${project::get-base-directory()}/../bin/"> | 28 | <copy todir="${project::get-base-directory()}/../bin/"> |
29 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 29 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
30 | <include name="*.dll"/> | 30 | <include name="*.dll"/> |
31 | <include name="*.exe"/> | 31 | <include name="*.exe"/> |
32 | </fileset> | 32 | </fileset> |
33 | </copy> | 33 | </copy> |
34 | </target> | 34 | </target> |
35 | <target name="clean"> | 35 | <target name="clean"> |
36 | <delete dir="${bin.dir}" failonerror="false" /> | 36 | <delete dir="${bin.dir}" failonerror="false" /> |
37 | <delete dir="${obj.dir}" failonerror="false" /> | 37 | <delete dir="${obj.dir}" failonerror="false" /> |
38 | </target> | 38 | </target> |
39 | <target name="doc" description="Creates documentation."> | 39 | <target name="doc" description="Creates documentation."> |
40 | </target> | 40 | </target> |
41 | </project> | 41 | </project> |
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index 4963892..3d29b2b 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -1,63 +1,63 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework" default="build"> | 2 | <project name="OpenSim.Framework" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentCiruitData.cs" /> | 14 | <include name="AgentCiruitData.cs" /> |
15 | <include name="AssetBase.cs" /> | 15 | <include name="AssetBase.cs" /> |
16 | <include name="BlockingQueue.cs" /> | 16 | <include name="BlockingQueue.cs" /> |
17 | <include name="HeightMapGenHills.cs" /> | 17 | <include name="HeightMapGenHills.cs" /> |
18 | <include name="IAssetServer.cs" /> | 18 | <include name="IAssetServer.cs" /> |
19 | <include name="IConfig.cs" /> | 19 | <include name="IConfig.cs" /> |
20 | <include name="IGridServer.cs" /> | 20 | <include name="IGridServer.cs" /> |
21 | <include name="ILocalStorage.cs" /> | 21 | <include name="ILocalStorage.cs" /> |
22 | <include name="Inventory.cs" /> | 22 | <include name="IUserServer.cs" /> |
23 | <include name="IUserServer.cs" /> | 23 | <include name="Inventory.cs" /> |
24 | <include name="LocalGridBase.cs" /> | 24 | <include name="LocalGridBase.cs" /> |
25 | <include name="Login.cs" /> | 25 | <include name="Login.cs" /> |
26 | <include name="LoginService.cs" /> | 26 | <include name="LoginService.cs" /> |
27 | <include name="NeighbourInfo.cs" /> | 27 | <include name="NeighbourInfo.cs" /> |
28 | <include name="PrimData.cs" /> | 28 | <include name="PrimData.cs" /> |
29 | <include name="RemoteGridBase.cs" /> | 29 | <include name="RemoteGridBase.cs" /> |
30 | <include name="SimProfile.cs" /> | 30 | <include name="SimProfile.cs" /> |
31 | <include name="SimProfileBase.cs" /> | 31 | <include name="SimProfileBase.cs" /> |
32 | <include name="UserProfile.cs" /> | 32 | <include name="UserProfile.cs" /> |
33 | <include name="UserProfileManager.cs" /> | 33 | <include name="UserProfileManager.cs" /> |
34 | <include name="UserProfileManagerBase.cs" /> | 34 | <include name="UserProfileManagerBase.cs" /> |
35 | <include name="Util.cs" /> | 35 | <include name="Util.cs" /> |
36 | <include name="Properties/AssemblyInfo.cs" /> | 36 | <include name="Properties/AssemblyInfo.cs" /> |
37 | </sources> | 37 | </sources> |
38 | <references basedir="${project::get-base-directory()}"> | 38 | <references basedir="${project::get-base-directory()}"> |
39 | <lib> | 39 | <lib> |
40 | <include name="${project::get-base-directory()}" /> | 40 | <include name="${project::get-base-directory()}" /> |
41 | <include name="${project::get-base-directory()}/${build.dir}" /> | 41 | <include name="${project::get-base-directory()}/${build.dir}" /> |
42 | </lib> | 42 | </lib> |
43 | <include name="System.dll" /> | 43 | <include name="System.dll" /> |
44 | <include name="System.Xml.dll" /> | 44 | <include name="System.Xml.dll" /> |
45 | <include name="../bin/libsecondlife.dll" /> | 45 | <include name="../bin/libsecondlife.dll" /> |
46 | </references> | 46 | </references> |
47 | </csc> | 47 | </csc> |
48 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 48 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
49 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 49 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
50 | <copy todir="${project::get-base-directory()}/../bin/"> | 50 | <copy todir="${project::get-base-directory()}/../bin/"> |
51 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 51 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
52 | <include name="*.dll"/> | 52 | <include name="*.dll"/> |
53 | <include name="*.exe"/> | 53 | <include name="*.exe"/> |
54 | </fileset> | 54 | </fileset> |
55 | </copy> | 55 | </copy> |
56 | </target> | 56 | </target> |
57 | <target name="clean"> | 57 | <target name="clean"> |
58 | <delete dir="${bin.dir}" failonerror="false" /> | 58 | <delete dir="${bin.dir}" failonerror="false" /> |
59 | <delete dir="${obj.dir}" failonerror="false" /> | 59 | <delete dir="${obj.dir}" failonerror="false" /> |
60 | </target> | 60 | </target> |
61 | <target name="doc" description="Creates documentation."> | 61 | <target name="doc" description="Creates documentation."> |
62 | </target> | 62 | </target> |
63 | </project> | 63 | </project> |
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index ec65ba8..e3b33cb 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Local" default="build"> | 2 | <project name="OpenSim.GridInterfaces.Local" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="LocalAssetServer.cs" /> | 15 | <include name="LocalAssetServer.cs" /> |
16 | <include name="LocalGridServer.cs" /> | 16 | <include name="LocalGridServer.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 27 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index 2060454..01bf0df 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build | |||
@@ -1,45 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> | 2 | <project name="OpenSim.GridInterfaces.Remote" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="RemoteAssetServer.cs" /> | 15 | <include name="RemoteAssetServer.cs" /> |
16 | <include name="RemoteGridServer.cs" /> | 16 | <include name="RemoteGridServer.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/libsecondlife.dll" /> | 25 | <include name="../../bin/libsecondlife.dll" /> |
26 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 26 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
27 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
28 | </references> | 28 | </references> |
29 | </csc> | 29 | </csc> |
30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
32 | <copy todir="${project::get-base-directory()}/../../bin/"> | 32 | <copy todir="${project::get-base-directory()}/../../bin/"> |
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
34 | <include name="*.dll"/> | 34 | <include name="*.dll"/> |
35 | <include name="*.exe"/> | 35 | <include name="*.exe"/> |
36 | </fileset> | 36 | </fileset> |
37 | </copy> | 37 | </copy> |
38 | </target> | 38 | </target> |
39 | <target name="clean"> | 39 | <target name="clean"> |
40 | <delete dir="${bin.dir}" failonerror="false" /> | 40 | <delete dir="${bin.dir}" failonerror="false" /> |
41 | <delete dir="${obj.dir}" failonerror="false" /> | 41 | <delete dir="${obj.dir}" failonerror="false" /> |
42 | </target> | 42 | </target> |
43 | <target name="doc" description="Creates documentation."> | 43 | <target name="doc" description="Creates documentation."> |
44 | </target> | 44 | </target> |
45 | </project> | 45 | </project> |
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index f146733..4217a06 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build | |||
@@ -1,42 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> | 2 | <project name="OpenSim.Physics.BasicPhysicsPlugin" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="BasicPhysicsPlugin.cs" /> | 15 | <include name="BasicPhysicsPlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> | 24 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> |
25 | </references> | 25 | </references> |
26 | </csc> | 26 | </csc> |
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
28 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 28 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
29 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 29 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
31 | <include name="*.dll"/> | 31 | <include name="*.dll"/> |
32 | <include name="*.exe"/> | 32 | <include name="*.exe"/> |
33 | </fileset> | 33 | </fileset> |
34 | </copy> | 34 | </copy> |
35 | </target> | 35 | </target> |
36 | <target name="clean"> | 36 | <target name="clean"> |
37 | <delete dir="${bin.dir}" failonerror="false" /> | 37 | <delete dir="${bin.dir}" failonerror="false" /> |
38 | <delete dir="${obj.dir}" failonerror="false" /> | 38 | <delete dir="${obj.dir}" failonerror="false" /> |
39 | </target> | 39 | </target> |
40 | <target name="doc" description="Creates documentation."> | 40 | <target name="doc" description="Creates documentation."> |
41 | </target> | 41 | </target> |
42 | </project> | 42 | </project> |
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 47e5534..4aaca6a 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.Manager" default="build"> | 2 | <project name="OpenSim.Physics.Manager" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="PhysicsActor.cs" /> | 15 | <include name="PhysicsActor.cs" /> |
16 | <include name="PhysicsManager.cs" /> | 16 | <include name="PhysicsManager.cs" /> |
17 | <include name="PhysicsScene.cs" /> | 17 | <include name="PhysicsScene.cs" /> |
18 | <include name="PhysicsVector.cs" /> | 18 | <include name="PhysicsVector.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
22 | <include name="${project::get-base-directory()}" /> | 22 | <include name="${project::get-base-directory()}" /> |
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | 23 | <include name="${project::get-base-directory()}/${build.dir}" /> |
24 | </lib> | 24 | </lib> |
25 | <include name="System.dll" /> | 25 | <include name="System.dll" /> |
26 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="../../bin/Axiom.MathLib.dll" /> | 27 | <include name="../../bin/Axiom.MathLib.dll" /> |
28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build index 8f9e7dc..395cc6b 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.PhysXPlugin" default="build"> | 2 | <project name="OpenSim.Physics.PhysXPlugin" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="PhysXPlugin.cs" /> | 15 | <include name="PhysXPlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> | 24 | <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> |
25 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> | 25 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.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/Physics/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
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> |
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index dce4dc1..ac65d34 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -1,68 +1,68 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.RegionServer" default="build"> | 2 | <project name="OpenSim.RegionServer" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Grid.cs" /> | 14 | <include name="Grid.cs" /> |
15 | <include name="OpenSimApplication.cs" /> | 15 | <include name="OpenSimApplication.cs" /> |
16 | <include name="OpenSimMain.cs" /> | 16 | <include name="OpenSimMain.cs" /> |
17 | <include name="OpenSimRoot.cs" /> | 17 | <include name="OpenSimRoot.cs" /> |
18 | <include name="QueItem.cs" /> | 18 | <include name="QueItem.cs" /> |
19 | <include name="SimClient.cs" /> | 19 | <include name="SimClient.cs" /> |
20 | <include name="SimConsole.cs" /> | 20 | <include name="SimConsole.cs" /> |
21 | <include name="VersionInfo.cs" /> | 21 | <include name="VersionInfo.cs" /> |
22 | <include name="Assets/AssetCache.cs" /> | 22 | <include name="Assets/AssetCache.cs" /> |
23 | <include name="Assets/InventoryCache.cs" /> | 23 | <include name="Assets/InventoryCache.cs" /> |
24 | <include name="CAPS/SimHttp.cs" /> | 24 | <include name="CAPS/SimHttp.cs" /> |
25 | <include name="types/Mesh.cs" /> | 25 | <include name="UserServer/LocalUserProfileManager.cs" /> |
26 | <include name="types/Triangle.cs" /> | 26 | <include name="UserServer/LoginServer.cs" /> |
27 | <include name="UserServer/LocalUserProfileManager.cs" /> | 27 | <include name="types/Mesh.cs" /> |
28 | <include name="UserServer/LoginServer.cs" /> | 28 | <include name="types/Triangle.cs" /> |
29 | <include name="world/Avatar.cs" /> | 29 | <include name="world/Avatar.cs" /> |
30 | <include name="world/AvatarAnimations.cs" /> | 30 | <include name="world/AvatarAnimations.cs" /> |
31 | <include name="world/Entity.cs" /> | 31 | <include name="world/Entity.cs" /> |
32 | <include name="world/Primitive.cs" /> | 32 | <include name="world/Primitive.cs" /> |
33 | <include name="world/ScriptEngine.cs" /> | 33 | <include name="world/ScriptEngine.cs" /> |
34 | <include name="world/SurfacePatch.cs" /> | 34 | <include name="world/SurfacePatch.cs" /> |
35 | <include name="world/World.cs" /> | 35 | <include name="world/World.cs" /> |
36 | <include name="world/scripting/IScript.cs" /> | 36 | <include name="world/scripting/IScript.cs" /> |
37 | </sources> | 37 | </sources> |
38 | <references basedir="${project::get-base-directory()}"> | 38 | <references basedir="${project::get-base-directory()}"> |
39 | <lib> | 39 | <lib> |
40 | <include name="${project::get-base-directory()}" /> | 40 | <include name="${project::get-base-directory()}" /> |
41 | <include name="${project::get-base-directory()}/${build.dir}" /> | 41 | <include name="${project::get-base-directory()}/${build.dir}" /> |
42 | </lib> | 42 | </lib> |
43 | <include name="System.dll" /> | 43 | <include name="System.dll" /> |
44 | <include name="System.Xml.dll" /> | 44 | <include name="System.Xml.dll" /> |
45 | <include name="../bin/libsecondlife.dll" /> | 45 | <include name="../bin/libsecondlife.dll" /> |
46 | <include name="../bin/Axiom.MathLib.dll" /> | 46 | <include name="../bin/Axiom.MathLib.dll" /> |
47 | <include name="../bin/Db4objects.Db4o.dll" /> | 47 | <include name="../bin/Db4objects.Db4o.dll" /> |
48 | <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 48 | <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
49 | <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> | 49 | <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> |
50 | <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 50 | <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
51 | </references> | 51 | </references> |
52 | </csc> | 52 | </csc> |
53 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 53 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
54 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 54 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
55 | <copy todir="${project::get-base-directory()}/../bin/"> | 55 | <copy todir="${project::get-base-directory()}/../bin/"> |
56 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 56 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
57 | <include name="*.dll"/> | 57 | <include name="*.dll"/> |
58 | <include name="*.exe"/> | 58 | <include name="*.exe"/> |
59 | </fileset> | 59 | </fileset> |
60 | </copy> | 60 | </copy> |
61 | </target> | 61 | </target> |
62 | <target name="clean"> | 62 | <target name="clean"> |
63 | <delete dir="${bin.dir}" failonerror="false" /> | 63 | <delete dir="${bin.dir}" failonerror="false" /> |
64 | <delete dir="${obj.dir}" failonerror="false" /> | 64 | <delete dir="${obj.dir}" failonerror="false" /> |
65 | </target> | 65 | </target> |
66 | <target name="doc" description="Creates documentation."> | 66 | <target name="doc" description="Creates documentation."> |
67 | </target> | 67 | </target> |
68 | </project> | 68 | </project> |
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 44e8597..ebcda17 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Storage.LocalStorageDb4o" default="build"> | 2 | <project name="OpenSim.Storage.LocalStorageDb4o" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="Db4LocalStorage.cs" /> | 15 | <include name="Db4LocalStorage.cs" /> |
16 | <include name="UUIDQuery.cs" /> | 16 | <include name="UUIDQuery.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 27 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.build b/OpenSim.build index e0738a6..53394fe 100644 --- a/OpenSim.build +++ b/OpenSim.build | |||
@@ -1,97 +1,103 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim" default="build"> | 2 | <project name="OpenSim" default="build"> |
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | 3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> |
4 | 4 | ||
5 | <property name="bin.dir" value="bin" /> | 5 | <property name="bin.dir" value="bin" /> |
6 | <property name="obj.dir" value="obj" /> | 6 | <property name="obj.dir" value="obj" /> |
7 | <property name="doc.dir" value="doc" /> | 7 | <property name="doc.dir" value="doc" /> |
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | 8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> |
9 | 9 | <property name="project.config" value="Release" /> | |
10 | <target name="Debug" description=""> | 10 | |
11 | <property name="project.config" value="Debug" /> | 11 | <target name="Release" description=""> |
12 | <property name="build.debug" value="true" /> | 12 | <property name="project.config" value="Release" /> |
13 | </target> | 13 | <property name="build.debug" value="false" /> |
14 | 14 | </target> | |
15 | <property name="project.config" value="Release" /> | 15 | |
16 | 16 | ||
17 | <target name="Release" description=""> | 17 | <target name="Debug" description=""> |
18 | <property name="project.config" value="Release" /> | 18 | <property name="project.config" value="Debug" /> |
19 | <property name="build.debug" value="false" /> | 19 | <property name="build.debug" value="true" /> |
20 | </target> | 20 | </target> |
21 | 21 | ||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 23 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 24 | </target> |
25 | 25 | ||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | 26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> |
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | 27 | <property name="nant.settings.currentframework" value="net-2.0" /> |
28 | </target> | 28 | </target> |
29 | 29 | ||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | 30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> |
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | 31 | <property name="nant.settings.currentframework" value="mono-2.0" /> |
32 | </target> | 32 | </target> |
33 | 33 | ||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | 34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> |
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | 35 | <property name="nant.settings.currentframework" value="mono-1.0" /> |
36 | </target> | 36 | </target> |
37 | 37 | ||
38 | <target name="init" description=""> | 38 | <target name="init" description=""> |
39 | <call target="${project.config}" /> | 39 | <call target="${project.config}" /> |
40 | <sysinfo /> | 40 | <sysinfo /> |
41 | <echo message="Platform ${sys.os.platform}" /> | 41 | <echo message="Platform ${sys.os.platform}" /> |
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | 42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> |
43 | </target> | 43 | </target> |
44 | 44 | ||
45 | <target name="clean" description=""> | 45 | <target name="clean" description=""> |
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> | 49 | <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> |
50 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> | 50 | <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> |
51 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> | 51 | <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> |
52 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> | 52 | <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> |
53 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> | 53 | <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> |
54 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> | 54 | <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> |
55 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> | 55 | <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> |
56 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> | 56 | <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" /> |
57 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> | 57 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> |
58 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> | 58 | <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> |
59 | <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> | 59 | <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="clean" /> |
60 | </target> | 60 | <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> |
61 | 61 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> | |
62 | <target name="build" depends="init" description=""> | 62 | </target> |
63 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> | 63 | |
64 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> | 64 | <target name="build" depends="init" description=""> |
65 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> | 65 | <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> |
66 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> | 66 | <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> |
67 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> | 67 | <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="build" /> |
68 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> | 68 | <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> |
69 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> | 69 | <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> |
70 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> | 70 | <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> |
71 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> | 71 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> |
72 | <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> | 72 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> |
73 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> | 73 | <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> |
74 | </target> | 74 | <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> |
75 | 75 | <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> | |
76 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 76 | <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="build" /> |
77 | 77 | <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> | |
78 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | 78 | </target> |
79 | 79 | ||
80 | <target name="package" depends="clean, doc" description="Builds all" /> | 80 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
81 | 81 | ||
82 | <target name="doc" depends="build-release"> | 82 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> |
83 | <echo message="Generating all documentation from all builds" /> | 83 | |
84 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> | 84 | <target name="package" depends="clean, doc" description="Builds all" /> |
85 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> | 85 | |
86 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> | 86 | <target name="doc" depends="build-release"> |
87 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> | 87 | <echo message="Generating all documentation from all builds" /> |
88 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> | 88 | <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> |
89 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> | 89 | <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> |
90 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> | 90 | <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> |
91 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> | 91 | <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> |
92 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> | 92 | <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> |
93 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> | 93 | <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> |
94 | <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> | 94 | <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> |
95 | </target> | 95 | <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" /> |
96 | 96 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> | |
97 | </project> | 97 | <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> |
98 | <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="doc" /> | ||
99 | <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> | ||
100 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> | ||
101 | </target> | ||
102 | |||
103 | </project> | ||
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build index 7d69d90..fc516df 100644 --- a/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim.exe.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim" default="build"> | 2 | <project name="OpenSim" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenSim" dynamicprefix="true" > | 11 | <resources prefix="OpenSim" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="RegionServer.cs" /> | 14 | <include name="RegionServer.cs" /> |
15 | </sources> | 15 | </sources> |
16 | <references basedir="${project::get-base-directory()}"> | 16 | <references basedir="${project::get-base-directory()}"> |
17 | <lib> | 17 | <lib> |
18 | <include name="${project::get-base-directory()}" /> | 18 | <include name="${project::get-base-directory()}" /> |
19 | <include name="${project::get-base-directory()}/${build.dir}" /> | 19 | <include name="${project::get-base-directory()}/${build.dir}" /> |
20 | </lib> | 20 | </lib> |
21 | <include name="System.dll" /> | 21 | <include name="System.dll" /> |
22 | <include name="System.Xml.dll" /> | 22 | <include name="System.Xml.dll" /> |
23 | <include name="../bin/libsecondlife.dll" /> | 23 | <include name="../bin/libsecondlife.dll" /> |
24 | <include name="../bin/Axiom.MathLib.dll" /> | 24 | <include name="../bin/Axiom.MathLib.dll" /> |
25 | <include name="../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 26 | <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
27 | <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.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" /> | 28 | <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> |
29 | <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" /> | 29 | <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 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/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
38 | </fileset> | 38 | </fileset> |
39 | </copy> | 39 | </copy> |
40 | </target> | 40 | </target> |
41 | <target name="clean"> | 41 | <target name="clean"> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <delete dir="${bin.dir}" failonerror="false" /> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${obj.dir}" failonerror="false" /> |
44 | </target> | 44 | </target> |
45 | <target name="doc" description="Creates documentation."> | 45 | <target name="doc" description="Creates documentation."> |
46 | </target> | 46 | </target> |
47 | </project> | 47 | </project> |
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build index 395fb31..188a8a7 100644 --- a/Prebuild/Prebuild.build +++ b/Prebuild/Prebuild.build | |||
@@ -1,67 +1,67 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="Prebuild" default="build"> | 2 | <project name="Prebuild" default="build"> |
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | 3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> |
4 | 4 | ||
5 | <property name="bin.dir" value="bin" /> | 5 | <property name="bin.dir" value="bin" /> |
6 | <property name="obj.dir" value="obj" /> | 6 | <property name="obj.dir" value="obj" /> |
7 | <property name="doc.dir" value="doc" /> | 7 | <property name="doc.dir" value="doc" /> |
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | 8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> |
9 | 9 | <property name="project.config" value="Release" /> | |
10 | <target name="Debug" description=""> | 10 | |
11 | <property name="project.config" value="Debug" /> | 11 | <target name="Release" description=""> |
12 | <property name="build.debug" value="true" /> | 12 | <property name="project.config" value="Release" /> |
13 | </target> | 13 | <property name="build.debug" value="false" /> |
14 | 14 | </target> | |
15 | <property name="project.config" value="Release" /> | 15 | |
16 | 16 | ||
17 | <target name="Release" description=""> | 17 | <target name="Debug" description=""> |
18 | <property name="project.config" value="Release" /> | 18 | <property name="project.config" value="Debug" /> |
19 | <property name="build.debug" value="false" /> | 19 | <property name="build.debug" value="true" /> |
20 | </target> | 20 | </target> |
21 | 21 | ||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 23 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 24 | </target> |
25 | 25 | ||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | 26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> |
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | 27 | <property name="nant.settings.currentframework" value="net-2.0" /> |
28 | </target> | 28 | </target> |
29 | 29 | ||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | 30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> |
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | 31 | <property name="nant.settings.currentframework" value="mono-2.0" /> |
32 | </target> | 32 | </target> |
33 | 33 | ||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | 34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> |
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | 35 | <property name="nant.settings.currentframework" value="mono-1.0" /> |
36 | </target> | 36 | </target> |
37 | 37 | ||
38 | <target name="init" description=""> | 38 | <target name="init" description=""> |
39 | <call target="${project.config}" /> | 39 | <call target="${project.config}" /> |
40 | <sysinfo /> | 40 | <sysinfo /> |
41 | <echo message="Platform ${sys.os.platform}" /> | 41 | <echo message="Platform ${sys.os.platform}" /> |
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | 42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> |
43 | </target> | 43 | </target> |
44 | 44 | ||
45 | <target name="clean" description=""> | 45 | <target name="clean" description=""> |
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="src/Prebuild.exe.build" target="clean" /> | 49 | <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="clean" /> |
50 | </target> | 50 | </target> |
51 | 51 | ||
52 | <target name="build" depends="init" description=""> | 52 | <target name="build" depends="init" description=""> |
53 | <nant buildfile="src/Prebuild.exe.build" target="build" /> | 53 | <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="build" /> |
54 | </target> | 54 | </target> |
55 | 55 | ||
56 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 56 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
57 | 57 | ||
58 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | 58 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> |
59 | 59 | ||
60 | <target name="package" depends="clean, doc" description="Builds all" /> | 60 | <target name="package" depends="clean, doc" description="Builds all" /> |
61 | 61 | ||
62 | <target name="doc" depends="build-release"> | 62 | <target name="doc" depends="build-release"> |
63 | <echo message="Generating all documentation from all builds" /> | 63 | <echo message="Generating all documentation from all builds" /> |
64 | <nant buildfile="src/Prebuild.exe.build" target="doc" /> | 64 | <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="doc" /> |
65 | </target> | 65 | </target> |
66 | 66 | ||
67 | </project> | 67 | </project> |
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index 43f5516..628e7e1 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build | |||
@@ -1,80 +1,80 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="Prebuild" default="build"> | 2 | <project name="Prebuild" 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="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> | 10 | <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> |
11 | <resources prefix="Prebuild" dynamicprefix="true" > | 11 | <resources prefix="Prebuild" dynamicprefix="true" > |
12 | <include name="App.ico" /> | 12 | <include name="App.ico" /> |
13 | <include name="data/prebuild-1.7.xsd" /> | 13 | <include name="data/prebuild-1.7.xsd" /> |
14 | </resources> | 14 | </resources> |
15 | <sources failonempty="true"> | 15 | <sources failonempty="true"> |
16 | <include name="Prebuild.cs" /> | 16 | <include name="Prebuild.cs" /> |
17 | <include name="Core/FatalException.cs" /> | 17 | <include name="Core/FatalException.cs" /> |
18 | <include name="Core/Kernel.cs" /> | 18 | <include name="Core/Kernel.cs" /> |
19 | <include name="Core/UnknownLanguageException.cs" /> | 19 | <include name="Core/UnknownLanguageException.cs" /> |
20 | <include name="Core/WarningException.cs" /> | 20 | <include name="Core/WarningException.cs" /> |
21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | 21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> |
22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | 22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> |
23 | <include name="Core/Attributes/TargetAttribute.cs" /> | 23 | <include name="Core/Attributes/TargetAttribute.cs" /> |
24 | <include name="Core/Interfaces/IDataNode.cs" /> | 24 | <include name="Core/Interfaces/IDataNode.cs" /> |
25 | <include name="Core/Interfaces/ITarget.cs" /> | 25 | <include name="Core/Interfaces/ITarget.cs" /> |
26 | <include name="Core/Nodes/ConfigurationNode.cs" /> | 26 | <include name="Core/Nodes/ConfigurationNode.cs" /> |
27 | <include name="Core/Nodes/DataNode.cs" /> | 27 | <include name="Core/Nodes/DataNode.cs" /> |
28 | <include name="Core/Nodes/ExcludeNode.cs" /> | 28 | <include name="Core/Nodes/ExcludeNode.cs" /> |
29 | <include name="Core/Nodes/FileNode.cs" /> | 29 | <include name="Core/Nodes/FileNode.cs" /> |
30 | <include name="Core/Nodes/FilesNode.cs" /> | 30 | <include name="Core/Nodes/FilesNode.cs" /> |
31 | <include name="Core/Nodes/MatchNode.cs" /> | 31 | <include name="Core/Nodes/MatchNode.cs" /> |
32 | <include name="Core/Nodes/OptionsNode.cs" /> | 32 | <include name="Core/Nodes/OptionsNode.cs" /> |
33 | <include name="Core/Nodes/ProcessNode.cs" /> | 33 | <include name="Core/Nodes/ProcessNode.cs" /> |
34 | <include name="Core/Nodes/ProjectNode.cs" /> | 34 | <include name="Core/Nodes/ProjectNode.cs" /> |
35 | <include name="Core/Nodes/ReferenceNode.cs" /> | 35 | <include name="Core/Nodes/ReferenceNode.cs" /> |
36 | <include name="Core/Nodes/ReferencePathNode.cs" /> | 36 | <include name="Core/Nodes/ReferencePathNode.cs" /> |
37 | <include name="Core/Nodes/SolutionNode.cs" /> | 37 | <include name="Core/Nodes/SolutionNode.cs" /> |
38 | <include name="Core/Parse/IfContext.cs" /> | 38 | <include name="Core/Parse/IfContext.cs" /> |
39 | <include name="Core/Parse/Preprocessor.cs" /> | 39 | <include name="Core/Parse/Preprocessor.cs" /> |
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | 40 | <include name="Core/Targets/AutotoolsTarget.cs" /> |
41 | <include name="Core/Targets/DebugTarget.cs" /> | 41 | <include name="Core/Targets/DebugTarget.cs" /> |
42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> | 42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> |
43 | <include name="Core/Targets/NAntTarget.cs" /> | 43 | <include name="Core/Targets/NAntTarget.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | 44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> |
45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> | 45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> |
46 | <include name="Core/Targets/VS2002Target.cs" /> | 46 | <include name="Core/Targets/VS2002Target.cs" /> |
47 | <include name="Core/Targets/VS2003Target.cs" /> | 47 | <include name="Core/Targets/VS2003Target.cs" /> |
48 | <include name="Core/Targets/VS2005Target.cs" /> | 48 | <include name="Core/Targets/VS2005Target.cs" /> |
49 | <include name="Core/Utilities/CommandLineCollection.cs" /> | 49 | <include name="Core/Utilities/CommandLineCollection.cs" /> |
50 | <include name="Core/Utilities/CurrentDirectory.cs" /> | 50 | <include name="Core/Utilities/CurrentDirectory.cs" /> |
51 | <include name="Core/Utilities/Helper.cs" /> | 51 | <include name="Core/Utilities/Helper.cs" /> |
52 | <include name="Core/Utilities/Log.cs" /> | 52 | <include name="Core/Utilities/Log.cs" /> |
53 | <include name="Properties/AssemblyInfo.cs" /> | 53 | <include name="Properties/AssemblyInfo.cs" /> |
54 | </sources> | 54 | </sources> |
55 | <references basedir="${project::get-base-directory()}"> | 55 | <references basedir="${project::get-base-directory()}"> |
56 | <lib> | 56 | <lib> |
57 | <include name="${project::get-base-directory()}" /> | 57 | <include name="${project::get-base-directory()}" /> |
58 | <include name="${project::get-base-directory()}/${build.dir}" /> | 58 | <include name="${project::get-base-directory()}/${build.dir}" /> |
59 | </lib> | 59 | </lib> |
60 | <include name="System.EnterpriseServices.dll" /> | 60 | <include name="System.EnterpriseServices.dll" /> |
61 | <include name="System.Xml.dll" /> | 61 | <include name="System.Xml.dll" /> |
62 | <include name="System.dll" /> | 62 | <include name="System.dll" /> |
63 | </references> | 63 | </references> |
64 | </csc> | 64 | </csc> |
65 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 65 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
66 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 66 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
67 | <copy todir="${project::get-base-directory()}/../../bin/"> | 67 | <copy todir="${project::get-base-directory()}/../../bin/"> |
68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
69 | <include name="*.dll"/> | 69 | <include name="*.dll"/> |
70 | <include name="*.exe"/> | 70 | <include name="*.exe"/> |
71 | </fileset> | 71 | </fileset> |
72 | </copy> | 72 | </copy> |
73 | </target> | 73 | </target> |
74 | <target name="clean"> | 74 | <target name="clean"> |
75 | <delete dir="${bin.dir}" failonerror="false" /> | 75 | <delete dir="${bin.dir}" failonerror="false" /> |
76 | <delete dir="${obj.dir}" failonerror="false" /> | 76 | <delete dir="${obj.dir}" failonerror="false" /> |
77 | </target> | 77 | </target> |
78 | <target name="doc" description="Creates documentation."> | 78 | <target name="doc" description="Creates documentation."> |
79 | </target> | 79 | </target> |
80 | </project> | 80 | </project> |
diff --git a/prebuild.xml b/prebuild.xml index df02b59..eafee37 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -74,6 +74,60 @@ | |||
74 | </Files> | 74 | </Files> |
75 | </Project> | 75 | </Project> |
76 | 76 | ||
77 | <!-- OGS stuff --> | ||
78 | <Project name="OpenGridServices.ServerConsole" path="./OpenGridServices.ServerConsole" type="Library"> | ||
79 | <Configuration name="Debug"> | ||
80 | <Options> | ||
81 | <OutputPath>../bin/</OutputPath> | ||
82 | </Options> | ||
83 | </Configuration> | ||
84 | <Configuration name="Release"> | ||
85 | <Options> | ||
86 | <OutputPath>../bin/</OutputPath> | ||
87 | </Options> | ||
88 | </Configuration> | ||
89 | |||
90 | <ReferencePath>../bin/</ReferencePath> | ||
91 | <Reference name="System" localCopy="false"/> | ||
92 | <Reference name="System.Data" localCopy="false"/> | ||
93 | <Reference name="System.Xml" localCopy="false"/> | ||
94 | <Reference name="OpenSim.Framework.dll"/> | ||
95 | |||
96 | <Files> | ||
97 | <Match pattern="*.cs" recurse="true"/> | ||
98 | <Match pattern="..\OGS\common\VersionInfo\VersionInfo.cs"/> | ||
99 | </Files> | ||
100 | </Project> | ||
101 | |||
102 | |||
103 | <Project name="OpenGridServices.UserServer" path="./OpenGridServices.UserServer" type="Exe"> | ||
104 | <Configuration name="Debug"> | ||
105 | <Options> | ||
106 | <OutputPath>../bin/</OutputPath> | ||
107 | </Options> | ||
108 | </Configuration> | ||
109 | <Configuration name="Release"> | ||
110 | <Options> | ||
111 | <OutputPath>../bin/</OutputPath> | ||
112 | </Options> | ||
113 | </Configuration> | ||
114 | |||
115 | <ReferencePath>../bin/</ReferencePath> | ||
116 | <Reference name="System" localCopy="false"/> | ||
117 | <Reference name="System.Data" localCopy="false"/> | ||
118 | <Reference name="System.Xml" localCopy="false"/> | ||
119 | <Reference name="OpenSim.Framework.dll"/> | ||
120 | <Reference name="OpenSim.Framework.Console.dll"/> | ||
121 | <Reference name="OpenGridServices.ServerConsole.dll"/> | ||
122 | <Reference name="libsecondlife.dll"/> | ||
123 | |||
124 | <Files> | ||
125 | <Match pattern="*.cs" recurse="true"/> | ||
126 | <Match pattern="..\OGS\common\VersionInfo\VersionInfo.cs"/> | ||
127 | </Files> | ||
128 | </Project> | ||
129 | |||
130 | |||
77 | <Project name="OpenSim.Physics.Manager" path="./OpenSim.Physics/Manager" type="Library"> | 131 | <Project name="OpenSim.Physics.Manager" path="./OpenSim.Physics/Manager" type="Library"> |
78 | <Configuration name="Debug"> | 132 | <Configuration name="Debug"> |
79 | <Options> | 133 | <Options> |