diff options
author | MW | 2007-06-28 13:13:17 +0000 |
---|---|---|
committer | MW | 2007-06-28 13:13:17 +0000 |
commit | 3456d951d89fbc83f742d40ca8ca2a1a79d414eb (patch) | |
tree | cc5a53b8edd4ac4cc99e6178fb70c98672f3c168 | |
parent | should now work. (diff) | |
download | opensim-SC-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.zip opensim-SC-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.gz opensim-SC-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.bz2 opensim-SC-3456d951d89fbc83f742d40ca8ca2a1a79d414eb.tar.xz |
Imported the scripting changes, so now should be up to date with sugilite.
76 files changed, 2869 insertions, 932 deletions
diff --git a/OpenGridServices.build b/OpenGridServices.build new file mode 100644 index 0000000..2efeac9 --- /dev/null +++ b/OpenGridServices.build | |||
@@ -0,0 +1,100 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenGridServices" default="build"> | ||
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | ||
4 | |||
5 | <property name="bin.dir" value="bin" /> | ||
6 | <property name="obj.dir" value="obj" /> | ||
7 | <property name="doc.dir" value="doc" /> | ||
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | ||
9 | |||
10 | <target name="Debug" description=""> | ||
11 | <property name="project.config" value="Debug" /> | ||
12 | <property name="build.debug" value="true" /> | ||
13 | </target> | ||
14 | |||
15 | <property name="project.config" value="Release" /> | ||
16 | |||
17 | <target name="Release" description=""> | ||
18 | <property name="project.config" value="Release" /> | ||
19 | <property name="build.debug" value="false" /> | ||
20 | </target> | ||
21 | |||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | ||
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | ||
24 | </target> | ||
25 | |||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | ||
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | ||
28 | </target> | ||
29 | |||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | ||
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | ||
32 | </target> | ||
33 | |||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | ||
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | ||
36 | </target> | ||
37 | |||
38 | <target name="init" description=""> | ||
39 | <call target="${project.config}" /> | ||
40 | <sysinfo /> | ||
41 | <echo message="Platform ${sys.os.platform}" /> | ||
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | ||
43 | </target> | ||
44 | |||
45 | <target name="clean" description=""> | ||
46 | <echo message="Deleting all builds from all configurations" /> | ||
47 | <delete dir="${bin.dir}" failonerror="false" /> | ||
48 | <delete dir="${obj.dir}" failonerror="false" /> | ||
49 | <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="clean" /> | ||
50 | <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="clean" /> | ||
51 | <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="clean" /> | ||
52 | <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="clean" /> | ||
53 | <nant buildfile="OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build" target="clean" /> | ||
54 | <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="clean" /> | ||
55 | <nant buildfile="OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build" target="clean" /> | ||
56 | <nant buildfile="OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build" target="clean" /> | ||
57 | <nant buildfile="OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build" target="clean" /> | ||
58 | <nant buildfile="OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build" target="clean" /> | ||
59 | <nant buildfile="OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build" target="clean" /> | ||
60 | <nant buildfile="OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build" target="clean" /> | ||
61 | </target> | ||
62 | |||
63 | <target name="build" depends="init" description=""> | ||
64 | <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="build" /> | ||
65 | <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="build" /> | ||
66 | <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="build" /> | ||
67 | <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="build" /> | ||
68 | <nant buildfile="OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build" target="build" /> | ||
69 | <nant buildfile="OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build" target="build" /> | ||
70 | <nant buildfile="OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build" target="build" /> | ||
71 | <nant buildfile="OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build" target="build" /> | ||
72 | <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="build" /> | ||
73 | <nant buildfile="OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build" target="build" /> | ||
74 | <nant buildfile="OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build" target="build" /> | ||
75 | <nant buildfile="OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build" target="build" /> | ||
76 | </target> | ||
77 | |||
78 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | ||
79 | |||
80 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | ||
81 | |||
82 | <target name="package" depends="clean, doc" description="Builds all" /> | ||
83 | |||
84 | <target name="doc" depends="build-release"> | ||
85 | <echo message="Generating all documentation from all builds" /> | ||
86 | <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="doc" /> | ||
87 | <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="doc" /> | ||
88 | <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="doc" /> | ||
89 | <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="doc" /> | ||
90 | <nant buildfile="OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build" target="doc" /> | ||
91 | <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="doc" /> | ||
92 | <nant buildfile="OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build" target="doc" /> | ||
93 | <nant buildfile="OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build" target="doc" /> | ||
94 | <nant buildfile="OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build" target="doc" /> | ||
95 | <nant buildfile="OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build" target="doc" /> | ||
96 | <nant buildfile="OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build" target="doc" /> | ||
97 | <nant buildfile="OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build" target="doc" /> | ||
98 | </target> | ||
99 | |||
100 | </project> | ||
diff --git a/OpenGridServices.sln b/OpenGridServices.sln index 5f47b6b..2343bc0 100644 --- a/OpenGridServices.sln +++ b/OpenGridServices.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}" |
@@ -25,61 +25,72 @@ EndProject | |||
25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}" | 25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}" |
26 | EndProject | 26 | EndProject |
27 | Global | 27 | Global |
28 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 28 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
29 | Debug|Any CPU = Debug|Any CPU | 29 | Debug|Any CPU = Debug|Any CPU |
30 | Release|Any CPU = Release|Any CPU | 30 | Release|Any CPU = Release|Any CPU |
31 | EndGlobalSection | 31 | EndGlobalSection |
32 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 32 | GlobalSection(ProjectDependencies) = postSolution |
33 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 33 | ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) |
34 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 34 | ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000}) |
35 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 35 | ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) |
36 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 36 | ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000}) |
37 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 37 | ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) |
38 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 38 | ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) |
39 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 39 | ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000}) |
40 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 40 | ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) |
41 | {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 41 | ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000}) |
42 | {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 42 | EndGlobalSection |
43 | {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 43 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
44 | {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 44 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
45 | {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 45 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
46 | {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 46 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
47 | {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 47 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
48 | {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 48 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
49 | {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 49 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
50 | {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 50 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
51 | {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 51 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
52 | {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 52 | {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
53 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 53 | {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
54 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 54 | {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
55 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 55 | {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
56 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 56 | {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
57 | {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 57 | {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
58 | {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 58 | {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
59 | {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 59 | {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
60 | {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 60 | {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
61 | {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 61 | {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
62 | {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 62 | {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
63 | {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 63 | {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
64 | {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 64 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
65 | {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 65 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
66 | {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
67 | {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
68 | {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
69 | {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
70 | {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
71 | {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
72 | {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 72 | {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
73 | {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 73 | {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
74 | {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 74 | {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
75 | {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 75 | {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
76 | {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 76 | {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
77 | {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 77 | {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
78 | {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 78 | {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
79 | {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 79 | {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
80 | {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 80 | {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
81 | EndGlobalSection | 81 | {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
82 | GlobalSection(SolutionProperties) = preSolution | 82 | {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
83 | HideSolutionNode = FALSE | 83 | {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
84 | EndGlobalSection | 84 | {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
85 | {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
86 | {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
87 | {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
88 | {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
89 | {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
90 | {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
91 | {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
92 | EndGlobalSection | ||
93 | GlobalSection(SolutionProperties) = preSolution | ||
94 | HideSolutionNode = FALSE | ||
95 | EndGlobalSection | ||
85 | EndGlobal | 96 | EndGlobal |
diff --git a/OpenSim.build b/OpenSim.build new file mode 100644 index 0000000..5803b42 --- /dev/null +++ b/OpenSim.build | |||
@@ -0,0 +1,142 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim" default="build"> | ||
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | ||
4 | |||
5 | <property name="bin.dir" value="bin" /> | ||
6 | <property name="obj.dir" value="obj" /> | ||
7 | <property name="doc.dir" value="doc" /> | ||
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | ||
9 | |||
10 | <target name="Debug" description=""> | ||
11 | <property name="project.config" value="Debug" /> | ||
12 | <property name="build.debug" value="true" /> | ||
13 | </target> | ||
14 | |||
15 | <property name="project.config" value="Release" /> | ||
16 | |||
17 | <target name="Release" description=""> | ||
18 | <property name="project.config" value="Release" /> | ||
19 | <property name="build.debug" value="false" /> | ||
20 | </target> | ||
21 | |||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | ||
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | ||
24 | </target> | ||
25 | |||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | ||
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | ||
28 | </target> | ||
29 | |||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | ||
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | ||
32 | </target> | ||
33 | |||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | ||
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | ||
36 | </target> | ||
37 | |||
38 | <target name="init" description=""> | ||
39 | <call target="${project.config}" /> | ||
40 | <sysinfo /> | ||
41 | <echo message="Platform ${sys.os.platform}" /> | ||
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | ||
43 | </target> | ||
44 | |||
45 | <target name="clean" description=""> | ||
46 | <echo message="Deleting all builds from all configurations" /> | ||
47 | <delete dir="${bin.dir}" failonerror="false" /> | ||
48 | <delete dir="${obj.dir}" failonerror="false" /> | ||
49 | <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="clean" /> | ||
50 | <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="clean" /> | ||
51 | <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="clean" /> | ||
52 | <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="clean" /> | ||
53 | <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="clean" /> | ||
54 | <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="clean" /> | ||
55 | <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="clean" /> | ||
56 | <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="clean" /> | ||
57 | <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="clean" /> | ||
58 | <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="clean" /> | ||
59 | <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="clean" /> | ||
60 | <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="clean" /> | ||
61 | <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="clean" /> | ||
62 | <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="clean" /> | ||
63 | <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="clean" /> | ||
64 | <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="clean" /> | ||
65 | <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="clean" /> | ||
66 | <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> | ||
67 | <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="clean" /> | ||
68 | <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="clean" /> | ||
69 | <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="clean" /> | ||
70 | <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" /> | ||
71 | <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="clean" /> | ||
72 | <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="clean" /> | ||
73 | <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="clean" /> | ||
74 | <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="clean" /> | ||
75 | </target> | ||
76 | |||
77 | <target name="build" depends="init" description=""> | ||
78 | <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="build" /> | ||
79 | <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="build" /> | ||
80 | <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="build" /> | ||
81 | <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="build" /> | ||
82 | <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="build" /> | ||
83 | <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="build" /> | ||
84 | <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="build" /> | ||
85 | <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="build" /> | ||
86 | <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="build" /> | ||
87 | <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="build" /> | ||
88 | <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="build" /> | ||
89 | <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="build" /> | ||
90 | <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="build" /> | ||
91 | <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="build" /> | ||
92 | <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="build" /> | ||
93 | <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="build" /> | ||
94 | <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="build" /> | ||
95 | <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="build" /> | ||
96 | <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="build" /> | ||
97 | <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="build" /> | ||
98 | <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="build" /> | ||
99 | <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="build" /> | ||
100 | <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="build" /> | ||
101 | <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="build" /> | ||
102 | <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="build" /> | ||
103 | <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="build" /> | ||
104 | </target> | ||
105 | |||
106 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | ||
107 | |||
108 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | ||
109 | |||
110 | <target name="package" depends="clean, doc" description="Builds all" /> | ||
111 | |||
112 | <target name="doc" depends="build-release"> | ||
113 | <echo message="Generating all documentation from all builds" /> | ||
114 | <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="doc" /> | ||
115 | <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="doc" /> | ||
116 | <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="doc" /> | ||
117 | <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="doc" /> | ||
118 | <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="doc" /> | ||
119 | <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="doc" /> | ||
120 | <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="doc" /> | ||
121 | <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="doc" /> | ||
122 | <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="doc" /> | ||
123 | <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="doc" /> | ||
124 | <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="doc" /> | ||
125 | <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="doc" /> | ||
126 | <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="doc" /> | ||
127 | <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="doc" /> | ||
128 | <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="doc" /> | ||
129 | <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="doc" /> | ||
130 | <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="doc" /> | ||
131 | <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> | ||
132 | <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="doc" /> | ||
133 | <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="doc" /> | ||
134 | <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="doc" /> | ||
135 | <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" /> | ||
136 | <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="doc" /> | ||
137 | <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="doc" /> | ||
138 | <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="doc" /> | ||
139 | <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="doc" /> | ||
140 | </target> | ||
141 | |||
142 | </project> | ||
diff --git a/OpenSim.sln b/OpenSim.sln index 66e79d2..68465d8 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" |
@@ -53,117 +53,196 @@ EndProject | |||
53 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" | 53 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" |
54 | EndProject | 54 | EndProject |
55 | Global | 55 | Global |
56 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 56 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
57 | Debug|Any CPU = Debug|Any CPU | 57 | Debug|Any CPU = Debug|Any CPU |
58 | Release|Any CPU = Release|Any CPU | 58 | Release|Any CPU = Release|Any CPU |
59 | EndGlobalSection | 59 | EndGlobalSection |
60 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 60 | GlobalSection(ProjectDependencies) = postSolution |
61 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 61 | ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
62 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 62 | ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000}) |
63 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 63 | ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
64 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 64 | ({438A9556-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000}) |
65 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 65 | ({438A9556-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000}) |
66 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | ({438A9556-0000-0000-0000-000000000000}).8 = ({586E2916-0000-0000-0000-000000000000}) |
67 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | ({438A9556-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000}) |
68 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | ({438A9556-0000-0000-0000-000000000000}).10 = ({DC3698B2-0000-0000-0000-000000000000}) |
69 | {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | ({438A9556-0000-0000-0000-000000000000}).11 = ({BFB5D807-0000-0000-0000-000000000000}) |
70 | {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | ({438A9556-0000-0000-0000-000000000000}).12 = ({4806E378-0000-0000-0000-000000000000}) |
71 | {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | ({438A9556-0000-0000-0000-000000000000}).13 = ({DCBA491C-0000-0000-0000-000000000000}) |
72 | {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 72 | ({438A9556-0000-0000-0000-000000000000}).14 = ({F4FF31EB-0000-0000-0000-000000000000}) |
73 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 73 | ({438A9556-0000-0000-0000-000000000000}).15 = ({C9E0F891-0000-0000-0000-000000000000}) |
74 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 74 | ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
75 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 75 | ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
76 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 76 | ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) |
77 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 77 | ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) |
78 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 78 | ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000}) |
79 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 79 | ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
80 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 80 | ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
81 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 81 | ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
82 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 82 | ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
83 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 83 | ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) |
84 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 84 | ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000}) |
85 | {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 85 | ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000}) |
86 | {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 86 | ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
87 | {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 87 | ({39038E85-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
88 | {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 88 | ({39038E85-0000-0000-0000-000000000000}).2 = ({2CC71860-0000-0000-0000-000000000000}) |
89 | {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 89 | ({39038E85-0000-0000-0000-000000000000}).3 = ({61FCCDB3-0000-0000-0000-000000000000}) |
90 | {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 90 | ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
91 | {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 91 | ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
92 | {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 92 | ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000}) |
93 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 93 | ({DC3698B2-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000}) |
94 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 94 | ({DC3698B2-0000-0000-0000-000000000000}).7 = ({F4FF31EB-0000-0000-0000-000000000000}) |
95 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 95 | ({DC3698B2-0000-0000-0000-000000000000}).8 = ({C9E0F891-0000-0000-0000-000000000000}) |
96 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 96 | ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
97 | {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 97 | ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) |
98 | {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 98 | ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000}) |
99 | {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 99 | ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000}) |
100 | {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 100 | ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
101 | {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 101 | ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) |
102 | {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 102 | ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
103 | {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 103 | ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) |
104 | {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 104 | ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000}) |
105 | {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 105 | ({DCBA491C-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) |
106 | {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 106 | ({DCBA491C-0000-0000-0000-000000000000}).5 = ({CB52B7E7-0000-0000-0000-000000000000}) |
107 | {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 107 | ({DCBA491C-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) |
108 | {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 108 | ({DCBA491C-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000}) |
109 | {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 109 | ({DCBA491C-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000}) |
110 | {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 110 | ({DCBA491C-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000}) |
111 | {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 111 | ({DCBA491C-0000-0000-0000-000000000000}).10 = ({39038E85-0000-0000-0000-000000000000}) |
112 | {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 112 | ({DCBA491C-0000-0000-0000-000000000000}).11 = ({F4FF31EB-0000-0000-0000-000000000000}) |
113 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 113 | ({DCBA491C-0000-0000-0000-000000000000}).12 = ({C9E0F891-0000-0000-0000-000000000000}) |
114 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 114 | ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
115 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 115 | ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
116 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 116 | ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
117 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 117 | ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
118 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 118 | ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000}) |
119 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 119 | ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
120 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 120 | ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
121 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 121 | ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000}) |
122 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 122 | ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000}) |
123 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 123 | ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
124 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 124 | ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
125 | {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 125 | ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
126 | {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 126 | ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
127 | {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 127 | ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
128 | {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 128 | ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
129 | {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 129 | ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
130 | {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 130 | ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) |
131 | {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 131 | ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
132 | {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 132 | ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000}) |
133 | {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 133 | ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000}) |
134 | {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 134 | ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000}) |
135 | {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 135 | ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000}) |
136 | {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 136 | ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000}) |
137 | {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 137 | ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000}) |
138 | {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 138 | EndGlobalSection |
139 | {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 139 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
140 | {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 140 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
141 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 141 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
142 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 142 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
143 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 143 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
144 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 144 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
145 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 145 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
146 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 146 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
147 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 147 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
148 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 148 | {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
149 | {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 149 | {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
150 | {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 150 | {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
151 | {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 151 | {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
152 | {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 152 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
153 | {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 153 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
154 | {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 154 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
155 | {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 155 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
156 | {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 156 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
157 | {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 157 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
158 | {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 158 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
159 | {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 159 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
160 | {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 160 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
161 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 161 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
162 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 162 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
163 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 163 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
164 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 164 | {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
165 | EndGlobalSection | 165 | {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
166 | GlobalSection(SolutionProperties) = preSolution | 166 | {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
167 | HideSolutionNode = FALSE | 167 | {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
168 | EndGlobalSection | 168 | {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
169 | {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
170 | {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
171 | {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
172 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
173 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
174 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
175 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
176 | {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
177 | {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
178 | {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
179 | {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
180 | {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
181 | {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
182 | {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
183 | {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
184 | {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
185 | {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
186 | {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
187 | {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
188 | {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
189 | {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
190 | {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
191 | {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
192 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
193 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
194 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
195 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
196 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
197 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
198 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
199 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
200 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
201 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
202 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
203 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
204 | {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
205 | {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
206 | {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
207 | {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
208 | {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
209 | {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
210 | {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
211 | {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
212 | {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
213 | {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
214 | {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
215 | {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
216 | {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
217 | {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
218 | {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
219 | {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
220 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
221 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
222 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
223 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
224 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
225 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
226 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
227 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
228 | {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
229 | {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
230 | {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
231 | {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
232 | {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
233 | {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
234 | {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
235 | {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
236 | {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
237 | {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
238 | {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
239 | {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
240 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
241 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
242 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
243 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
244 | EndGlobalSection | ||
245 | GlobalSection(SolutionProperties) = preSolution | ||
246 | HideSolutionNode = FALSE | ||
247 | EndGlobalSection | ||
169 | EndGlobal | 248 | EndGlobal |
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj index 0ee62e9..31ab172 100644 --- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj +++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj | |||
@@ -86,16 +86,16 @@ | |||
86 | </ProjectReference> | 86 | </ProjectReference> |
87 | </ItemGroup> | 87 | </ItemGroup> |
88 | <ItemGroup> | 88 | <ItemGroup> |
89 | <Compile Include="IUserServices.cs"> | 89 | <Compile Include="CommunicationsManager.cs"> |
90 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
91 | </Compile> | 91 | </Compile> |
92 | <Compile Include="IGridServices.cs"> | 92 | <Compile Include="IGridServices.cs"> |
93 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
94 | </Compile> | 94 | </Compile> |
95 | <Compile Include="CommunicationsManager.cs"> | 95 | <Compile Include="IInterRegionCommunications.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | <Compile Include="IInterRegionCommunications.cs"> | 98 | <Compile Include="IUserServices.cs"> |
99 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
100 | </Compile> | 100 | </Compile> |
101 | <Compile Include="Properties\AssemblyInfo.cs"> | 101 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build new file mode 100644 index 0000000..52d29f6 --- /dev/null +++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build | |||
@@ -0,0 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.Communications" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="CommunicationsManager.cs" /> | ||
15 | <include name="IGridServices.cs" /> | ||
16 | <include name="IInterRegionCommunications.cs" /> | ||
17 | <include name="IUserServices.cs" /> | ||
18 | <include name="Properties/AssemblyInfo.cs" /> | ||
19 | </sources> | ||
20 | <references basedir="${project::get-base-directory()}"> | ||
21 | <lib> | ||
22 | <include name="${project::get-base-directory()}" /> | ||
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
24 | </lib> | ||
25 | <include name="../../../bin/libsecondlife.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
27 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
28 | <include name="System.dll" /> | ||
29 | <include name="System.Xml.dll" /> | ||
30 | </references> | ||
31 | </csc> | ||
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
33 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
34 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
36 | <include name="*.dll"/> | ||
37 | <include name="*.exe"/> | ||
38 | </fileset> | ||
39 | </copy> | ||
40 | </target> | ||
41 | <target name="clean"> | ||
42 | <delete dir="${bin.dir}" failonerror="false" /> | ||
43 | <delete dir="${obj.dir}" failonerror="false" /> | ||
44 | </target> | ||
45 | <target name="doc" description="Creates documentation."> | ||
46 | </target> | ||
47 | </project> | ||
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj index c02a506..f3dcec5 100644 --- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj +++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj | |||
@@ -69,10 +69,10 @@ | |||
69 | <Compile Include="AssemblyInfo.cs"> | 69 | <Compile Include="AssemblyInfo.cs"> |
70 | <SubType>Code</SubType> | 70 | <SubType>Code</SubType> |
71 | </Compile> | 71 | </Compile> |
72 | <Compile Include="LogBase.cs"> | 72 | <Compile Include="ConsoleCallbacksBase.cs"> |
73 | <SubType>Code</SubType> | 73 | <SubType>Code</SubType> |
74 | </Compile> | 74 | </Compile> |
75 | <Compile Include="ConsoleCallbacksBase.cs"> | 75 | <Compile Include="LogBase.cs"> |
76 | <SubType>Code</SubType> | 76 | <SubType>Code</SubType> |
77 | </Compile> | 77 | </Compile> |
78 | <Compile Include="MainLog.cs"> | 78 | <Compile Include="MainLog.cs"> |
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build new file mode 100644 index 0000000..eb40c0d --- /dev/null +++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build | |||
@@ -0,0 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.Console" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="ConsoleCallbacksBase.cs" /> | ||
16 | <include name="LogBase.cs" /> | ||
17 | <include name="MainLog.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 | </references> | ||
26 | </csc> | ||
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
28 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
29 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
31 | <include name="*.dll"/> | ||
32 | <include name="*.exe"/> | ||
33 | </fileset> | ||
34 | </copy> | ||
35 | </target> | ||
36 | <target name="clean"> | ||
37 | <delete dir="${bin.dir}" failonerror="false" /> | ||
38 | <delete dir="${obj.dir}" failonerror="false" /> | ||
39 | </target> | ||
40 | <target name="doc" description="Creates documentation."> | ||
41 | </target> | ||
42 | </project> | ||
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj index f6e8311..b09cecf 100644 --- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj +++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj | |||
@@ -88,13 +88,13 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="DB4oUserData.cs"> | 91 | <Compile Include="DB4oGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="DB4oManager.cs"> | 94 | <Compile Include="DB4oManager.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="DB4oGridData.cs"> | 97 | <Compile Include="DB4oUserData.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="Properties\AssemblyInfo.cs"> | 100 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build new file mode 100644 index 0000000..f124eb5 --- /dev/null +++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build | |||
@@ -0,0 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.Data.DB4o" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="DB4oGridData.cs" /> | ||
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oUserData.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="../../../bin/Db4objects.Db4o.dll" /> | ||
25 | <include name="../../../bin/libsecondlife.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
27 | <include name="System.dll" /> | ||
28 | <include name="System.Data.dll" /> | ||
29 | <include name="System.Xml.dll" /> | ||
30 | </references> | ||
31 | </csc> | ||
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
33 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
34 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
36 | <include name="*.dll"/> | ||
37 | <include name="*.exe"/> | ||
38 | </fileset> | ||
39 | </copy> | ||
40 | </target> | ||
41 | <target name="clean"> | ||
42 | <delete dir="${bin.dir}" failonerror="false" /> | ||
43 | <delete dir="${obj.dir}" failonerror="false" /> | ||
44 | </target> | ||
45 | <target name="doc" description="Creates documentation."> | ||
46 | </target> | ||
47 | </project> | ||
diff --git a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build new file mode 100644 index 0000000..a2b2e3d --- /dev/null +++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build | |||
@@ -0,0 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.Data.MSSQL" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.Data.MSSQL" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="MSSQLGridData.cs" /> | ||
15 | <include name="MSSQLManager.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | <include name="System.Data.dll" /> | ||
27 | <include name="System.Xml.dll" /> | ||
28 | </references> | ||
29 | </csc> | ||
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/"/> | ||
32 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
34 | <include name="*.dll"/> | ||
35 | <include name="*.exe"/> | ||
36 | </fileset> | ||
37 | </copy> | ||
38 | </target> | ||
39 | <target name="clean"> | ||
40 | <delete dir="${bin.dir}" failonerror="false" /> | ||
41 | <delete dir="${obj.dir}" failonerror="false" /> | ||
42 | </target> | ||
43 | <target name="doc" description="Creates documentation."> | ||
44 | </target> | ||
45 | </project> | ||
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj index 09a32b5..62e3887 100644 --- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj +++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj | |||
@@ -88,19 +88,19 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="MySQLInventoryData.cs"> | 91 | <Compile Include="MySQLGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="MySQLUserData.cs"> | 94 | <Compile Include="MySQLInventoryData.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="MySQLManager.cs"> | 97 | <Compile Include="MySQLLogData.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="MySQLLogData.cs"> | 100 | <Compile Include="MySQLManager.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="MySQLGridData.cs"> | 103 | <Compile Include="MySQLUserData.cs"> |
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | <Compile Include="Properties\AssemblyInfo.cs"> | 106 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build new file mode 100644 index 0000000..594ec52 --- /dev/null +++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build | |||
@@ -0,0 +1,49 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.Data.MySQL" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="MySQLGridData.cs" /> | ||
15 | <include name="MySQLInventoryData.cs" /> | ||
16 | <include name="MySQLLogData.cs" /> | ||
17 | <include name="MySQLManager.cs" /> | ||
18 | <include name="MySQLUserData.cs" /> | ||
19 | <include name="Properties/AssemblyInfo.cs" /> | ||
20 | </sources> | ||
21 | <references basedir="${project::get-base-directory()}"> | ||
22 | <lib> | ||
23 | <include name="${project::get-base-directory()}" /> | ||
24 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
25 | </lib> | ||
26 | <include name="../../../bin/libsecondlife.dll" /> | ||
27 | <include name="../../../bin/MySql.Data.dll" /> | ||
28 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
29 | <include name="System.dll" /> | ||
30 | <include name="System.Data.dll" /> | ||
31 | <include name="System.Xml.dll" /> | ||
32 | </references> | ||
33 | </csc> | ||
34 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
35 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
36 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
37 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
38 | <include name="*.dll"/> | ||
39 | <include name="*.exe"/> | ||
40 | </fileset> | ||
41 | </copy> | ||
42 | </target> | ||
43 | <target name="clean"> | ||
44 | <delete dir="${bin.dir}" failonerror="false" /> | ||
45 | <delete dir="${obj.dir}" failonerror="false" /> | ||
46 | </target> | ||
47 | <target name="doc" description="Creates documentation."> | ||
48 | </target> | ||
49 | </project> | ||
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj index dab22ea..4ba24f1 100644 --- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj +++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj | |||
@@ -88,10 +88,10 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="SQLiteManager.cs"> | 91 | <Compile Include="SQLiteGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="SQLiteGridData.cs"> | 94 | <Compile Include="SQLiteManager.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="Properties\AssemblyInfo.cs"> | 97 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build new file mode 100644 index 0000000..e28d0a6 --- /dev/null +++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build | |||
@@ -0,0 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.Data.SQLite" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="SQLiteGridData.cs" /> | ||
15 | <include name="SQLiteManager.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | <include name="System.Data.dll" /> | ||
27 | <include name="../../../bin/System.Data.SQLite.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
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/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj index 47b9ba3..dcafbcd 100644 --- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj | |||
@@ -78,15 +78,9 @@ | |||
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | </ItemGroup> | 79 | </ItemGroup> |
80 | <ItemGroup> | 80 | <ItemGroup> |
81 | <Compile Include="ReservationData.cs"> | ||
82 | <SubType>Code</SubType> | ||
83 | </Compile> | ||
84 | <Compile Include="GridData.cs"> | 81 | <Compile Include="GridData.cs"> |
85 | <SubType>Code</SubType> | 82 | <SubType>Code</SubType> |
86 | </Compile> | 83 | </Compile> |
87 | <Compile Include="SimProfileData.cs"> | ||
88 | <SubType>Code</SubType> | ||
89 | </Compile> | ||
90 | <Compile Include="ILogData.cs"> | 84 | <Compile Include="ILogData.cs"> |
91 | <SubType>Code</SubType> | 85 | <SubType>Code</SubType> |
92 | </Compile> | 86 | </Compile> |
@@ -96,6 +90,12 @@ | |||
96 | <Compile Include="InventoryData.cs"> | 90 | <Compile Include="InventoryData.cs"> |
97 | <SubType>Code</SubType> | 91 | <SubType>Code</SubType> |
98 | </Compile> | 92 | </Compile> |
93 | <Compile Include="ReservationData.cs"> | ||
94 | <SubType>Code</SubType> | ||
95 | </Compile> | ||
96 | <Compile Include="SimProfileData.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
99 | <Compile Include="UserData.cs"> | 99 | <Compile Include="UserData.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build new file mode 100644 index 0000000..aefb02b --- /dev/null +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build | |||
@@ -0,0 +1,50 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.Data" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="GridData.cs" /> | ||
15 | <include name="ILogData.cs" /> | ||
16 | <include name="IniConfig.cs" /> | ||
17 | <include name="InventoryData.cs" /> | ||
18 | <include name="ReservationData.cs" /> | ||
19 | <include name="SimProfileData.cs" /> | ||
20 | <include name="UserData.cs" /> | ||
21 | <include name="UserProfileData.cs" /> | ||
22 | <include name="Properties/AssemblyInfo.cs" /> | ||
23 | </sources> | ||
24 | <references basedir="${project::get-base-directory()}"> | ||
25 | <lib> | ||
26 | <include name="${project::get-base-directory()}" /> | ||
27 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
28 | </lib> | ||
29 | <include name="../../../bin/libsecondlife.dll" /> | ||
30 | <include name="System.dll" /> | ||
31 | <include name="System.Data.dll" /> | ||
32 | <include name="System.Xml.dll" /> | ||
33 | </references> | ||
34 | </csc> | ||
35 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
36 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
37 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
38 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
39 | <include name="*.dll"/> | ||
40 | <include name="*.exe"/> | ||
41 | </fileset> | ||
42 | </copy> | ||
43 | </target> | ||
44 | <target name="clean"> | ||
45 | <delete dir="${bin.dir}" failonerror="false" /> | ||
46 | <delete dir="${obj.dir}" failonerror="false" /> | ||
47 | </target> | ||
48 | <target name="doc" description="Creates documentation."> | ||
49 | </target> | ||
50 | </project> | ||
diff --git a/OpenSim/Framework/General/LLSDHelpers.cs b/OpenSim/Framework/General/LLSDHelpers.cs deleted file mode 100644 index 051520c..0000000 --- a/OpenSim/Framework/General/LLSDHelpers.cs +++ /dev/null | |||
@@ -1,246 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections; | ||
3 | using System.Collections.Generic; | ||
4 | using System.Text; | ||
5 | using System.IO; | ||
6 | using System.Xml; | ||
7 | using libsecondlife; | ||
8 | |||
9 | namespace OpenSim.Framework | ||
10 | { | ||
11 | public class LLSDHelpers | ||
12 | { | ||
13 | public static string SerialiseLLSDReply(object obj) | ||
14 | { | ||
15 | StringWriter sw = new StringWriter(); | ||
16 | XmlTextWriter writer = new XmlTextWriter(sw); | ||
17 | writer.Formatting = Formatting.None; | ||
18 | writer.WriteStartElement(String.Empty, "llsd", String.Empty); | ||
19 | LLSDHelpers.SerializeLLSDType(writer, obj); | ||
20 | writer.WriteEndElement(); | ||
21 | writer.Close(); | ||
22 | return sw.ToString(); | ||
23 | } | ||
24 | |||
25 | public static void SerializeLLSDType(XmlTextWriter writer, object obj) | ||
26 | { | ||
27 | Type myType = obj.GetType(); | ||
28 | LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false); | ||
29 | if (llsdattributes.Length > 0) | ||
30 | { | ||
31 | switch (llsdattributes[0].ObjectType) | ||
32 | { | ||
33 | case "MAP": | ||
34 | writer.WriteStartElement(String.Empty, "map", String.Empty); | ||
35 | System.Reflection.FieldInfo[] fields = myType.GetFields(); | ||
36 | for (int i = 0; i < fields.Length; i++) | ||
37 | { | ||
38 | object fieldValue = fields[i].GetValue(obj); | ||
39 | LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false); | ||
40 | if (fieldAttributes.Length > 0) | ||
41 | { | ||
42 | writer.WriteStartElement(String.Empty, "key", String.Empty); | ||
43 | writer.WriteString(fields[i].Name); | ||
44 | writer.WriteEndElement(); | ||
45 | SerializeLLSDType(writer, fieldValue); | ||
46 | } | ||
47 | else | ||
48 | { | ||
49 | //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType()); | ||
50 | writer.WriteStartElement(String.Empty, "key", String.Empty); | ||
51 | writer.WriteString(fields[i].Name); | ||
52 | writer.WriteEndElement(); | ||
53 | LLSD.LLSDWriteOne(writer, fieldValue); | ||
54 | } | ||
55 | } | ||
56 | writer.WriteEndElement(); | ||
57 | break; | ||
58 | case "ARRAY": | ||
59 | // LLSDArray arrayObject = obj as LLSDArray; | ||
60 | // ArrayList a = arrayObject.Array; | ||
61 | ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj); | ||
62 | writer.WriteStartElement(String.Empty, "array", String.Empty); | ||
63 | foreach (object item in a) | ||
64 | { | ||
65 | SerializeLLSDType(writer, item); | ||
66 | } | ||
67 | writer.WriteEndElement(); | ||
68 | break; | ||
69 | } | ||
70 | } | ||
71 | else | ||
72 | { | ||
73 | LLSD.LLSDWriteOne(writer, obj); | ||
74 | } | ||
75 | } | ||
76 | |||
77 | public static object DeserialiseLLSDMap(Hashtable llsd, object obj) | ||
78 | { | ||
79 | Type myType = obj.GetType(); | ||
80 | LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false); | ||
81 | if (llsdattributes.Length > 0) | ||
82 | { | ||
83 | switch (llsdattributes[0].ObjectType) | ||
84 | { | ||
85 | case "MAP": | ||
86 | IDictionaryEnumerator enumerator = llsd.GetEnumerator(); | ||
87 | while (enumerator.MoveNext()) | ||
88 | { | ||
89 | System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key); | ||
90 | if (field != null) | ||
91 | { | ||
92 | if (enumerator.Value is Hashtable) | ||
93 | { | ||
94 | object fieldValue = field.GetValue(obj); | ||
95 | DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue); | ||
96 | } | ||
97 | else if (enumerator.Value is ArrayList) | ||
98 | { | ||
99 | object fieldValue = field.GetValue(obj); | ||
100 | fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value); | ||
101 | //TODO | ||
102 | // the LLSD map/array types in the array need to be deserialised | ||
103 | // but first we need to know the right class to deserialise them into. | ||
104 | } | ||
105 | else | ||
106 | { | ||
107 | field.SetValue(obj, enumerator.Value); | ||
108 | } | ||
109 | } | ||
110 | } | ||
111 | break; | ||
112 | } | ||
113 | } | ||
114 | return obj; | ||
115 | } | ||
116 | } | ||
117 | |||
118 | [LLSDType("MAP")] | ||
119 | public class LLSDMapLayerResponse | ||
120 | { | ||
121 | public LLSDMapRequest AgentData = new LLSDMapRequest(); | ||
122 | public LLSDArray LayerData = new LLSDArray(); | ||
123 | |||
124 | public LLSDMapLayerResponse() | ||
125 | { | ||
126 | |||
127 | } | ||
128 | } | ||
129 | |||
130 | [LLSDType("MAP")] | ||
131 | public class LLSDCapsDetails | ||
132 | { | ||
133 | public string MapLayer = ""; | ||
134 | public string NewFileAgentInventory = ""; | ||
135 | //public string EventQueueGet = ""; | ||
136 | |||
137 | public LLSDCapsDetails() | ||
138 | { | ||
139 | |||
140 | } | ||
141 | } | ||
142 | |||
143 | [LLSDType("MAP")] | ||
144 | public class LLSDMapLayer | ||
145 | { | ||
146 | public int Left = 0; | ||
147 | public int Right = 0; | ||
148 | public int Top = 0; | ||
149 | public int Bottom = 0; | ||
150 | public LLUUID ImageID = LLUUID.Zero; | ||
151 | |||
152 | public LLSDMapLayer() | ||
153 | { | ||
154 | |||
155 | } | ||
156 | } | ||
157 | |||
158 | [LLSDType("ARRAY")] | ||
159 | public class LLSDArray | ||
160 | { | ||
161 | public ArrayList Array = new ArrayList(); | ||
162 | |||
163 | public LLSDArray() | ||
164 | { | ||
165 | |||
166 | } | ||
167 | } | ||
168 | |||
169 | [LLSDType("MAP")] | ||
170 | public class LLSDMapRequest | ||
171 | { | ||
172 | public int Flags = 0; | ||
173 | |||
174 | public LLSDMapRequest() | ||
175 | { | ||
176 | |||
177 | } | ||
178 | } | ||
179 | |||
180 | [LLSDType("MAP")] | ||
181 | public class LLSDUploadReply | ||
182 | { | ||
183 | public string new_asset = ""; | ||
184 | public LLUUID new_inventory_item = LLUUID.Zero; | ||
185 | public string state = ""; | ||
186 | |||
187 | public LLSDUploadReply() | ||
188 | { | ||
189 | |||
190 | } | ||
191 | } | ||
192 | |||
193 | [LLSDType("MAP")] | ||
194 | public class LLSDCapEvent | ||
195 | { | ||
196 | public int id = 0; | ||
197 | public LLSDArray events = new LLSDArray(); | ||
198 | |||
199 | public LLSDCapEvent() | ||
200 | { | ||
201 | |||
202 | } | ||
203 | } | ||
204 | |||
205 | [LLSDType("MAP")] | ||
206 | public class LLSDEmpty | ||
207 | { | ||
208 | public LLSDEmpty() | ||
209 | { | ||
210 | |||
211 | } | ||
212 | } | ||
213 | |||
214 | [LLSDType("MAP")] | ||
215 | public class LLSDTest | ||
216 | { | ||
217 | public int Test1 = 20; | ||
218 | public int Test2 = 10; | ||
219 | |||
220 | public LLSDTest() | ||
221 | { | ||
222 | |||
223 | } | ||
224 | } | ||
225 | |||
226 | |||
227 | [AttributeUsage(AttributeTargets.Class)] | ||
228 | public class LLSDType : Attribute | ||
229 | { | ||
230 | private string myType; | ||
231 | |||
232 | public LLSDType(string type) | ||
233 | { | ||
234 | myType = type; | ||
235 | |||
236 | } | ||
237 | |||
238 | public string ObjectType | ||
239 | { | ||
240 | get | ||
241 | { | ||
242 | return myType; | ||
243 | } | ||
244 | } | ||
245 | } | ||
246 | } | ||
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj index 3e77f1e..d18e583 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.csproj +++ b/OpenSim/Framework/General/OpenSim.Framework.csproj | |||
@@ -91,115 +91,112 @@ | |||
91 | <Compile Include="AgentInventory.cs"> | 91 | <Compile Include="AgentInventory.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="Util.cs"> | 94 | <Compile Include="AuthenticateSessionBase.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="AuthenticateSessionBase.cs"> | 97 | <Compile Include="BlockingQueue.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="Logger.cs"> | 100 | <Compile Include="IRegionCommsListener.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="LLSDHelpers.cs"> | 103 | <Compile Include="Logger.cs"> |
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | <Compile Include="Remoting.cs"> | 106 | <Compile Include="LoginService.cs"> |
107 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
108 | </Compile> | 108 | </Compile> |
109 | <Compile Include="RegionCommsListener.cs"> | 109 | <Compile Include="RegionCommsListener.cs"> |
110 | <SubType>Code</SubType> | 110 | <SubType>Code</SubType> |
111 | </Compile> | 111 | </Compile> |
112 | <Compile Include="LoginService.cs"> | 112 | <Compile Include="Remoting.cs"> |
113 | <SubType>Code</SubType> | 113 | <SubType>Code</SubType> |
114 | </Compile> | 114 | </Compile> |
115 | <Compile Include="BlockingQueue.cs"> | 115 | <Compile Include="SimProfile.cs"> |
116 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
117 | </Compile> | 117 | </Compile> |
118 | <Compile Include="UserProfile.cs"> | 118 | <Compile Include="UserProfile.cs"> |
119 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
120 | </Compile> | 120 | </Compile> |
121 | <Compile Include="IRegionCommsListener.cs"> | 121 | <Compile Include="Util.cs"> |
122 | <SubType>Code</SubType> | ||
123 | </Compile> | ||
124 | <Compile Include="SimProfile.cs"> | ||
125 | <SubType>Code</SubType> | 122 | <SubType>Code</SubType> |
126 | </Compile> | 123 | </Compile> |
127 | <Compile Include="Interfaces\AuthenticateResponse.cs"> | 124 | <Compile Include="Interfaces\AuthenticateResponse.cs"> |
128 | <SubType>Code</SubType> | 125 | <SubType>Code</SubType> |
129 | </Compile> | 126 | </Compile> |
130 | <Compile Include="Interfaces\IUserServer.cs"> | ||
131 | <SubType>Code</SubType> | ||
132 | </Compile> | ||
133 | <Compile Include="Interfaces\IAssetServer.cs"> | 127 | <Compile Include="Interfaces\IAssetServer.cs"> |
134 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
135 | </Compile> | 129 | </Compile> |
136 | <Compile Include="Interfaces\IWorld.cs"> | ||
137 | <SubType>Code</SubType> | ||
138 | </Compile> | ||
139 | <Compile Include="Interfaces\IClientAPI.cs"> | 130 | <Compile Include="Interfaces\IClientAPI.cs"> |
140 | <SubType>Code</SubType> | 131 | <SubType>Code</SubType> |
141 | </Compile> | 132 | </Compile> |
142 | <Compile Include="Interfaces\ILocalStorage.cs"> | 133 | <Compile Include="Interfaces\ILocalStorage.cs"> |
143 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
144 | </Compile> | 135 | </Compile> |
145 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> | 136 | <Compile Include="Interfaces\IUserServer.cs"> |
146 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
147 | </Compile> | 138 | </Compile> |
148 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> | 139 | <Compile Include="Interfaces\IWorld.cs"> |
149 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
150 | </Compile> | 141 | </Compile> |
151 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> | 142 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> |
152 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
153 | </Compile> | 144 | </Compile> |
145 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | ||
146 | <SubType>Code</SubType> | ||
147 | </Compile> | ||
154 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | 148 | <Compile Include="Interfaces\Config\IUserConfig.cs"> |
155 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
156 | </Compile> | 150 | </Compile> |
157 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | 151 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> |
152 | <SubType>Code</SubType> | ||
153 | </Compile> | ||
154 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> | ||
158 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
159 | </Compile> | 156 | </Compile> |
160 | <Compile Include="Properties\AssemblyInfo.cs"> | 157 | <Compile Include="Properties\AssemblyInfo.cs"> |
161 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
162 | </Compile> | 159 | </Compile> |
163 | <Compile Include="Types\NeighbourInfo.cs"> | 160 | <Compile Include="Types\AgentCiruitData.cs"> |
164 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
165 | </Compile> | 162 | </Compile> |
166 | <Compile Include="Types\NetworkServersInfo.cs"> | 163 | <Compile Include="Types\AgentWearable.cs"> |
167 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
168 | </Compile> | 165 | </Compile> |
169 | <Compile Include="Types\RegionHandle.cs"> | 166 | <Compile Include="Types\AssetBase.cs"> |
170 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
171 | </Compile> | 168 | </Compile> |
172 | <Compile Include="Types\RegionInfo.cs"> | 169 | <Compile Include="Types\AssetLandmark.cs"> |
173 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
174 | </Compile> | 171 | </Compile> |
175 | <Compile Include="Types\ParcelData.cs"> | 172 | <Compile Include="Types\AssetStorage.cs"> |
176 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
177 | </Compile> | 174 | </Compile> |
178 | <Compile Include="Types\AgentWearable.cs"> | 175 | <Compile Include="Types\EstateSettings.cs"> |
179 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
180 | </Compile> | 177 | </Compile> |
181 | <Compile Include="Types\PrimData.cs"> | 178 | <Compile Include="Types\Login.cs"> |
182 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
183 | </Compile> | 180 | </Compile> |
184 | <Compile Include="Types\MapBlockData.cs"> | 181 | <Compile Include="Types\MapBlockData.cs"> |
185 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
186 | </Compile> | 183 | </Compile> |
187 | <Compile Include="Types\AssetStorage.cs"> | 184 | <Compile Include="Types\NeighbourInfo.cs"> |
188 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
189 | </Compile> | 186 | </Compile> |
190 | <Compile Include="Types\EstateSettings.cs"> | 187 | <Compile Include="Types\NetworkServersInfo.cs"> |
191 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
192 | </Compile> | 189 | </Compile> |
193 | <Compile Include="Types\AgentCiruitData.cs"> | 190 | <Compile Include="Types\ParcelData.cs"> |
194 | <SubType>Code</SubType> | 191 | <SubType>Code</SubType> |
195 | </Compile> | 192 | </Compile> |
196 | <Compile Include="Types\Login.cs"> | 193 | <Compile Include="Types\PrimData.cs"> |
197 | <SubType>Code</SubType> | 194 | <SubType>Code</SubType> |
198 | </Compile> | 195 | </Compile> |
199 | <Compile Include="Types\AssetLandmark.cs"> | 196 | <Compile Include="Types\RegionHandle.cs"> |
200 | <SubType>Code</SubType> | 197 | <SubType>Code</SubType> |
201 | </Compile> | 198 | </Compile> |
202 | <Compile Include="Types\AssetBase.cs"> | 199 | <Compile Include="Types\RegionInfo.cs"> |
203 | <SubType>Code</SubType> | 200 | <SubType>Code</SubType> |
204 | </Compile> | 201 | </Compile> |
205 | </ItemGroup> | 202 | </ItemGroup> |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build new file mode 100644 index 0000000..04e3382 --- /dev/null +++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build | |||
@@ -0,0 +1,80 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AgentInventory.cs" /> | ||
15 | <include name="AuthenticateSessionBase.cs" /> | ||
16 | <include name="BlockingQueue.cs" /> | ||
17 | <include name="IRegionCommsListener.cs" /> | ||
18 | <include name="Logger.cs" /> | ||
19 | <include name="LoginService.cs" /> | ||
20 | <include name="RegionCommsListener.cs" /> | ||
21 | <include name="Remoting.cs" /> | ||
22 | <include name="SimProfile.cs" /> | ||
23 | <include name="UserProfile.cs" /> | ||
24 | <include name="Util.cs" /> | ||
25 | <include name="Interfaces/AuthenticateResponse.cs" /> | ||
26 | <include name="Interfaces/IAssetServer.cs" /> | ||
27 | <include name="Interfaces/IClientAPI.cs" /> | ||
28 | <include name="Interfaces/ILocalStorage.cs" /> | ||
29 | <include name="Interfaces/IUserServer.cs" /> | ||
30 | <include name="Interfaces/IWorld.cs" /> | ||
31 | <include name="Interfaces/Config/IGenericConfig.cs" /> | ||
32 | <include name="Interfaces/Config/IGridConfig.cs" /> | ||
33 | <include name="Interfaces/Config/IUserConfig.cs" /> | ||
34 | <include name="Interfaces/Scripting/IScriptAPI.cs" /> | ||
35 | <include name="Interfaces/Scripting/IScriptEngine.cs" /> | ||
36 | <include name="Properties/AssemblyInfo.cs" /> | ||
37 | <include name="Types/AgentCiruitData.cs" /> | ||
38 | <include name="Types/AgentWearable.cs" /> | ||
39 | <include name="Types/AssetBase.cs" /> | ||
40 | <include name="Types/AssetLandmark.cs" /> | ||
41 | <include name="Types/AssetStorage.cs" /> | ||
42 | <include name="Types/EstateSettings.cs" /> | ||
43 | <include name="Types/Login.cs" /> | ||
44 | <include name="Types/MapBlockData.cs" /> | ||
45 | <include name="Types/NeighbourInfo.cs" /> | ||
46 | <include name="Types/NetworkServersInfo.cs" /> | ||
47 | <include name="Types/ParcelData.cs" /> | ||
48 | <include name="Types/PrimData.cs" /> | ||
49 | <include name="Types/RegionHandle.cs" /> | ||
50 | <include name="Types/RegionInfo.cs" /> | ||
51 | </sources> | ||
52 | <references basedir="${project::get-base-directory()}"> | ||
53 | <lib> | ||
54 | <include name="${project::get-base-directory()}" /> | ||
55 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
56 | </lib> | ||
57 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
58 | <include name="../../../bin/libsecondlife.dll" /> | ||
59 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
60 | <include name="System.dll" /> | ||
61 | <include name="System.Xml.dll" /> | ||
62 | <include name="../../../bin/XMLRPC.dll" /> | ||
63 | </references> | ||
64 | </csc> | ||
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/"/> | ||
67 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
69 | <include name="*.dll"/> | ||
70 | <include name="*.exe"/> | ||
71 | </fileset> | ||
72 | </copy> | ||
73 | </target> | ||
74 | <target name="clean"> | ||
75 | <delete dir="${bin.dir}" failonerror="false" /> | ||
76 | <delete dir="${obj.dir}" failonerror="false" /> | ||
77 | </target> | ||
78 | <target name="doc" description="Creates documentation."> | ||
79 | </target> | ||
80 | </project> | ||
diff --git a/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build new file mode 100644 index 0000000..a4617cc --- /dev/null +++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build | |||
@@ -0,0 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.GenericConfig.Xml" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.GenericConfig.Xml" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="XmlConfig.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="../../../../bin/OpenSim.Framework.dll" /> | ||
23 | <include name="System.dll" /> | ||
24 | <include name="System.Xml.dll" /> | ||
25 | </references> | ||
26 | </csc> | ||
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
28 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
29 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
31 | <include name="*.dll"/> | ||
32 | <include name="*.exe"/> | ||
33 | </fileset> | ||
34 | </copy> | ||
35 | </target> | ||
36 | <target name="clean"> | ||
37 | <delete dir="${bin.dir}" failonerror="false" /> | ||
38 | <delete dir="${obj.dir}" failonerror="false" /> | ||
39 | </target> | ||
40 | <target name="doc" description="Creates documentation."> | ||
41 | </target> | ||
42 | </project> | ||
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj index 5262224..399f456 100644 --- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj | |||
@@ -93,16 +93,16 @@ | |||
93 | <Compile Include="BaseHttpServer.cs"> | 93 | <Compile Include="BaseHttpServer.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="IRestHandler.cs"> | 96 | <Compile Include="CheckSumServer.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="XmlRpcMethod.cs"> | 99 | <Compile Include="IRestHandler.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | <Compile Include="CheckSumServer.cs"> | 102 | <Compile Include="UDPServerBase.cs"> |
103 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
104 | </Compile> | 104 | </Compile> |
105 | <Compile Include="UDPServerBase.cs"> | 105 | <Compile Include="XmlRpcMethod.cs"> |
106 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
107 | </Compile> | 107 | </Compile> |
108 | </ItemGroup> | 108 | </ItemGroup> |
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build new file mode 100644 index 0000000..7401b07 --- /dev/null +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build | |||
@@ -0,0 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.Servers" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="BaseHttpServer.cs" /> | ||
15 | <include name="CheckSumServer.cs" /> | ||
16 | <include name="IRestHandler.cs" /> | ||
17 | <include name="UDPServerBase.cs" /> | ||
18 | <include name="XmlRpcMethod.cs" /> | ||
19 | </sources> | ||
20 | <references basedir="${project::get-base-directory()}"> | ||
21 | <lib> | ||
22 | <include name="${project::get-base-directory()}" /> | ||
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
24 | </lib> | ||
25 | <include name="../../../bin/libsecondlife.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
27 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
28 | <include name="System.dll" /> | ||
29 | <include name="System.Xml.dll" /> | ||
30 | <include name="../../../bin/XMLRPC.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/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj index 60c4b2f..02aa3f3 100644 --- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj +++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj | |||
@@ -108,10 +108,10 @@ | |||
108 | </ProjectReference> | 108 | </ProjectReference> |
109 | </ItemGroup> | 109 | </ItemGroup> |
110 | <ItemGroup> | 110 | <ItemGroup> |
111 | <Compile Include="UserManagerBase.cs"> | 111 | <Compile Include="LoginResponse.cs"> |
112 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
113 | </Compile> | 113 | </Compile> |
114 | <Compile Include="LoginResponse.cs"> | 114 | <Compile Include="UserManagerBase.cs"> |
115 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
116 | </Compile> | 116 | </Compile> |
117 | </ItemGroup> | 117 | </ItemGroup> |
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build new file mode 100644 index 0000000..3ea339b --- /dev/null +++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build | |||
@@ -0,0 +1,50 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Framework.UserManagement" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="LoginResponse.cs" /> | ||
15 | <include name="UserManagerBase.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="../../../bin/Db4objects.Db4o.dll" /> | ||
23 | <include name="../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
27 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | ||
28 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
29 | <include name="System.dll" /> | ||
30 | <include name="System.Data.dll" /> | ||
31 | <include name="System.Xml.dll" /> | ||
32 | <include name="../../../bin/XMLRPC.dll" /> | ||
33 | </references> | ||
34 | </csc> | ||
35 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
36 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
37 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
38 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
39 | <include name="*.dll"/> | ||
40 | <include name="*.exe"/> | ||
41 | </fileset> | ||
42 | </copy> | ||
43 | </target> | ||
44 | <target name="clean"> | ||
45 | <delete dir="${bin.dir}" failonerror="false" /> | ||
46 | <delete dir="${obj.dir}" failonerror="false" /> | ||
47 | </target> | ||
48 | <target name="doc" description="Creates documentation."> | ||
49 | </target> | ||
50 | </project> | ||
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj index 945b7a5..caebca3 100644 --- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj +++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj | |||
@@ -98,10 +98,10 @@ | |||
98 | <ItemGroup> | 98 | <ItemGroup> |
99 | </ItemGroup> | 99 | </ItemGroup> |
100 | <ItemGroup> | 100 | <ItemGroup> |
101 | <Compile Include="Main.cs"> | 101 | <Compile Include="AssetHttpServer.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="AssetHttpServer.cs"> | 104 | <Compile Include="Main.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | <Compile Include="Properties\AssemblyInfo.cs"> | 107 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build new file mode 100644 index 0000000..88724f6 --- /dev/null +++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build | |||
@@ -0,0 +1,49 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Grid.AssetServer" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
9 | </copy> | ||
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssetHttpServer.cs" /> | ||
15 | <include name="Main.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
24 | <include name="../../../bin/libsecondlife.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
27 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
28 | <include name="System.dll" /> | ||
29 | <include name="System.Data.dll" /> | ||
30 | <include name="System.Xml.dll" /> | ||
31 | <include name="../../../bin/XMLRPC.dll" /> | ||
32 | </references> | ||
33 | </csc> | ||
34 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
35 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
36 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
37 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
38 | <include name="*.dll"/> | ||
39 | <include name="*.exe"/> | ||
40 | </fileset> | ||
41 | </copy> | ||
42 | </target> | ||
43 | <target name="clean"> | ||
44 | <delete dir="${bin.dir}" failonerror="false" /> | ||
45 | <delete dir="${obj.dir}" failonerror="false" /> | ||
46 | </target> | ||
47 | <target name="doc" description="Creates documentation."> | ||
48 | </target> | ||
49 | </project> | ||
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build new file mode 100644 index 0000000..8e9f026 --- /dev/null +++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build | |||
@@ -0,0 +1,44 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Grid.Framework.Manager" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Grid.Framework.Manager" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="GridManagementAgent.cs" /> | ||
15 | <include name="GridServerManager.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="../../../bin/libsecondlife.dll" /> | ||
23 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | <include name="../../../bin/XMLRPC.dll" /> | ||
27 | </references> | ||
28 | </csc> | ||
29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
30 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
31 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
32 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
33 | <include name="*.dll"/> | ||
34 | <include name="*.exe"/> | ||
35 | </fileset> | ||
36 | </copy> | ||
37 | </target> | ||
38 | <target name="clean"> | ||
39 | <delete dir="${bin.dir}" failonerror="false" /> | ||
40 | <delete dir="${obj.dir}" failonerror="false" /> | ||
41 | </target> | ||
42 | <target name="doc" description="Creates documentation."> | ||
43 | </target> | ||
44 | </project> | ||
diff --git a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build new file mode 100644 index 0000000..cdf09e1 --- /dev/null +++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build | |||
@@ -0,0 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Grid.GridServer.Config" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Grid.GridServer.Config" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="DbGridConfig.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="../../../bin/Db4objects.Db4o.dll" /> | ||
23 | <include name="../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Data.dll.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
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/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build new file mode 100644 index 0000000..4cadf1d --- /dev/null +++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build | |||
@@ -0,0 +1,52 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Grid.GridServer" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
9 | </copy> | ||
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="GridManager.cs" /> | ||
15 | <include name="Main.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
24 | <include name="../../../bin/libsecondlife.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
27 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
28 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | ||
29 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
30 | <include name="../../../bin/OpenSim.Grid.Framework.Manager.dll" /> | ||
31 | <include name="System.dll" /> | ||
32 | <include name="System.Data.dll" /> | ||
33 | <include name="System.Xml.dll" /> | ||
34 | <include name="../../../bin/XMLRPC.dll" /> | ||
35 | </references> | ||
36 | </csc> | ||
37 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
38 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
39 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
40 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
41 | <include name="*.dll"/> | ||
42 | <include name="*.exe"/> | ||
43 | </fileset> | ||
44 | </copy> | ||
45 | </target> | ||
46 | <target name="clean"> | ||
47 | <delete dir="${bin.dir}" failonerror="false" /> | ||
48 | <delete dir="${obj.dir}" failonerror="false" /> | ||
49 | </target> | ||
50 | <target name="doc" description="Creates documentation."> | ||
51 | </target> | ||
52 | </project> | ||
diff --git a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build new file mode 100644 index 0000000..a427765 --- /dev/null +++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build | |||
@@ -0,0 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Grid.UserServer.Config" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Grid.UserServer.Config" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="DbUserConfig.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="../../../bin/Db4objects.Db4o.dll" /> | ||
23 | <include name="../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Data.dll.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
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/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build new file mode 100644 index 0000000..50c9788 --- /dev/null +++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build | |||
@@ -0,0 +1,52 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Grid.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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="Main.cs" /> | ||
15 | <include name="UserManager.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
24 | <include name="../../../bin/libsecondlife.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
27 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
28 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | ||
29 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
30 | <include name="../../../bin/OpenSim.Framework.UserManagement.dll" /> | ||
31 | <include name="System.dll" /> | ||
32 | <include name="System.Data.dll" /> | ||
33 | <include name="System.Xml.dll" /> | ||
34 | <include name="../../../bin/XMLRPC.dll" /> | ||
35 | </references> | ||
36 | </csc> | ||
37 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
38 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
39 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
40 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
41 | <include name="*.dll"/> | ||
42 | <include name="*.exe"/> | ||
43 | </fileset> | ||
44 | </copy> | ||
45 | </target> | ||
46 | <target name="clean"> | ||
47 | <delete dir="${bin.dir}" failonerror="false" /> | ||
48 | <delete dir="${obj.dir}" failonerror="false" /> | ||
49 | </target> | ||
50 | <target name="doc" description="Creates documentation."> | ||
51 | </target> | ||
52 | </project> | ||
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj index 3801067..5cefa96 100644 --- a/OpenSim/Region/Application/OpenSim.csproj +++ b/OpenSim/Region/Application/OpenSim.csproj | |||
@@ -167,10 +167,10 @@ | |||
167 | <Compile Include="Application.cs"> | 167 | <Compile Include="Application.cs"> |
168 | <SubType>Code</SubType> | 168 | <SubType>Code</SubType> |
169 | </Compile> | 169 | </Compile> |
170 | <Compile Include="VersionInfo.cs"> | 170 | <Compile Include="OpenSimMain.cs"> |
171 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
172 | </Compile> | 172 | </Compile> |
173 | <Compile Include="OpenSimMain.cs"> | 173 | <Compile Include="VersionInfo.cs"> |
174 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
175 | </Compile> | 175 | </Compile> |
176 | </ItemGroup> | 176 | </ItemGroup> |
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build new file mode 100644 index 0000000..74eee5b --- /dev/null +++ b/OpenSim/Region/Application/OpenSim.exe.build | |||
@@ -0,0 +1,59 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
9 | </copy> | ||
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="OpenSim" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="Application.cs" /> | ||
15 | <include name="OpenSimMain.cs" /> | ||
16 | <include name="VersionInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | ||
24 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
25 | <include name="../../../bin/libsecondlife.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
27 | <include name="../../../bin/OpenSim.Framework.Communications.dll" /> | ||
28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
29 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | ||
30 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
31 | <include name="../../../bin/OpenSim.Framework.UserManagement.dll" /> | ||
32 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
33 | <include name="../../../bin/OpenSim.Region.ClientStack.dll" /> | ||
34 | <include name="../../../bin/OpenSim.Region.Communications.Local.dll" /> | ||
35 | <include name="../../../bin/OpenSim.Region.Communications.OGS1.dll" /> | ||
36 | <include name="../../../bin/OpenSim.Region.Environment.dll" /> | ||
37 | <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
38 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> | ||
39 | <include name="System.dll" /> | ||
40 | <include name="System.Xml.dll" /> | ||
41 | <include name="../../../bin/XMLRPC.dll" /> | ||
42 | </references> | ||
43 | </csc> | ||
44 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
45 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
46 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
47 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
48 | <include name="*.dll"/> | ||
49 | <include name="*.exe"/> | ||
50 | </fileset> | ||
51 | </copy> | ||
52 | </target> | ||
53 | <target name="clean"> | ||
54 | <delete dir="${bin.dir}" failonerror="false" /> | ||
55 | <delete dir="${obj.dir}" failonerror="false" /> | ||
56 | </target> | ||
57 | <target name="doc" description="Creates documentation."> | ||
58 | </target> | ||
59 | </project> | ||
diff --git a/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build new file mode 100644 index 0000000..3ca89e8 --- /dev/null +++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build | |||
@@ -0,0 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Caches" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Caches" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssetCache.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="../../../bin/libsecondlife.dll" /> | ||
23 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
24 | <include name="System.dll" /> | ||
25 | <include name="System.Xml.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/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj index 0d8fac5..4667d52 100644 --- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj +++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj | |||
@@ -62,14 +62,6 @@ | |||
62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="OpenSim.Framework.Types" > | ||
66 | <HintPath>OpenSim.Framework.Types.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="OpenSim.Framework.Utilities" > | ||
70 | <HintPath>OpenSim.Framework.Utilities.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="System" > | 65 | <Reference Include="System" > |
74 | <HintPath>System.dll</HintPath> | 66 | <HintPath>System.dll</HintPath> |
75 | <Private>False</Private> | 67 | <Private>False</Private> |
@@ -104,15 +96,6 @@ | |||
104 | </ProjectReference> | 96 | </ProjectReference> |
105 | </ItemGroup> | 97 | </ItemGroup> |
106 | <ItemGroup> | 98 | <ItemGroup> |
107 | <Compile Include="LLSDCapsDetails.cs"> | ||
108 | <SubType>Code</SubType> | ||
109 | </Compile> | ||
110 | <Compile Include="LLSDMapRequest.cs"> | ||
111 | <SubType>Code</SubType> | ||
112 | </Compile> | ||
113 | <Compile Include="LLSDMapLayerResponse.cs"> | ||
114 | <SubType>Code</SubType> | ||
115 | </Compile> | ||
116 | <Compile Include="Caps.cs"> | 99 | <Compile Include="Caps.cs"> |
117 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
118 | </Compile> | 101 | </Compile> |
@@ -122,6 +105,9 @@ | |||
122 | <Compile Include="LLSDCapEvent.cs"> | 105 | <Compile Include="LLSDCapEvent.cs"> |
123 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
124 | </Compile> | 107 | </Compile> |
108 | <Compile Include="LLSDCapsDetails.cs"> | ||
109 | <SubType>Code</SubType> | ||
110 | </Compile> | ||
125 | <Compile Include="LLSDEmpty.cs"> | 111 | <Compile Include="LLSDEmpty.cs"> |
126 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
127 | </Compile> | 113 | </Compile> |
@@ -131,6 +117,12 @@ | |||
131 | <Compile Include="LLSDMapLayer.cs"> | 117 | <Compile Include="LLSDMapLayer.cs"> |
132 | <SubType>Code</SubType> | 118 | <SubType>Code</SubType> |
133 | </Compile> | 119 | </Compile> |
120 | <Compile Include="LLSDMapLayerResponse.cs"> | ||
121 | <SubType>Code</SubType> | ||
122 | </Compile> | ||
123 | <Compile Include="LLSDMapRequest.cs"> | ||
124 | <SubType>Code</SubType> | ||
125 | </Compile> | ||
134 | <Compile Include="LLSDTest.cs"> | 126 | <Compile Include="LLSDTest.cs"> |
135 | <SubType>Code</SubType> | 127 | <SubType>Code</SubType> |
136 | </Compile> | 128 | </Compile> |
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build new file mode 100644 index 0000000..a091b5c --- /dev/null +++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build | |||
@@ -0,0 +1,56 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Capabilities" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="Caps.cs" /> | ||
15 | <include name="LLSDArray.cs" /> | ||
16 | <include name="LLSDCapEvent.cs" /> | ||
17 | <include name="LLSDCapsDetails.cs" /> | ||
18 | <include name="LLSDEmpty.cs" /> | ||
19 | <include name="LLSDHelpers.cs" /> | ||
20 | <include name="LLSDMapLayer.cs" /> | ||
21 | <include name="LLSDMapLayerResponse.cs" /> | ||
22 | <include name="LLSDMapRequest.cs" /> | ||
23 | <include name="LLSDTest.cs" /> | ||
24 | <include name="LLSDType.cs" /> | ||
25 | <include name="LLSDUploadReply.cs" /> | ||
26 | </sources> | ||
27 | <references basedir="${project::get-base-directory()}"> | ||
28 | <lib> | ||
29 | <include name="${project::get-base-directory()}" /> | ||
30 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
31 | </lib> | ||
32 | <include name="../../../bin/libsecondlife.dll" /> | ||
33 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
34 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
35 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
36 | <include name="System.dll" /> | ||
37 | <include name="System.Xml.dll" /> | ||
38 | <include name="../../../bin/XMLRPC.dll" /> | ||
39 | </references> | ||
40 | </csc> | ||
41 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
42 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
43 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
44 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
45 | <include name="*.dll"/> | ||
46 | <include name="*.exe"/> | ||
47 | </fileset> | ||
48 | </copy> | ||
49 | </target> | ||
50 | <target name="clean"> | ||
51 | <delete dir="${bin.dir}" failonerror="false" /> | ||
52 | <delete dir="${obj.dir}" failonerror="false" /> | ||
53 | </target> | ||
54 | <target name="doc" description="Creates documentation."> | ||
55 | </target> | ||
56 | </project> | ||
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj index 40cd4f0..3093eb0 100644 --- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj | |||
@@ -122,19 +122,19 @@ | |||
122 | </ProjectReference> | 122 | </ProjectReference> |
123 | </ItemGroup> | 123 | </ItemGroup> |
124 | <ItemGroup> | 124 | <ItemGroup> |
125 | <Compile Include="ClientView.AgentAssetUpload.cs"> | 125 | <Compile Include="ClientStackNetworkHandler.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="ClientStackNetworkHandler.cs"> | 128 | <Compile Include="ClientView.AgentAssetUpload.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="PacketServer.cs"> | 131 | <Compile Include="ClientView.API.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
134 | <Compile Include="ClientView.PacketHandlers.cs"> | 134 | <Compile Include="ClientView.cs"> |
135 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
136 | </Compile> | 136 | </Compile> |
137 | <Compile Include="ClientView.API.cs"> | 137 | <Compile Include="ClientView.PacketHandlers.cs"> |
138 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
139 | </Compile> | 139 | </Compile> |
140 | <Compile Include="ClientView.ProcessPackets.cs"> | 140 | <Compile Include="ClientView.ProcessPackets.cs"> |
@@ -143,7 +143,7 @@ | |||
143 | <Compile Include="ClientViewBase.cs"> | 143 | <Compile Include="ClientViewBase.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="ClientView.cs"> | 146 | <Compile Include="PacketServer.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="RegionApplicationBase.cs"> | 149 | <Compile Include="RegionApplicationBase.cs"> |
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build new file mode 100644 index 0000000..f76a4c8 --- /dev/null +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build | |||
@@ -0,0 +1,60 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.ClientStack" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="ClientStackNetworkHandler.cs" /> | ||
15 | <include name="ClientView.AgentAssetUpload.cs" /> | ||
16 | <include name="ClientView.API.cs" /> | ||
17 | <include name="ClientView.cs" /> | ||
18 | <include name="ClientView.PacketHandlers.cs" /> | ||
19 | <include name="ClientView.ProcessPackets.cs" /> | ||
20 | <include name="ClientViewBase.cs" /> | ||
21 | <include name="PacketServer.cs" /> | ||
22 | <include name="RegionApplicationBase.cs" /> | ||
23 | <include name="UDPServer.cs" /> | ||
24 | <include name="Assets/InventoryCache.cs" /> | ||
25 | </sources> | ||
26 | <references basedir="${project::get-base-directory()}"> | ||
27 | <lib> | ||
28 | <include name="${project::get-base-directory()}" /> | ||
29 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
30 | </lib> | ||
31 | <include name="../../../bin/Axiom.MathLib.dll" /> | ||
32 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
33 | <include name="../../../bin/libsecondlife.dll" /> | ||
34 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
35 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
36 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
37 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
38 | <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
39 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> | ||
40 | <include name="System.dll" /> | ||
41 | <include name="System.Xml.dll" /> | ||
42 | <include name="../../../bin/XMLRPC.dll" /> | ||
43 | </references> | ||
44 | </csc> | ||
45 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
46 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
47 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
48 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
49 | <include name="*.dll"/> | ||
50 | <include name="*.exe"/> | ||
51 | </fileset> | ||
52 | </copy> | ||
53 | </target> | ||
54 | <target name="clean"> | ||
55 | <delete dir="${bin.dir}" failonerror="false" /> | ||
56 | <delete dir="${obj.dir}" failonerror="false" /> | ||
57 | </target> | ||
58 | <target name="doc" description="Creates documentation."> | ||
59 | </target> | ||
60 | </project> | ||
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 8837bdb..f5aa8ae 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -35,7 +35,6 @@ using OpenSim.Framework.Interfaces; | |||
35 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
36 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
37 | 37 | ||
38 | |||
39 | namespace OpenSim.Region.Communications.Local | 38 | namespace OpenSim.Region.Communications.Local |
40 | { | 39 | { |
41 | public class CommunicationsLocal : CommunicationsManager | 40 | public class CommunicationsLocal : CommunicationsManager |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj index f9f6b7d..0a15a49 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj | |||
@@ -98,15 +98,15 @@ | |||
98 | </ProjectReference> | 98 | </ProjectReference> |
99 | </ItemGroup> | 99 | </ItemGroup> |
100 | <ItemGroup> | 100 | <ItemGroup> |
101 | <Compile Include="LocalUserServices.cs"> | ||
102 | <SubType>Code</SubType> | ||
103 | </Compile> | ||
104 | <Compile Include="CommunicationsLocal.cs"> | 101 | <Compile Include="CommunicationsLocal.cs"> |
105 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
106 | </Compile> | 103 | </Compile> |
107 | <Compile Include="LocalBackEndServices.cs"> | 104 | <Compile Include="LocalBackEndServices.cs"> |
108 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
109 | </Compile> | 106 | </Compile> |
107 | <Compile Include="LocalUserServices.cs"> | ||
108 | <SubType>Code</SubType> | ||
109 | </Compile> | ||
110 | <Compile Include="Properties\AssemblyInfo.cs"> | 110 | <Compile Include="Properties\AssemblyInfo.cs"> |
111 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
112 | </Compile> | 112 | </Compile> |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build new file mode 100644 index 0000000..3cac9d3 --- /dev/null +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build | |||
@@ -0,0 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Communications.Local" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="CommunicationsLocal.cs" /> | ||
15 | <include name="LocalBackEndServices.cs" /> | ||
16 | <include name="LocalUserServices.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="../../../../bin/libsecondlife.dll" /> | ||
25 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
26 | <include name="../../../../bin/OpenSim.Framework.Communications.dll" /> | ||
27 | <include name="../../../../bin/OpenSim.Framework.Data.dll" /> | ||
28 | <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" /> | ||
29 | <include name="System.dll" /> | ||
30 | <include name="System.Xml.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/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj index 1aa7019..8cc5641 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj | |||
@@ -116,16 +116,16 @@ | |||
116 | </ProjectReference> | 116 | </ProjectReference> |
117 | </ItemGroup> | 117 | </ItemGroup> |
118 | <ItemGroup> | 118 | <ItemGroup> |
119 | <Compile Include="OGSUserServices.cs"> | 119 | <Compile Include="GridCommsManager.cs"> |
120 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
121 | </Compile> | 121 | </Compile> |
122 | <Compile Include="GridCommsManager.cs"> | 122 | <Compile Include="OGS1GridServices.cs"> |
123 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
124 | </Compile> | 124 | </Compile> |
125 | <Compile Include="OGSInterSimComms.cs"> | 125 | <Compile Include="OGSInterSimComms.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="OGS1GridServices.cs"> | 128 | <Compile Include="OGSUserServices.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="Properties\AssemblyInfo.cs"> | 131 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build new file mode 100644 index 0000000..21bb15c --- /dev/null +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build | |||
@@ -0,0 +1,53 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Communications.OGS1" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="GridCommsManager.cs" /> | ||
15 | <include name="OGS1GridServices.cs" /> | ||
16 | <include name="OGSInterSimComms.cs" /> | ||
17 | <include name="OGSUserServices.cs" /> | ||
18 | <include name="Properties/AssemblyInfo.cs" /> | ||
19 | </sources> | ||
20 | <references basedir="${project::get-base-directory()}"> | ||
21 | <lib> | ||
22 | <include name="${project::get-base-directory()}" /> | ||
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
24 | </lib> | ||
25 | <include name="../../../../bin/libsecondlife.dll" /> | ||
26 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
27 | <include name="../../../../bin/OpenSim.Framework.Communications.dll" /> | ||
28 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
29 | <include name="../../../../bin/OpenSim.Framework.Data.dll" /> | ||
30 | <include name="../../../../bin/OpenSim.Framework.Servers.dll" /> | ||
31 | <include name="System.dll" /> | ||
32 | <include name="System.Data.dll" /> | ||
33 | <include name="System.Runtime.Remoting.dll" /> | ||
34 | <include name="System.Xml.dll" /> | ||
35 | <include name="../../../../bin/XMLRPC.dll" /> | ||
36 | </references> | ||
37 | </csc> | ||
38 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
39 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
40 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
41 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
42 | <include name="*.dll"/> | ||
43 | <include name="*.exe"/> | ||
44 | </fileset> | ||
45 | </copy> | ||
46 | </target> | ||
47 | <target name="clean"> | ||
48 | <delete dir="${bin.dir}" failonerror="false" /> | ||
49 | <delete dir="${obj.dir}" failonerror="false" /> | ||
50 | </target> | ||
51 | <target name="doc" description="Creates documentation."> | ||
52 | </target> | ||
53 | </project> | ||
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj index 6f07969..efde96c 100644 --- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj | |||
@@ -70,6 +70,10 @@ | |||
70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="Microsoft.JScript" > | ||
74 | <HintPath>Microsoft.JScript.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
73 | <Reference Include="System" > | 77 | <Reference Include="System" > |
74 | <HintPath>System.dll</HintPath> | 78 | <HintPath>System.dll</HintPath> |
75 | <Private>False</Private> | 79 | <Private>False</Private> |
@@ -78,6 +82,10 @@ | |||
78 | <HintPath>System.Xml.dll</HintPath> | 82 | <HintPath>System.Xml.dll</HintPath> |
79 | <Private>False</Private> | 83 | <Private>False</Private> |
80 | </Reference> | 84 | </Reference> |
85 | <Reference Include="VJSharpCodeProvider" > | ||
86 | <HintPath>VJSharpCodeProvider.dll</HintPath> | ||
87 | <Private>False</Private> | ||
88 | </Reference> | ||
81 | <Reference Include="XMLRPC.dll" > | 89 | <Reference Include="XMLRPC.dll" > |
82 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | 90 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> |
83 | <Private>False</Private> | 91 | <Private>False</Private> |
@@ -152,55 +160,55 @@ | |||
152 | <Compile Include="Scenes\Entity.cs"> | 160 | <Compile Include="Scenes\Entity.cs"> |
153 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
154 | </Compile> | 162 | </Compile> |
155 | <Compile Include="Scenes\Scene.Scripting.cs"> | 163 | <Compile Include="Scenes\IScenePresenceBody.cs"> |
156 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
157 | </Compile> | 165 | </Compile> |
158 | <Compile Include="Scenes\ScenePresence.Body.cs"> | 166 | <Compile Include="Scenes\Primitive.cs"> |
159 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
160 | </Compile> | 168 | </Compile> |
161 | <Compile Include="Scenes\SceneEvents.cs"> | 169 | <Compile Include="Scenes\Scene.cs"> |
162 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
163 | </Compile> | 171 | </Compile> |
164 | <Compile Include="Scenes\ScenePresence.cs"> | 172 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> |
165 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
166 | </Compile> | 174 | </Compile> |
167 | <Compile Include="Scenes\ScenePresence.Animations.cs"> | 175 | <Compile Include="Scenes\Scene.Scripting.cs"> |
168 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
169 | </Compile> | 177 | </Compile> |
170 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> | 178 | <Compile Include="Scenes\SceneBase.cs"> |
171 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
172 | </Compile> | 180 | </Compile> |
173 | <Compile Include="Scenes\SceneObject.cs"> | 181 | <Compile Include="Scenes\SceneEvents.cs"> |
174 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
175 | </Compile> | 183 | </Compile> |
176 | <Compile Include="Scenes\Primitive.cs"> | 184 | <Compile Include="Scenes\SceneObject.cs"> |
177 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
178 | </Compile> | 186 | </Compile> |
179 | <Compile Include="Scenes\IScenePresenceBody.cs"> | 187 | <Compile Include="Scenes\ScenePresence.Animations.cs"> |
180 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
181 | </Compile> | 189 | </Compile> |
182 | <Compile Include="Scenes\SceneBase.cs"> | 190 | <Compile Include="Scenes\ScenePresence.Body.cs"> |
183 | <SubType>Code</SubType> | 191 | <SubType>Code</SubType> |
184 | </Compile> | 192 | </Compile> |
185 | <Compile Include="Scenes\Scene.cs"> | 193 | <Compile Include="Scenes\ScenePresence.cs"> |
186 | <SubType>Code</SubType> | 194 | <SubType>Code</SubType> |
187 | </Compile> | 195 | </Compile> |
188 | <Compile Include="Scenes\scripting\IScriptHandler.cs"> | 196 | <Compile Include="Scenes\scripting\Script.cs"> |
189 | <SubType>Code</SubType> | 197 | <SubType>Code</SubType> |
190 | </Compile> | 198 | </Compile> |
191 | <Compile Include="Scenes\scripting\ScriptFactory.cs"> | 199 | <Compile Include="Scenes\scripting\ScriptInfo.cs"> |
192 | <SubType>Code</SubType> | 200 | <SubType>Code</SubType> |
193 | </Compile> | 201 | </Compile> |
194 | <Compile Include="Scenes\scripting\IScriptContext.cs"> | 202 | <Compile Include="Scenes\scripting\ScriptManager.cs"> |
195 | <SubType>Code</SubType> | 203 | <SubType>Code</SubType> |
196 | </Compile> | 204 | </Compile> |
197 | <Compile Include="Scenes\scripting\Script.cs"> | 205 | <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs"> |
198 | <SubType>Code</SubType> | 206 | <SubType>Code</SubType> |
199 | </Compile> | 207 | </Compile> |
200 | <Compile Include="Scenes\scripting\IScriptEntity.cs"> | 208 | <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs"> |
201 | <SubType>Code</SubType> | 209 | <SubType>Code</SubType> |
202 | </Compile> | 210 | </Compile> |
203 | <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs"> | 211 | <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs"> |
204 | <SubType>Code</SubType> | 212 | <SubType>Code</SubType> |
205 | </Compile> | 213 | </Compile> |
206 | </ItemGroup> | 214 | </ItemGroup> |
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build new file mode 100644 index 0000000..da73c8c --- /dev/null +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build | |||
@@ -0,0 +1,75 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Environment" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="EstateManager.cs" /> | ||
15 | <include name="ParcelManager.cs" /> | ||
16 | <include name="RegionManager.cs" /> | ||
17 | <include name="Scenes/Entity.cs" /> | ||
18 | <include name="Scenes/IScenePresenceBody.cs" /> | ||
19 | <include name="Scenes/Primitive.cs" /> | ||
20 | <include name="Scenes/Scene.cs" /> | ||
21 | <include name="Scenes/Scene.PacketHandlers.cs" /> | ||
22 | <include name="Scenes/Scene.Scripting.cs" /> | ||
23 | <include name="Scenes/SceneBase.cs" /> | ||
24 | <include name="Scenes/SceneEvents.cs" /> | ||
25 | <include name="Scenes/SceneObject.cs" /> | ||
26 | <include name="Scenes/ScenePresence.Animations.cs" /> | ||
27 | <include name="Scenes/ScenePresence.Body.cs" /> | ||
28 | <include name="Scenes/ScenePresence.cs" /> | ||
29 | <include name="Scenes/scripting/Script.cs" /> | ||
30 | <include name="Scenes/scripting/ScriptInfo.cs" /> | ||
31 | <include name="Scenes/scripting/ScriptManager.cs" /> | ||
32 | <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" /> | ||
33 | <include name="Scenes/scripting/Engines/JScriptEngine.cs" /> | ||
34 | <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" /> | ||
35 | </sources> | ||
36 | <references basedir="${project::get-base-directory()}"> | ||
37 | <lib> | ||
38 | <include name="${project::get-base-directory()}" /> | ||
39 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
40 | </lib> | ||
41 | <include name="../../../bin/Axiom.MathLib.dll" /> | ||
42 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
43 | <include name="../../../bin/libsecondlife.dll" /> | ||
44 | <include name="Microsoft.JScript.dll" /> | ||
45 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
46 | <include name="../../../bin/OpenSim.Framework.Communications.dll" /> | ||
47 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
48 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | ||
49 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
50 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
51 | <include name="../../../bin/OpenSim.Region.Capabilities.dll" /> | ||
52 | <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
53 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> | ||
54 | <include name="System.dll" /> | ||
55 | <include name="System.Xml.dll" /> | ||
56 | <include name="VJSharpCodeProvider.dll" /> | ||
57 | <include name="../../../bin/XMLRPC.dll" /> | ||
58 | </references> | ||
59 | </csc> | ||
60 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
61 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
62 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
63 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
64 | <include name="*.dll"/> | ||
65 | <include name="*.exe"/> | ||
66 | </fileset> | ||
67 | </copy> | ||
68 | </target> | ||
69 | <target name="clean"> | ||
70 | <delete dir="${bin.dir}" failonerror="false" /> | ||
71 | <delete dir="${obj.dir}" failonerror="false" /> | ||
72 | </target> | ||
73 | <target name="doc" description="Creates documentation."> | ||
74 | </target> | ||
75 | </project> | ||
diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs index bbba34d..db5070d 100644 --- a/OpenSim/Region/Environment/Scenes/Entity.cs +++ b/OpenSim/Region/Environment/Scenes/Entity.cs | |||
@@ -31,11 +31,10 @@ using System.Text; | |||
31 | using Axiom.MathLib; | 31 | using Axiom.MathLib; |
32 | using OpenSim.Physics.Manager; | 32 | using OpenSim.Physics.Manager; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using OpenSim.Region.Environment.Scripting; | ||
35 | 34 | ||
36 | namespace OpenSim.Region.Environment.Scenes | 35 | namespace OpenSim.Region.Environment.Scenes |
37 | { | 36 | { |
38 | public abstract class Entity : IScriptReadonlyEntity | 37 | public abstract class Entity |
39 | { | 38 | { |
40 | public libsecondlife.LLUUID uuid; | 39 | public libsecondlife.LLUUID uuid; |
41 | public Quaternion rotation; | 40 | public Quaternion rotation; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ff54efa..b345c0c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -39,12 +39,14 @@ using OpenSim.Framework.Interfaces; | |||
39 | using OpenSim.Framework.Types; | 39 | using OpenSim.Framework.Types; |
40 | using OpenSim.Framework.Inventory; | 40 | using OpenSim.Framework.Inventory; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | using OpenSim.Region.Environment.Scripting; | ||
43 | using OpenSim.Region.Terrain; | 42 | using OpenSim.Region.Terrain; |
44 | using OpenSim.Framework.Communications; | 43 | using OpenSim.Framework.Communications; |
45 | using OpenSim.Region.Caches; | 44 | using OpenSim.Region.Caches; |
46 | using OpenSim.Region.Environment; | 45 | using OpenSim.Region.Environment; |
47 | using OpenSim.Framework.Servers; | 46 | using OpenSim.Framework.Servers; |
47 | using OpenSim.Scripting; | ||
48 | using OpenSim.Region.Capabilities; | ||
49 | using Caps = OpenSim.Region.Capabilities.Caps; | ||
48 | 50 | ||
49 | namespace OpenSim.Region.Environment.Scenes | 51 | namespace OpenSim.Region.Environment.Scenes |
50 | { | 52 | { |
@@ -60,20 +62,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
60 | private Random Rand = new Random(); | 62 | private Random Rand = new Random(); |
61 | private uint _primCount = 702000; | 63 | private uint _primCount = 702000; |
62 | private int storageCount; | 64 | private int storageCount; |
63 | private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers; | ||
64 | private Dictionary<string, ScriptFactory> m_scripts; | ||
65 | private Mutex updateLock; | 65 | private Mutex updateLock; |
66 | 66 | ||
67 | protected AuthenticateSessionsBase authenticateHandler; | 67 | protected AuthenticateSessionsBase authenticateHandler; |
68 | protected RegionCommsListener regionCommsHost; | 68 | protected RegionCommsListener regionCommsHost; |
69 | protected CommunicationsManager commsManager; | 69 | protected CommunicationsManager commsManager; |
70 | 70 | ||
71 | protected Dictionary<LLUUID, Capabilities.Caps> capsHandlers = new Dictionary<LLUUID, Capabilities.Caps>(); | 71 | protected Dictionary<LLUUID,Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); |
72 | protected BaseHttpServer httpListener; | 72 | protected BaseHttpServer httpListener; |
73 | 73 | ||
74 | public ParcelManager parcelManager; | 74 | public ParcelManager parcelManager; |
75 | public EstateManager estateManager; | 75 | public EstateManager estateManager; |
76 | public EventManager eventManager; | 76 | public EventManager eventManager; |
77 | public ScriptManager scriptManager; | ||
77 | 78 | ||
78 | #region Properties | 79 | #region Properties |
79 | /// <summary> | 80 | /// <summary> |
@@ -117,12 +118,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
117 | 118 | ||
118 | parcelManager = new ParcelManager(this, this.m_regInfo); | 119 | parcelManager = new ParcelManager(this, this.m_regInfo); |
119 | estateManager = new EstateManager(this, this.m_regInfo); | 120 | estateManager = new EstateManager(this, this.m_regInfo); |
120 | 121 | scriptManager = new ScriptManager(this); | |
121 | eventManager = new EventManager(); | 122 | eventManager = new EventManager(); |
122 | 123 | ||
123 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); | ||
124 | m_scripts = new Dictionary<string, ScriptFactory>(); | ||
125 | |||
126 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance"); | 124 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance"); |
127 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); | 125 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); |
128 | Avatars = new Dictionary<LLUUID, ScenePresence>(); | 126 | Avatars = new Dictionary<LLUUID, ScenePresence>(); |
@@ -195,19 +193,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
195 | Entities[UUID].update(); | 193 | Entities[UUID].update(); |
196 | } | 194 | } |
197 | 195 | ||
198 | // New | 196 | // General purpose event manager |
199 | eventManager.TriggerOnFrame(); | 197 | eventManager.TriggerOnFrame(); |
200 | 198 | ||
201 | // TODO: Obsolete - Phase out | ||
202 | foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values) | ||
203 | { | ||
204 | scriptHandler.OnFrame(); | ||
205 | } | ||
206 | foreach (IScriptEngine scripteng in this.scriptEngines.Values) | ||
207 | { | ||
208 | scripteng.OnFrame(); | ||
209 | } | ||
210 | |||
211 | //backup world data | 199 | //backup world data |
212 | this.storageCount++; | 200 | this.storageCount++; |
213 | if (storageCount > 1200) //set to how often you want to backup | 201 | if (storageCount > 1200) //set to how often you want to backup |
@@ -256,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
256 | //Parcel backup routines | 244 | //Parcel backup routines |
257 | ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; | 245 | ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; |
258 | int i = 0; | 246 | int i = 0; |
259 | foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values) | 247 | foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values) |
260 | { | 248 | { |
261 | parcels[i] = parcel.parcelData; | 249 | parcels[i] = parcel.parcelData; |
262 | i++; | 250 | i++; |
@@ -672,7 +660,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
672 | if (agent.CapsPath != "") | 660 | if (agent.CapsPath != "") |
673 | { | 661 | { |
674 | //Console.WriteLine("new user, so creating caps handler for it"); | 662 | //Console.WriteLine("new user, so creating caps handler for it"); |
675 | Capabilities.Caps cap = new Capabilities.Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID); | 663 | Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID); |
676 | cap.RegisterHandlers(); | 664 | cap.RegisterHandlers(); |
677 | this.capsHandlers.Add(agent.AgentID, cap); | 665 | this.capsHandlers.Add(agent.AgentID, cap); |
678 | } | 666 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 3d8f522..50d3b82 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -37,7 +37,6 @@ using OpenSim.Physics.Manager; | |||
37 | using OpenSim.Framework.Interfaces; | 37 | using OpenSim.Framework.Interfaces; |
38 | using OpenSim.Framework.Types; | 38 | using OpenSim.Framework.Types; |
39 | using OpenSim.Framework.Inventory; | 39 | using OpenSim.Framework.Inventory; |
40 | using OpenSim.Region.Environment.Scripting; | ||
41 | using OpenSim.Region.Terrain; | 40 | using OpenSim.Region.Terrain; |
42 | using OpenSim.Region.Caches; | 41 | using OpenSim.Region.Caches; |
43 | 42 | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs new file mode 100644 index 0000000..870303f --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs | |||
@@ -0,0 +1,104 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | // Compilation stuff | ||
33 | using System.CodeDom; | ||
34 | using System.CodeDom.Compiler; | ||
35 | using Microsoft.CSharp; | ||
36 | |||
37 | namespace OpenSim.Scripting | ||
38 | { | ||
39 | public class CSharpScriptEngine : IScriptCompiler | ||
40 | { | ||
41 | public string FileExt() | ||
42 | { | ||
43 | return ".cs"; | ||
44 | } | ||
45 | |||
46 | private Dictionary<string,IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) | ||
47 | { | ||
48 | CompilerParameters compilerParams = new CompilerParameters(); | ||
49 | CompilerResults compilerResults; | ||
50 | compilerParams.GenerateExecutable = false; | ||
51 | compilerParams.GenerateInMemory = true; | ||
52 | compilerParams.IncludeDebugInformation = false; | ||
53 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll"); | ||
54 | compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll"); | ||
55 | compilerParams.ReferencedAssemblies.Add("libsecondlife.dll"); | ||
56 | compilerParams.ReferencedAssemblies.Add("System.dll"); | ||
57 | |||
58 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | ||
59 | |||
60 | if (compilerResults.Errors.Count > 0) | ||
61 | { | ||
62 | OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); | ||
63 | foreach (CompilerError error in compilerResults.Errors) | ||
64 | { | ||
65 | OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | ||
66 | } | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | Dictionary<string,IScript> scripts = new Dictionary<string,IScript>(); | ||
71 | |||
72 | foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes()) | ||
73 | { | ||
74 | Type testInterface = pluginType.GetInterface("IScript", true); | ||
75 | |||
76 | if (testInterface != null) | ||
77 | { | ||
78 | IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString()); | ||
79 | |||
80 | string scriptName = "C#/" + script.getName(); | ||
81 | Console.WriteLine("Script: " + scriptName + " loaded."); | ||
82 | |||
83 | if (!scripts.ContainsKey(scriptName)) | ||
84 | { | ||
85 | scripts.Add(scriptName, script); | ||
86 | } | ||
87 | else | ||
88 | { | ||
89 | scripts[scriptName] = script; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | return scripts; | ||
94 | } | ||
95 | return null; | ||
96 | } | ||
97 | |||
98 | public Dictionary<string,IScript> compile(string filename) | ||
99 | { | ||
100 | CSharpCodeProvider csharpProvider = new CSharpCodeProvider(); | ||
101 | return LoadDotNetScript(csharpProvider.CreateCompiler(), filename); | ||
102 | } | ||
103 | } | ||
104 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs new file mode 100644 index 0000000..ffae1d7 --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs | |||
@@ -0,0 +1,104 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | // Compilation stuff | ||
33 | using System.CodeDom; | ||
34 | using System.CodeDom.Compiler; | ||
35 | using Microsoft.JScript; | ||
36 | |||
37 | namespace OpenSim.Scripting | ||
38 | { | ||
39 | public class JScriptEngine : IScriptCompiler | ||
40 | { | ||
41 | public string FileExt() | ||
42 | { | ||
43 | return ".js"; | ||
44 | } | ||
45 | |||
46 | private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) | ||
47 | { | ||
48 | CompilerParameters compilerParams = new CompilerParameters(); | ||
49 | CompilerResults compilerResults; | ||
50 | compilerParams.GenerateExecutable = false; | ||
51 | compilerParams.GenerateInMemory = true; | ||
52 | compilerParams.IncludeDebugInformation = false; | ||
53 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll"); | ||
54 | compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll"); | ||
55 | compilerParams.ReferencedAssemblies.Add("libsecondlife.dll"); | ||
56 | compilerParams.ReferencedAssemblies.Add("System.dll"); | ||
57 | |||
58 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | ||
59 | |||
60 | if (compilerResults.Errors.Count > 0) | ||
61 | { | ||
62 | OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); | ||
63 | foreach (CompilerError error in compilerResults.Errors) | ||
64 | { | ||
65 | OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | ||
66 | } | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | Dictionary<string, IScript> scripts = new Dictionary<string, IScript>(); | ||
71 | |||
72 | foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes()) | ||
73 | { | ||
74 | Type testInterface = pluginType.GetInterface("IScript", true); | ||
75 | |||
76 | if (testInterface != null) | ||
77 | { | ||
78 | IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString()); | ||
79 | |||
80 | string scriptName = "JS.NET/" + script.getName(); | ||
81 | Console.WriteLine("Script: " + scriptName + " loaded."); | ||
82 | |||
83 | if (!scripts.ContainsKey(scriptName)) | ||
84 | { | ||
85 | scripts.Add(scriptName, script); | ||
86 | } | ||
87 | else | ||
88 | { | ||
89 | scripts[scriptName] = script; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | return scripts; | ||
94 | } | ||
95 | return null; | ||
96 | } | ||
97 | |||
98 | public Dictionary<string, IScript> compile(string filename) | ||
99 | { | ||
100 | JScriptCodeProvider jscriptProvider = new JScriptCodeProvider(); | ||
101 | return LoadDotNetScript(jscriptProvider.CreateCompiler(), filename); | ||
102 | } | ||
103 | } | ||
104 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs new file mode 100644 index 0000000..b33b55d --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs | |||
@@ -0,0 +1,104 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | // Compilation stuff | ||
33 | using System.CodeDom; | ||
34 | using System.CodeDom.Compiler; | ||
35 | using Microsoft.VJSharp; | ||
36 | |||
37 | namespace OpenSim.Scripting | ||
38 | { | ||
39 | public class JSharpScriptEngine : IScriptCompiler | ||
40 | { | ||
41 | public string FileExt() | ||
42 | { | ||
43 | return ".jsl"; | ||
44 | } | ||
45 | |||
46 | private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) | ||
47 | { | ||
48 | CompilerParameters compilerParams = new CompilerParameters(); | ||
49 | CompilerResults compilerResults; | ||
50 | compilerParams.GenerateExecutable = false; | ||
51 | compilerParams.GenerateInMemory = true; | ||
52 | compilerParams.IncludeDebugInformation = false; | ||
53 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll"); | ||
54 | compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll"); | ||
55 | compilerParams.ReferencedAssemblies.Add("libsecondlife.dll"); | ||
56 | compilerParams.ReferencedAssemblies.Add("System.dll"); | ||
57 | |||
58 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | ||
59 | |||
60 | if (compilerResults.Errors.Count > 0) | ||
61 | { | ||
62 | OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); | ||
63 | foreach (CompilerError error in compilerResults.Errors) | ||
64 | { | ||
65 | OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | ||
66 | } | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | Dictionary<string, IScript> scripts = new Dictionary<string, IScript>(); | ||
71 | |||
72 | foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes()) | ||
73 | { | ||
74 | Type testInterface = pluginType.GetInterface("IScript", true); | ||
75 | |||
76 | if (testInterface != null) | ||
77 | { | ||
78 | IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString()); | ||
79 | |||
80 | string scriptName = "J#/" + script.getName(); | ||
81 | Console.WriteLine("Script: " + scriptName + " loaded."); | ||
82 | |||
83 | if (!scripts.ContainsKey(scriptName)) | ||
84 | { | ||
85 | scripts.Add(scriptName, script); | ||
86 | } | ||
87 | else | ||
88 | { | ||
89 | scripts[scriptName] = script; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | return scripts; | ||
94 | } | ||
95 | return null; | ||
96 | } | ||
97 | |||
98 | public Dictionary<string, IScript> compile(string filename) | ||
99 | { | ||
100 | VJSharpCodeProvider jsharpProvider = new VJSharpCodeProvider(); | ||
101 | return LoadDotNetScript(jsharpProvider.CreateCompiler(), filename); | ||
102 | } | ||
103 | } | ||
104 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs deleted file mode 100644 index eb8a117..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Region.Environment.Scripting | ||
34 | { | ||
35 | public interface IScriptContext | ||
36 | { | ||
37 | IScriptEntity Entity { get; } | ||
38 | bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar); | ||
39 | } | ||
40 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs deleted file mode 100644 index e813626..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Region.Environment.Scripting | ||
34 | { | ||
35 | public interface IScriptReadonlyEntity | ||
36 | { | ||
37 | LLVector3 Pos { get; } | ||
38 | string Name { get; } | ||
39 | } | ||
40 | |||
41 | public interface IScriptEntity | ||
42 | { | ||
43 | LLVector3 Pos { get; set; } | ||
44 | string Name { get; } | ||
45 | } | ||
46 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs deleted file mode 100644 index 115b4f4..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs +++ /dev/null | |||
@@ -1,126 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | using OpenSim.Physics.Manager; | ||
33 | using OpenSim.Region.Environment; | ||
34 | using OpenSim.Region.Environment.Scenes; | ||
35 | using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence; | ||
36 | using Primitive = OpenSim.Region.Environment.Scenes.Primitive; | ||
37 | |||
38 | namespace OpenSim.Region.Environment.Scripting | ||
39 | { | ||
40 | public delegate void ScriptEventHandler(IScriptContext context); | ||
41 | |||
42 | public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity | ||
43 | { | ||
44 | private Scene m_world; | ||
45 | private Script m_script; | ||
46 | private Entity m_entity; | ||
47 | |||
48 | public LLUUID ScriptId | ||
49 | { | ||
50 | get | ||
51 | { | ||
52 | return m_script.ScriptId; | ||
53 | } | ||
54 | } | ||
55 | |||
56 | public void OnFrame() | ||
57 | { | ||
58 | m_script.OnFrame(this); | ||
59 | } | ||
60 | |||
61 | public ScriptHandler(Script script, Entity entity, Scene world) | ||
62 | { | ||
63 | m_script = script; | ||
64 | m_entity = entity; | ||
65 | m_world = world; | ||
66 | } | ||
67 | |||
68 | #region IScriptContext Members | ||
69 | |||
70 | IScriptEntity IScriptContext.Entity | ||
71 | { | ||
72 | get | ||
73 | { | ||
74 | return this; | ||
75 | } | ||
76 | } | ||
77 | |||
78 | bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar) | ||
79 | { | ||
80 | foreach (Entity entity in m_world.Entities.Values ) | ||
81 | { | ||
82 | if( entity is Avatar ) | ||
83 | { | ||
84 | avatar = entity; | ||
85 | return true; | ||
86 | } | ||
87 | } | ||
88 | |||
89 | avatar = null; | ||
90 | return false; | ||
91 | } | ||
92 | |||
93 | #endregion | ||
94 | |||
95 | #region IScriptEntity and IScriptReadonlyEntity Members | ||
96 | |||
97 | public string Name | ||
98 | { | ||
99 | get | ||
100 | { | ||
101 | return m_entity.Name; | ||
102 | } | ||
103 | } | ||
104 | |||
105 | public LLVector3 Pos | ||
106 | { | ||
107 | get | ||
108 | { | ||
109 | return m_entity.Pos; | ||
110 | } | ||
111 | |||
112 | set | ||
113 | { | ||
114 | if (m_entity is Primitive) | ||
115 | { | ||
116 | Primitive prim = m_entity as Primitive; | ||
117 | // Of course, we really should have asked the physEngine if this is possible, and if not, returned false. | ||
118 | // prim.UpdatePosition( value ); | ||
119 | } | ||
120 | } | ||
121 | } | ||
122 | |||
123 | #endregion | ||
124 | } | ||
125 | |||
126 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs deleted file mode 100644 index 0ce65ea..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Environment.Scripting | ||
33 | { | ||
34 | public delegate Script ScriptFactory(); | ||
35 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs index 5d398b0..57df4c4 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/Script.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs | |||
@@ -28,26 +28,31 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using libsecondlife; | ||
32 | 31 | ||
33 | namespace OpenSim.Region.Environment.Scripting | 32 | using OpenSim.Region.Environment.Scenes; |
33 | using OpenSim.Framework.Console; | ||
34 | |||
35 | namespace OpenSim.Scripting | ||
34 | { | 36 | { |
35 | public class Script | 37 | /// <summary> |
38 | /// Class which provides access to the world | ||
39 | /// </summary> | ||
40 | public class ScriptInfo | ||
36 | { | 41 | { |
37 | private LLUUID m_scriptId; | 42 | // Reference to world.eventsManager provided for convenience |
38 | public virtual LLUUID ScriptId | 43 | public EventManager events; |
39 | { | 44 | |
40 | get | 45 | // The main world |
41 | { | 46 | public Scene world; |
42 | return m_scriptId; | 47 | |
43 | } | 48 | // The console |
44 | } | 49 | public LogBase logger; |
45 | 50 | ||
46 | public Script( LLUUID scriptId ) | 51 | public ScriptInfo(Scene scene) |
47 | { | 52 | { |
48 | m_scriptId = scriptId; | 53 | world = scene; |
54 | events = world.eventManager; | ||
55 | logger = OpenSim.Framework.Console.MainLog.Instance; | ||
49 | } | 56 | } |
50 | |||
51 | public ScriptEventHandler OnFrame; | ||
52 | } | 57 | } |
53 | } | 58 | } |
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs new file mode 100644 index 0000000..5d1d188 --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs | |||
@@ -0,0 +1,99 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Scripting | ||
33 | { | ||
34 | public class ScriptManager | ||
35 | { | ||
36 | List<IScript> scripts = new List<IScript>(); | ||
37 | OpenSim.Region.Environment.Scenes.Scene scene; | ||
38 | Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>(); | ||
39 | |||
40 | private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts) | ||
41 | { | ||
42 | foreach (KeyValuePair<string, IScript> script in compiledscripts) | ||
43 | { | ||
44 | ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. | ||
45 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading " + script.Key); | ||
46 | script.Value.Initialise(scriptInfo); | ||
47 | scripts.Add(script.Value); | ||
48 | } | ||
49 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)"); | ||
50 | } | ||
51 | |||
52 | public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world) | ||
53 | { | ||
54 | scene = world; | ||
55 | |||
56 | // Default Engines | ||
57 | CSharpScriptEngine csharpCompiler = new CSharpScriptEngine(); | ||
58 | compilers.Add(csharpCompiler.FileExt(),csharpCompiler); | ||
59 | |||
60 | JScriptEngine jscriptCompiler = new JScriptEngine(); | ||
61 | compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler); | ||
62 | |||
63 | JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine(); | ||
64 | compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler); | ||
65 | } | ||
66 | |||
67 | public void Compile(string filename) | ||
68 | { | ||
69 | foreach (KeyValuePair<string, IScriptCompiler> compiler in compilers) | ||
70 | { | ||
71 | if (filename.EndsWith(compiler.Key)) | ||
72 | { | ||
73 | LoadFromCompiler(compiler.Value.compile(filename)); | ||
74 | break; | ||
75 | } | ||
76 | } | ||
77 | } | ||
78 | |||
79 | public void RunScriptCmd(string[] args) | ||
80 | { | ||
81 | switch (args[0]) | ||
82 | { | ||
83 | case "load": | ||
84 | Compile(args[1]); | ||
85 | break; | ||
86 | |||
87 | default: | ||
88 | OpenSim.Framework.Console.MainLog.Instance.Error("Unknown script command"); | ||
89 | break; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | |||
94 | interface IScriptCompiler | ||
95 | { | ||
96 | Dictionary<string,IScript> compile(string filename); | ||
97 | string FileExt(); | ||
98 | } | ||
99 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs deleted file mode 100644 index 90c79e3..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Region.Environment.Scripting | ||
34 | { | ||
35 | public class FollowRandomAvatar : Script | ||
36 | { | ||
37 | public FollowRandomAvatar() | ||
38 | : base(LLUUID.Random()) | ||
39 | { | ||
40 | OnFrame += MyOnFrame; | ||
41 | } | ||
42 | |||
43 | private void MyOnFrame(IScriptContext context) | ||
44 | { | ||
45 | LLVector3 pos = context.Entity.Pos; | ||
46 | |||
47 | IScriptReadonlyEntity avatar; | ||
48 | |||
49 | if (context.TryGetRandomAvatar(out avatar)) | ||
50 | { | ||
51 | LLVector3 avatarPos = avatar.Pos; | ||
52 | |||
53 | float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2; | ||
54 | float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2; | ||
55 | |||
56 | LLVector3 newPos = new LLVector3(x, y, pos.Z); | ||
57 | |||
58 | context.Entity.Pos = newPos; | ||
59 | } | ||
60 | } | ||
61 | } | ||
62 | |||
63 | |||
64 | } | ||
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build new file mode 100644 index 0000000..f8896fa --- /dev/null +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build | |||
@@ -0,0 +1,54 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="SimpleApp" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
9 | </copy> | ||
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="SimpleApp" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="MyWorld.cs" /> | ||
15 | <include name="Program.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../../bin/OpenSim.Framework.Communications.dll" /> | ||
26 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
27 | <include name="../../../../bin/OpenSim.Framework.Servers.dll" /> | ||
28 | <include name="../../../../bin/OpenSim.Region.Caches.dll" /> | ||
29 | <include name="../../../../bin/OpenSim.Region.ClientStack.dll" /> | ||
30 | <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> | ||
31 | <include name="../../../../bin/OpenSim.Region.Environment.dll" /> | ||
32 | <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" /> | ||
33 | <include name="System.dll" /> | ||
34 | <include name="System.Data.dll.dll" /> | ||
35 | <include name="System.Xml.dll" /> | ||
36 | <include name="../../../../bin/XMLRPC.dll" /> | ||
37 | </references> | ||
38 | </csc> | ||
39 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
40 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
41 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
42 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
43 | <include name="*.dll"/> | ||
44 | <include name="*.exe"/> | ||
45 | </fileset> | ||
46 | </copy> | ||
47 | </target> | ||
48 | <target name="clean"> | ||
49 | <delete dir="${bin.dir}" failonerror="false" /> | ||
50 | <delete dir="${obj.dir}" failonerror="false" /> | ||
51 | </target> | ||
52 | <target name="doc" description="Creates documentation."> | ||
53 | </target> | ||
54 | </project> | ||
diff --git a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build new file mode 100644 index 0000000..4770e6d --- /dev/null +++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build | |||
@@ -0,0 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.GridInterfaces.Local" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.GridInterfaces.Local" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="LocalAssetServer.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="../../../../bin/Db4objects.Db4o.dll" /> | ||
23 | <include name="../../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Xml.dll" /> | ||
28 | </references> | ||
29 | </csc> | ||
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/"/> | ||
32 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
34 | <include name="*.dll"/> | ||
35 | <include name="*.exe"/> | ||
36 | </fileset> | ||
37 | </copy> | ||
38 | </target> | ||
39 | <target name="clean"> | ||
40 | <delete dir="${bin.dir}" failonerror="false" /> | ||
41 | <delete dir="${obj.dir}" failonerror="false" /> | ||
42 | </target> | ||
43 | <target name="doc" description="Creates documentation."> | ||
44 | </target> | ||
45 | </project> | ||
diff --git a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build new file mode 100644 index 0000000..0bf1b86 --- /dev/null +++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build | |||
@@ -0,0 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.GridInterfaces.Remote" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.GridInterfaces.Remote" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="RemoteAssetServer.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="../../../../bin/libsecondlife.dll" /> | ||
23 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | <include name="System.Xml.dll" /> | ||
27 | <include name="../../../../bin/XMLRPC.dll" /> | ||
28 | </references> | ||
29 | </csc> | ||
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/"/> | ||
32 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
34 | <include name="*.dll"/> | ||
35 | <include name="*.exe"/> | ||
36 | </fileset> | ||
37 | </copy> | ||
38 | </target> | ||
39 | <target name="clean"> | ||
40 | <delete dir="${bin.dir}" failonerror="false" /> | ||
41 | <delete dir="${obj.dir}" failonerror="false" /> | ||
42 | </target> | ||
43 | <target name="doc" description="Creates documentation."> | ||
44 | </target> | ||
45 | </project> | ||
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build new file mode 100644 index 0000000..6cf26ca --- /dev/null +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build | |||
@@ -0,0 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Physics.BasicPhysicsPlugin" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Physics.BasicPhysicsPlugin" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="BasicPhysicsPlugin.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="../../../../bin/Axiom.MathLib.dll" /> | ||
23 | <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
24 | <include name="System.dll" /> | ||
25 | </references> | ||
26 | </csc> | ||
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/"/> | ||
29 | <copy todir="${project::get-base-directory()}/../../../../bin/Physics/"> | ||
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
31 | <include name="*.dll"/> | ||
32 | <include name="*.exe"/> | ||
33 | </fileset> | ||
34 | </copy> | ||
35 | </target> | ||
36 | <target name="clean"> | ||
37 | <delete dir="${bin.dir}" failonerror="false" /> | ||
38 | <delete dir="${obj.dir}" failonerror="false" /> | ||
39 | </target> | ||
40 | <target name="doc" description="Creates documentation."> | ||
41 | </target> | ||
42 | </project> | ||
diff --git a/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build new file mode 100644 index 0000000..4b7ce81 --- /dev/null +++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build | |||
@@ -0,0 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Physics.Manager" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Physics.Manager" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="PhysicsActor.cs" /> | ||
16 | <include name="PhysicsManager.cs" /> | ||
17 | <include name="PhysicsScene.cs" /> | ||
18 | <include name="PhysicsVector.cs" /> | ||
19 | </sources> | ||
20 | <references basedir="${project::get-base-directory()}"> | ||
21 | <lib> | ||
22 | <include name="${project::get-base-directory()}" /> | ||
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
24 | </lib> | ||
25 | <include name="../../../../bin/Axiom.MathLib.dll" /> | ||
26 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
27 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
28 | <include name="System.dll" /> | ||
29 | <include name="System.Xml.dll" /> | ||
30 | </references> | ||
31 | </csc> | ||
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
33 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
34 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
36 | <include name="*.dll"/> | ||
37 | <include name="*.exe"/> | ||
38 | </fileset> | ||
39 | </copy> | ||
40 | </target> | ||
41 | <target name="clean"> | ||
42 | <delete dir="${bin.dir}" failonerror="false" /> | ||
43 | <delete dir="${obj.dir}" failonerror="false" /> | ||
44 | </target> | ||
45 | <target name="doc" description="Creates documentation."> | ||
46 | </target> | ||
47 | </project> | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build new file mode 100644 index 0000000..07b9386 --- /dev/null +++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build | |||
@@ -0,0 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Physics.OdePlugin" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Physics.OdePlugin" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="OdePlugin.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="../../../../bin/Axiom.MathLib.dll" /> | ||
23 | <include name="../../../../bin/Ode.NET.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | </references> | ||
27 | </csc> | ||
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/"/> | ||
30 | <copy todir="${project::get-base-directory()}/../../../../bin/Physics/"> | ||
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/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build new file mode 100644 index 0000000..c1a9608 --- /dev/null +++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build | |||
@@ -0,0 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Physics.PhysXPlugin" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Physics.PhysXPlugin" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="PhysXPlugin.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="../../../../bin/Axiom.MathLib.dll" /> | ||
23 | <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
24 | <include name="../../../../bin/PhysX_Wrapper_Dotnet.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | </references> | ||
27 | </csc> | ||
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/"/> | ||
30 | <copy todir="${project::get-base-directory()}/../../../../bin/Physics/"> | ||
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/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build new file mode 100644 index 0000000..20f5171 --- /dev/null +++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build | |||
@@ -0,0 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Storage.LocalStorageBerkeleyDB" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="BDBLocalStorage.cs" /> | ||
15 | </sources> | ||
16 | <references basedir="${project::get-base-directory()}"> | ||
17 | <lib> | ||
18 | <include name="${project::get-base-directory()}" /> | ||
19 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
20 | </lib> | ||
21 | <include name="../../../../bin/Kds.Serialization.dll" /> | ||
22 | <include name="../../../../bin/libdb_dotNET43.dll" /> | ||
23 | <include name="../../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Data.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
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/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj index 716fd57..147158c 100644 --- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj | |||
@@ -93,6 +93,9 @@ | |||
93 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="Db4LocalStorage.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
96 | <Compile Include="MapStorage.cs"> | 99 | <Compile Include="MapStorage.cs"> |
97 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
98 | </Compile> | 101 | </Compile> |
@@ -102,9 +105,6 @@ | |||
102 | <Compile Include="UUIDPrimQuery.cs"> | 105 | <Compile Include="UUIDPrimQuery.cs"> |
103 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
104 | </Compile> | 107 | </Compile> |
105 | <Compile Include="Db4LocalStorage.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | </ItemGroup> | 108 | </ItemGroup> |
109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
110 | <PropertyGroup> | 110 | <PropertyGroup> |
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build new file mode 100644 index 0000000..fc9f055 --- /dev/null +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build | |||
@@ -0,0 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Storage.LocalStorageDb4o" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Storage.LocalStorageDb4o" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="Db4LocalStorage.cs" /> | ||
16 | <include name="MapStorage.cs" /> | ||
17 | <include name="UUIDParcelQuery.cs" /> | ||
18 | <include name="UUIDPrimQuery.cs" /> | ||
19 | </sources> | ||
20 | <references basedir="${project::get-base-directory()}"> | ||
21 | <lib> | ||
22 | <include name="${project::get-base-directory()}" /> | ||
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
24 | </lib> | ||
25 | <include name="../../../../bin/Db4objects.Db4o.dll" /> | ||
26 | <include name="../../../../bin/libsecondlife.dll" /> | ||
27 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
28 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
29 | <include name="System.dll" /> | ||
30 | <include name="System.Xml.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/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build new file mode 100644 index 0000000..9d12c33 --- /dev/null +++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build | |||
@@ -0,0 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Storage.LocalStorageSQLite" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Storage.LocalStorageSQLite" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="SQLiteLocalStorage.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="../../../../bin/libsecondlife.dll" /> | ||
23 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | <include name="System.Data.dll" /> | ||
27 | <include name="../../../../bin/System.Data.SQLite.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
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/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj index 60a2d2b..24667e5 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj +++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj | |||
@@ -90,10 +90,10 @@ | |||
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="TerrainFilter.cs"> | 93 | <Compile Include="TerrainEngine.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="TerrainEngine.cs"> | 96 | <Compile Include="TerrainFilter.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="Properties\AssemblyInfo.cs"> | 99 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build new file mode 100644 index 0000000..dc7203a --- /dev/null +++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build | |||
@@ -0,0 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.Terrain.BasicTerrain" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.Region.Terrain.BasicTerrain" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="TerrainEngine.cs" /> | ||
15 | <include name="TerrainFilter.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/libTerrain-BSD.dll" /> | ||
24 | <include name="Microsoft.JScript.dll" /> | ||
25 | <include name="../../../bin/openjpegnet.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Data.dll" /> | ||
28 | <include name="System.Drawing.dll" /> | ||
29 | <include name="System.Xml.dll" /> | ||
30 | </references> | ||
31 | </csc> | ||
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
33 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
34 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
36 | <include name="*.dll"/> | ||
37 | <include name="*.exe"/> | ||
38 | </fileset> | ||
39 | </copy> | ||
40 | </target> | ||
41 | <target name="clean"> | ||
42 | <delete dir="${bin.dir}" failonerror="false" /> | ||
43 | <delete dir="${obj.dir}" failonerror="false" /> | ||
44 | </target> | ||
45 | <target name="doc" description="Creates documentation."> | ||
46 | </target> | ||
47 | </project> | ||
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs index f04ac56..e0ae586 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
1 | using System; | 28 | using System; |
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
@@ -48,7 +75,7 @@ namespace OpenSim.Region.Terrain | |||
48 | compilerParams.GenerateInMemory = true; | 75 | compilerParams.GenerateInMemory = true; |
49 | compilerParams.IncludeDebugInformation = false; | 76 | compilerParams.IncludeDebugInformation = false; |
50 | compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll"); | 77 | compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll"); |
51 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.Terrain.BasicTerrain.dll"); | 78 | compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll"); |
52 | compilerParams.ReferencedAssemblies.Add("System.dll"); | 79 | compilerParams.ReferencedAssemblies.Add("System.dll"); |
53 | 80 | ||
54 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | 81 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); |
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index f332827..c8b859c 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj | |||
@@ -83,6 +83,9 @@ | |||
83 | <Compile Include="Prebuild.cs"> | 83 | <Compile Include="Prebuild.cs"> |
84 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
85 | </Compile> | 85 | </Compile> |
86 | <Compile Include="Core\FatalException.cs"> | ||
87 | <SubType>Code</SubType> | ||
88 | </Compile> | ||
86 | <Compile Include="Core\Kernel.cs"> | 89 | <Compile Include="Core\Kernel.cs"> |
87 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
88 | </Compile> | 91 | </Compile> |
@@ -92,25 +95,19 @@ | |||
92 | <Compile Include="Core\WarningException.cs"> | 95 | <Compile Include="Core\WarningException.cs"> |
93 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
94 | </Compile> | 97 | </Compile> |
95 | <Compile Include="Core\FatalException.cs"> | 98 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> |
96 | <SubType>Code</SubType> | ||
97 | </Compile> | ||
98 | <Compile Include="Core\Interfaces\ITarget.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
101 | <Compile Include="Core\Interfaces\IDataNode.cs"> | ||
102 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
103 | </Compile> | 100 | </Compile> |
104 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> | 101 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> |
105 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
106 | </Compile> | 103 | </Compile> |
107 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> | 104 | <Compile Include="Core\Attributes\TargetAttribute.cs"> |
108 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
109 | </Compile> | 106 | </Compile> |
110 | <Compile Include="Core\Attributes\TargetAttribute.cs"> | 107 | <Compile Include="Core\Interfaces\IDataNode.cs"> |
111 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
112 | </Compile> | 109 | </Compile> |
113 | <Compile Include="Core\Nodes\ProjectNode.cs"> | 110 | <Compile Include="Core\Interfaces\ITarget.cs"> |
114 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
115 | </Compile> | 112 | </Compile> |
116 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> | 113 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> |
@@ -122,73 +119,76 @@ | |||
122 | <Compile Include="Core\Nodes\ExcludeNode.cs"> | 119 | <Compile Include="Core\Nodes\ExcludeNode.cs"> |
123 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
124 | </Compile> | 121 | </Compile> |
125 | <Compile Include="Core\Nodes\OptionsNode.cs"> | 122 | <Compile Include="Core\Nodes\FileNode.cs"> |
126 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
127 | </Compile> | 124 | </Compile> |
128 | <Compile Include="Core\Nodes\ReferencePathNode.cs"> | 125 | <Compile Include="Core\Nodes\FilesNode.cs"> |
129 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
130 | </Compile> | 127 | </Compile> |
131 | <Compile Include="Core\Nodes\MatchNode.cs"> | 128 | <Compile Include="Core\Nodes\MatchNode.cs"> |
132 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
133 | </Compile> | 130 | </Compile> |
134 | <Compile Include="Core\Nodes\SolutionNode.cs"> | 131 | <Compile Include="Core\Nodes\OptionsNode.cs"> |
135 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
136 | </Compile> | 133 | </Compile> |
137 | <Compile Include="Core\Nodes\ProcessNode.cs"> | 134 | <Compile Include="Core\Nodes\ProcessNode.cs"> |
138 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
139 | </Compile> | 136 | </Compile> |
137 | <Compile Include="Core\Nodes\ProjectNode.cs"> | ||
138 | <SubType>Code</SubType> | ||
139 | </Compile> | ||
140 | <Compile Include="Core\Nodes\ReferenceNode.cs"> | 140 | <Compile Include="Core\Nodes\ReferenceNode.cs"> |
141 | <SubType>Code</SubType> | 141 | <SubType>Code</SubType> |
142 | </Compile> | 142 | </Compile> |
143 | <Compile Include="Core\Nodes\FileNode.cs"> | 143 | <Compile Include="Core\Nodes\ReferencePathNode.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="Core\Nodes\FilesNode.cs"> | 146 | <Compile Include="Core\Nodes\SolutionNode.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="Core\Targets\DebugTarget.cs"> | 149 | <Compile Include="Core\Parse\IfContext.cs"> |
150 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
151 | </Compile> | 151 | </Compile> |
152 | <Compile Include="Core\Targets\MonoDevelopTarget.cs"> | 152 | <Compile Include="Core\Parse\Preprocessor.cs"> |
153 | <SubType>Code</SubType> | 153 | <SubType>Code</SubType> |
154 | </Compile> | 154 | </Compile> |
155 | <Compile Include="Core\Targets\AutotoolsTarget.cs"> | 155 | <Compile Include="Core\Targets\AutotoolsTarget.cs"> |
156 | <SubType>Code</SubType> | 156 | <SubType>Code</SubType> |
157 | </Compile> | 157 | </Compile> |
158 | <Compile Include="Core\Targets\SharpDevelopTarget.cs"> | 158 | <Compile Include="Core\Targets\DebugTarget.cs"> |
159 | <SubType>Code</SubType> | 159 | <SubType>Code</SubType> |
160 | </Compile> | 160 | </Compile> |
161 | <Compile Include="Core\Targets\VS2002Target.cs"> | 161 | <Compile Include="Core\Targets\MonoDevelopTarget.cs"> |
162 | <SubType>Code</SubType> | 162 | <SubType>Code</SubType> |
163 | </Compile> | 163 | </Compile> |
164 | <Compile Include="Core\Targets\VS2003Target.cs"> | 164 | <Compile Include="Core\Targets\NAntTarget.cs"> |
165 | <SubType>Code</SubType> | 165 | <SubType>Code</SubType> |
166 | </Compile> | 166 | </Compile> |
167 | <Compile Include="Core\Targets\SharpDevelop2Target.cs"> | 167 | <Compile Include="Core\Targets\SharpDevelop2Target.cs"> |
168 | <SubType>Code</SubType> | 168 | <SubType>Code</SubType> |
169 | </Compile> | 169 | </Compile> |
170 | <Compile Include="Core\Targets\VS2005Target.cs"> | 170 | <Compile Include="Core\Targets\SharpDevelopTarget.cs"> |
171 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
172 | </Compile> | 172 | </Compile> |
173 | <Compile Include="Core\Targets\NAntTarget.cs"> | 173 | <Compile Include="Core\Targets\VS2002Target.cs"> |
174 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
175 | </Compile> | 175 | </Compile> |
176 | <Compile Include="Core\Parse\IfContext.cs"> | 176 | <Compile Include="Core\Targets\VS2003Target.cs"> |
177 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
178 | </Compile> | 178 | </Compile> |
179 | <Compile Include="Core\Parse\Preprocessor.cs"> | 179 | <Compile Include="Core\Targets\VS2005Target.cs"> |
180 | <SubType>Code</SubType> | 180 | <SubType>Code</SubType> |
181 | </Compile> | 181 | </Compile> |
182 | <Compile Include="Core\Utilities\Helper.cs"> | 182 | <Compile Include="Core\Utilities\CommandLineCollection.cs"> |
183 | <SubType>Code</SubType> | 183 | <SubType>Code</SubType> |
184 | </Compile> | 184 | </Compile> |
185 | <Compile Include="Core\Utilities\Log.cs"> | 185 | <Compile Include="Core\Utilities\CurrentDirectory.cs"> |
186 | <SubType>Code</SubType> | 186 | <SubType>Code</SubType> |
187 | </Compile> | 187 | </Compile> |
188 | <Compile Include="Core\Utilities\CommandLineCollection.cs"> | 188 | <Compile Include="Core\Utilities\Helper.cs"> |
189 | <SubType>Code</SubType> | 189 | <SubType>Code</SubType> |
190 | </Compile> | 190 | </Compile> |
191 | <Compile Include="Core\Utilities\CurrentDirectory.cs"> | 191 | <Compile Include="Core\Utilities\Log.cs"> |
192 | <SubType>Code</SubType> | 192 | <SubType>Code</SubType> |
193 | </Compile> | 193 | </Compile> |
194 | <Compile Include="Properties\AssemblyInfo.cs"> | 194 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index 52dd1a7..2851125 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build | |||
@@ -14,42 +14,42 @@ | |||
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/Kernel.cs" /> | 18 | <include name="Core/Kernel.cs" /> |
18 | <include name="Core/UnknownLanguageException.cs" /> | 19 | <include name="Core/UnknownLanguageException.cs" /> |
19 | <include name="Core/WarningException.cs" /> | 20 | <include name="Core/WarningException.cs" /> |
20 | <include name="Core/FatalException.cs" /> | ||
21 | <include name="Core/Interfaces/ITarget.cs" /> | ||
22 | <include name="Core/Interfaces/IDataNode.cs" /> | ||
23 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | ||
24 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | 21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> |
22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | ||
25 | <include name="Core/Attributes/TargetAttribute.cs" /> | 23 | <include name="Core/Attributes/TargetAttribute.cs" /> |
26 | <include name="Core/Nodes/ProjectNode.cs" /> | 24 | <include name="Core/Interfaces/IDataNode.cs" /> |
25 | <include name="Core/Interfaces/ITarget.cs" /> | ||
27 | <include name="Core/Nodes/ConfigurationNode.cs" /> | 26 | <include name="Core/Nodes/ConfigurationNode.cs" /> |
28 | <include name="Core/Nodes/DataNode.cs" /> | 27 | <include name="Core/Nodes/DataNode.cs" /> |
29 | <include name="Core/Nodes/ExcludeNode.cs" /> | 28 | <include name="Core/Nodes/ExcludeNode.cs" /> |
30 | <include name="Core/Nodes/OptionsNode.cs" /> | 29 | <include name="Core/Nodes/FileNode.cs" /> |
31 | <include name="Core/Nodes/ReferencePathNode.cs" /> | 30 | <include name="Core/Nodes/FilesNode.cs" /> |
32 | <include name="Core/Nodes/MatchNode.cs" /> | 31 | <include name="Core/Nodes/MatchNode.cs" /> |
33 | <include name="Core/Nodes/SolutionNode.cs" /> | 32 | <include name="Core/Nodes/OptionsNode.cs" /> |
34 | <include name="Core/Nodes/ProcessNode.cs" /> | 33 | <include name="Core/Nodes/ProcessNode.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/FileNode.cs" /> | 36 | <include name="Core/Nodes/ReferencePathNode.cs" /> |
37 | <include name="Core/Nodes/FilesNode.cs" /> | 37 | <include name="Core/Nodes/SolutionNode.cs" /> |
38 | <include name="Core/Parse/IfContext.cs" /> | ||
39 | <include name="Core/Parse/Preprocessor.cs" /> | ||
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | ||
38 | <include name="Core/Targets/DebugTarget.cs" /> | 41 | <include name="Core/Targets/DebugTarget.cs" /> |
39 | <include name="Core/Targets/MonoDevelopTarget.cs" /> | 42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> |
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | 43 | <include name="Core/Targets/NAntTarget.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | ||
41 | <include name="Core/Targets/SharpDevelopTarget.cs" /> | 45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> |
42 | <include name="Core/Targets/VS2002Target.cs" /> | 46 | <include name="Core/Targets/VS2002Target.cs" /> |
43 | <include name="Core/Targets/VS2003Target.cs" /> | 47 | <include name="Core/Targets/VS2003Target.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | ||
45 | <include name="Core/Targets/VS2005Target.cs" /> | 48 | <include name="Core/Targets/VS2005Target.cs" /> |
46 | <include name="Core/Targets/NAntTarget.cs" /> | ||
47 | <include name="Core/Parse/IfContext.cs" /> | ||
48 | <include name="Core/Parse/Preprocessor.cs" /> | ||
49 | <include name="Core/Utilities/Helper.cs" /> | ||
50 | <include name="Core/Utilities/Log.cs" /> | ||
51 | <include name="Core/Utilities/CommandLineCollection.cs" /> | 49 | <include name="Core/Utilities/CommandLineCollection.cs" /> |
52 | <include name="Core/Utilities/CurrentDirectory.cs" /> | 50 | <include name="Core/Utilities/CurrentDirectory.cs" /> |
51 | <include name="Core/Utilities/Helper.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()}"> |
diff --git a/prebuild.xml b/prebuild.xml index b4cfc63..1e51bd4 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -143,9 +143,7 @@ | |||
143 | <Reference name="libsecondlife.dll"/> | 143 | <Reference name="libsecondlife.dll"/> |
144 | <Reference name="OpenSim.Framework"/> | 144 | <Reference name="OpenSim.Framework"/> |
145 | <Reference name="OpenSim.Framework.Servers"/> | 145 | <Reference name="OpenSim.Framework.Servers"/> |
146 | <Reference name="OpenSim.Framework.Utilities"/> | 146 | <Reference name="OpenSim.Region.Caches"/> |
147 | <Reference name="OpenSim.Framework.Types"/> | ||
148 | <Reference name="OpenSim.Region.Caches"/> | ||
149 | <Reference name="XMLRPC.dll"/> | 147 | <Reference name="XMLRPC.dll"/> |
150 | 148 | ||
151 | <Files> | 149 | <Files> |
@@ -636,6 +634,10 @@ | |||
636 | <Reference name="OpenSim.Framework.Servers"/> | 634 | <Reference name="OpenSim.Framework.Servers"/> |
637 | <Reference name="OpenSim.Region.Caches"/> | 635 | <Reference name="OpenSim.Region.Caches"/> |
638 | <Reference name="OpenSim.Region.Capabilities"/> | 636 | <Reference name="OpenSim.Region.Capabilities"/> |
637 | <!-- For scripting in funny languages by default --> | ||
638 | <Reference name="Microsoft.JScript"/> | ||
639 | <!-- This needs checking with the Mono folks --> | ||
640 | <Reference name="VJSharpCodeProvider"/> | ||
639 | <Reference name="XMLRPC.dll"/> | 641 | <Reference name="XMLRPC.dll"/> |
640 | <Reference name="OpenSim.Framework.Communications"/> | 642 | <Reference name="OpenSim.Framework.Communications"/> |
641 | 643 | ||