diff options
author | lbsa71 | 2007-03-26 13:56:38 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-26 13:56:38 +0000 |
commit | 52655cc4072ffb35f426e285b1c82bfffe342734 (patch) | |
tree | 8d83e71eb4dd3e8587a38cac13707a00efa2c064 | |
parent | Added -ode parameter (diff) | |
download | opensim-SC-52655cc4072ffb35f426e285b1c82bfffe342734.zip opensim-SC-52655cc4072ffb35f426e285b1c82bfffe342734.tar.gz opensim-SC-52655cc4072ffb35f426e285b1c82bfffe342734.tar.bz2 opensim-SC-52655cc4072ffb35f426e285b1c82bfffe342734.tar.xz |
* fixed buildfiles
Diffstat (limited to '')
36 files changed, 1119 insertions, 1103 deletions
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index e2a9941..4a4c38e 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{2E6F5AFB-1130-4200-B089-3B0FCD111343}</ProjectGuid> | 6 | <ProjectGuid>{F7DE71C5-CD20-4AD8-83A4-1363066853A6}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index e119279..a054143 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | |||
@@ -1,49 +1,49 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.GridServer" default="build"> | 2 | <project name="OpenGridServices.GridServer" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 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="OpenGridServices.GridServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ConsoleCmds.cs" /> | 14 | <include name="ConsoleCmds.cs" /> |
15 | <include name="GridHttp.cs" /> | 15 | <include name="GridHttp.cs" /> |
16 | <include name="Main.cs" /> | 16 | <include name="Main.cs" /> |
17 | <include name="SimProfiles.cs" /> | 17 | <include name="SimProfiles.cs" /> |
18 | <include name="Properties/AssemblyInfo.cs" /> | 18 | <include name="Properties/AssemblyInfo.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
22 | <include name="${project::get-base-directory()}" /> | 22 | <include name="${project::get-base-directory()}" /> |
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | 23 | <include name="${project::get-base-directory()}/${build.dir}" /> |
24 | </lib> | 24 | </lib> |
25 | <include name="System.dll" /> | 25 | <include name="System.dll" /> |
26 | <include name="System.Data.dll" /> | 26 | <include name="System.Data.dll" /> |
27 | <include name="System.Xml.dll" /> | 27 | <include name="System.Xml.dll" /> |
28 | <include name="../bin/OpenSim.Framework.dll" /> | 28 | <include name="../bin/OpenSim.Framework.dll" /> |
29 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 29 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
30 | <include name="../bin/OpenGridServices.ServerConsole.dll" /> | 30 | <include name="../bin/OpenGridServices.ServerConsole.dll" /> |
31 | <include name="../bin/libsecondlife.dll" /> | 31 | <include name="../bin/libsecondlife.dll" /> |
32 | </references> | 32 | </references> |
33 | </csc> | 33 | </csc> |
34 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 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/"/> | 35 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
36 | <copy todir="${project::get-base-directory()}/../bin/"> | 36 | <copy todir="${project::get-base-directory()}/../bin/"> |
37 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 37 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
38 | <include name="*.dll"/> | 38 | <include name="*.dll"/> |
39 | <include name="*.exe"/> | 39 | <include name="*.exe"/> |
40 | </fileset> | 40 | </fileset> |
41 | </copy> | 41 | </copy> |
42 | </target> | 42 | </target> |
43 | <target name="clean"> | 43 | <target name="clean"> |
44 | <delete dir="${bin.dir}" failonerror="false" /> | 44 | <delete dir="${bin.dir}" failonerror="false" /> |
45 | <delete dir="${obj.dir}" failonerror="false" /> | 45 | <delete dir="${obj.dir}" failonerror="false" /> |
46 | </target> | 46 | </target> |
47 | <target name="doc" description="Creates documentation."> | 47 | <target name="doc" description="Creates documentation."> |
48 | </target> | 48 | </target> |
49 | </project> | 49 | </project> |
diff --git a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.csproj b/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.csproj index 65b3011..49e3306 100644 --- a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.csproj +++ b/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{871ABABA-7F63-4CD8-9BA8-E9297F29DD45}</ProjectGuid> | 6 | <ProjectGuid>{7DC4E7C8-89A4-4A8D-9617-3DF262990663}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
diff --git a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build b/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build index 2e6ec3e..270f925 100644 --- a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build +++ b/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.ServerConsole" default="build"> | 2 | <project name="OpenGridServices.ServerConsole" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGridServices.ServerConsole" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.ServerConsole" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ServerConsole.cs" /> | 14 | <include name="ServerConsole.cs" /> |
15 | <include name="Properties/AssemblyInfo.cs" /> | 15 | <include name="Properties/AssemblyInfo.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="System.Data.dll" /> | 23 | <include name="System.Data.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../bin/OpenSim.Framework.dll" /> | 25 | <include name="../bin/OpenSim.Framework.dll" /> |
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
30 | <copy todir="${project::get-base-directory()}/../bin/"> | 30 | <copy todir="${project::get-base-directory()}/../bin/"> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
32 | <include name="*.dll"/> | 32 | <include name="*.dll"/> |
33 | <include name="*.exe"/> | 33 | <include name="*.exe"/> |
34 | </fileset> | 34 | </fileset> |
35 | </copy> | 35 | </copy> |
36 | </target> | 36 | </target> |
37 | <target name="clean"> | 37 | <target name="clean"> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <delete dir="${bin.dir}" failonerror="false" /> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${obj.dir}" failonerror="false" /> |
40 | </target> | 40 | </target> |
41 | <target name="doc" description="Creates documentation."> | 41 | <target name="doc" description="Creates documentation."> |
42 | </target> | 42 | </target> |
43 | </project> | 43 | </project> |
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 51bf777..7ffd949 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{572FF644-323A-4FDE-9A05-0F33C740630F}</ProjectGuid> | 6 | <ProjectGuid>{3FE545CA-1179-42DF-BDF1-F14DEA463A21}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 710b01b..f4e58d9 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build | |||
@@ -1,48 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.UserServer" default="build"> | 2 | <project name="OpenGridServices.UserServer" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 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="OpenGridServices.UserServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ConsoleCmds.cs" /> | 14 | <include name="ConsoleCmds.cs" /> |
15 | <include name="Main.cs" /> | 15 | <include name="Main.cs" /> |
16 | <include name="UserHttp.cs" /> | 16 | <include name="UserHttp.cs" /> |
17 | <include name="Properties/AssemblyInfo.cs" /> | 17 | <include name="Properties/AssemblyInfo.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
20 | <lib> | 20 | <lib> |
21 | <include name="${project::get-base-directory()}" /> | 21 | <include name="${project::get-base-directory()}" /> |
22 | <include name="${project::get-base-directory()}/${build.dir}" /> | 22 | <include name="${project::get-base-directory()}/${build.dir}" /> |
23 | </lib> | 23 | </lib> |
24 | <include name="System.dll" /> | 24 | <include name="System.dll" /> |
25 | <include name="System.Data.dll" /> | 25 | <include name="System.Data.dll" /> |
26 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="../bin/OpenSim.Framework.dll" /> | 27 | <include name="../bin/OpenSim.Framework.dll" /> |
28 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
29 | <include name="../bin/OpenGridServices.ServerConsole.dll" /> | 29 | <include name="../bin/OpenGridServices.ServerConsole.dll" /> |
30 | <include name="../bin/libsecondlife.dll" /> | 30 | <include name="../bin/libsecondlife.dll" /> |
31 | </references> | 31 | </references> |
32 | </csc> | 32 | </csc> |
33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 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/"/> | 34 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
35 | <copy todir="${project::get-base-directory()}/../bin/"> | 35 | <copy todir="${project::get-base-directory()}/../bin/"> |
36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
37 | <include name="*.dll"/> | 37 | <include name="*.dll"/> |
38 | <include name="*.exe"/> | 38 | <include name="*.exe"/> |
39 | </fileset> | 39 | </fileset> |
40 | </copy> | 40 | </copy> |
41 | </target> | 41 | </target> |
42 | <target name="clean"> | 42 | <target name="clean"> |
43 | <delete dir="${bin.dir}" failonerror="false" /> | 43 | <delete dir="${bin.dir}" failonerror="false" /> |
44 | <delete dir="${obj.dir}" failonerror="false" /> | 44 | <delete dir="${obj.dir}" failonerror="false" /> |
45 | </target> | 45 | </target> |
46 | <target name="doc" description="Creates documentation."> | 46 | <target name="doc" description="Creates documentation."> |
47 | </target> | 47 | </target> |
48 | </project> | 48 | </project> |
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj index bf229b1..2959461 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{7A104F58-11C3-446C-BE67-4FCD36F23F2C}</ProjectGuid> | 6 | <ProjectGuid>{C7215018-D379-492D-9BB0-4B9DA0C6B9A0}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -82,13 +82,13 @@ | |||
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 83 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> |
84 | <Name>OpenSim.Framework</Name> | 84 | <Name>OpenSim.Framework</Name> |
85 | <Project>{03AE7311-0158-40B2-BA49-B1E560645594}</Project> | 85 | <Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 87 | <Private>False</Private> |
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 89 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
90 | <Name>OpenSim.Framework.Console</Name> | 90 | <Name>OpenSim.Framework.Console</Name> |
91 | <Project>{AD9B8A83-DF95-4B46-A91F-32F05669A390}</Project> | 91 | <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> |
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 93 | <Private>False</Private> |
94 | </ProjectReference> | 94 | </ProjectReference> |
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build index 703abe6..3dfa7ce 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Config.SimConfigDb4o" default="build"> | 2 | <project name="OpenSim.Config.SimConfigDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="DbSimConfig.cs" /> | 15 | <include name="DbSimConfig.cs" /> |
16 | <include name="MapStorage.cs" /> | 16 | <include name="MapStorage.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll.dll" /> | 24 | <include name="System.Data.dll.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../bin/Db4objects.Db4o.dll" /> | 27 | <include name="../../bin/Db4objects.Db4o.dll" /> |
28 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 28 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
29 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 29 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
38 | </fileset> | 38 | </fileset> |
39 | </copy> | 39 | </copy> |
40 | </target> | 40 | </target> |
41 | <target name="clean"> | 41 | <target name="clean"> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <delete dir="${bin.dir}" failonerror="false" /> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${obj.dir}" failonerror="false" /> |
44 | </target> | 44 | </target> |
45 | <target name="doc" description="Creates documentation."> | 45 | <target name="doc" description="Creates documentation."> |
46 | </target> | 46 | </target> |
47 | </project> | 47 | </project> |
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index 354b381..a2718a5 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{AD9B8A83-DF95-4B46-A91F-32F05669A390}</ProjectGuid> | 6 | <ProjectGuid>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build index 2dfc9b0..9ceaea6 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build | |||
@@ -1,41 +1,41 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework.Console" default="build"> | 2 | <project name="OpenSim.Framework.Console" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="ConsoleBase.cs" /> | 15 | <include name="ConsoleBase.cs" /> |
16 | <include name="MainConsole.cs" /> | 16 | <include name="MainConsole.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | </references> | 24 | </references> |
25 | </csc> | 25 | </csc> |
26 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 26 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
27 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 27 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
28 | <copy todir="${project::get-base-directory()}/../bin/"> | 28 | <copy todir="${project::get-base-directory()}/../bin/"> |
29 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 29 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
30 | <include name="*.dll"/> | 30 | <include name="*.dll"/> |
31 | <include name="*.exe"/> | 31 | <include name="*.exe"/> |
32 | </fileset> | 32 | </fileset> |
33 | </copy> | 33 | </copy> |
34 | </target> | 34 | </target> |
35 | <target name="clean"> | 35 | <target name="clean"> |
36 | <delete dir="${bin.dir}" failonerror="false" /> | 36 | <delete dir="${bin.dir}" failonerror="false" /> |
37 | <delete dir="${obj.dir}" failonerror="false" /> | 37 | <delete dir="${obj.dir}" failonerror="false" /> |
38 | </target> | 38 | </target> |
39 | <target name="doc" description="Creates documentation."> | 39 | <target name="doc" description="Creates documentation."> |
40 | </target> | 40 | </target> |
41 | </project> | 41 | </project> |
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index 727c8bd..79c15ae 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{03AE7311-0158-40B2-BA49-B1E560645594}</ProjectGuid> | 6 | <ProjectGuid>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index a5ec58c..79bbf05 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -1,63 +1,63 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework" default="build"> | 2 | <project name="OpenSim.Framework" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentCiruitData.cs" /> | 14 | <include name="AgentCiruitData.cs" /> |
15 | <include name="AgentInventory.cs" /> | 15 | <include name="AgentInventory.cs" /> |
16 | <include name="AssetBase.cs" /> | 16 | <include name="AssetBase.cs" /> |
17 | <include name="BlockingQueue.cs" /> | 17 | <include name="BlockingQueue.cs" /> |
18 | <include name="HeightMapGenHills.cs" /> | 18 | <include name="HeightMapGenHills.cs" /> |
19 | <include name="IAssetServer.cs" /> | 19 | <include name="IAssetServer.cs" /> |
20 | <include name="IConfig.cs" /> | 20 | <include name="IConfig.cs" /> |
21 | <include name="IGridServer.cs" /> | 21 | <include name="IGridServer.cs" /> |
22 | <include name="ILocalStorage.cs" /> | 22 | <include name="ILocalStorage.cs" /> |
23 | <include name="IUserServer.cs" /> | 23 | <include name="IUserServer.cs" /> |
24 | <include name="LocalGridBase.cs" /> | 24 | <include name="LocalGridBase.cs" /> |
25 | <include name="Login.cs" /> | 25 | <include name="Login.cs" /> |
26 | <include name="LoginService.cs" /> | 26 | <include name="LoginService.cs" /> |
27 | <include name="NeighbourInfo.cs" /> | 27 | <include name="NeighbourInfo.cs" /> |
28 | <include name="PrimData.cs" /> | 28 | <include name="PrimData.cs" /> |
29 | <include name="RemoteGridBase.cs" /> | 29 | <include name="RemoteGridBase.cs" /> |
30 | <include name="SimProfile.cs" /> | 30 | <include name="SimProfile.cs" /> |
31 | <include name="SimProfileBase.cs" /> | 31 | <include name="SimProfileBase.cs" /> |
32 | <include name="UserProfile.cs" /> | 32 | <include name="UserProfile.cs" /> |
33 | <include name="UserProfileManager.cs" /> | 33 | <include name="UserProfileManager.cs" /> |
34 | <include name="UserProfileManagerBase.cs" /> | 34 | <include name="UserProfileManagerBase.cs" /> |
35 | <include name="Util.cs" /> | 35 | <include name="Util.cs" /> |
36 | <include name="Properties/AssemblyInfo.cs" /> | 36 | <include name="Properties/AssemblyInfo.cs" /> |
37 | </sources> | 37 | </sources> |
38 | <references basedir="${project::get-base-directory()}"> | 38 | <references basedir="${project::get-base-directory()}"> |
39 | <lib> | 39 | <lib> |
40 | <include name="${project::get-base-directory()}" /> | 40 | <include name="${project::get-base-directory()}" /> |
41 | <include name="${project::get-base-directory()}/${build.dir}" /> | 41 | <include name="${project::get-base-directory()}/${build.dir}" /> |
42 | </lib> | 42 | </lib> |
43 | <include name="System.dll" /> | 43 | <include name="System.dll" /> |
44 | <include name="System.Xml.dll" /> | 44 | <include name="System.Xml.dll" /> |
45 | <include name="../bin/libsecondlife.dll" /> | 45 | <include name="../bin/libsecondlife.dll" /> |
46 | </references> | 46 | </references> |
47 | </csc> | 47 | </csc> |
48 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 48 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
49 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 49 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
50 | <copy todir="${project::get-base-directory()}/../bin/"> | 50 | <copy todir="${project::get-base-directory()}/../bin/"> |
51 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 51 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
52 | <include name="*.dll"/> | 52 | <include name="*.dll"/> |
53 | <include name="*.exe"/> | 53 | <include name="*.exe"/> |
54 | </fileset> | 54 | </fileset> |
55 | </copy> | 55 | </copy> |
56 | </target> | 56 | </target> |
57 | <target name="clean"> | 57 | <target name="clean"> |
58 | <delete dir="${bin.dir}" failonerror="false" /> | 58 | <delete dir="${bin.dir}" failonerror="false" /> |
59 | <delete dir="${obj.dir}" failonerror="false" /> | 59 | <delete dir="${obj.dir}" failonerror="false" /> |
60 | </target> | 60 | </target> |
61 | <target name="doc" description="Creates documentation."> | 61 | <target name="doc" description="Creates documentation."> |
62 | </target> | 62 | </target> |
63 | </project> | 63 | </project> |
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index 1ce2555..ca1f0da 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{78435A3F-EA0F-47AE-9539-E9E07D47F9A7}</ProjectGuid> | 6 | <ProjectGuid>{DB2D6331-438F-4C3F-83FD-B958E261CB0C}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -78,13 +78,13 @@ | |||
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 79 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> |
80 | <Name>OpenSim.Framework</Name> | 80 | <Name>OpenSim.Framework</Name> |
81 | <Project>{03AE7311-0158-40B2-BA49-B1E560645594}</Project> | 81 | <Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> |
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
83 | <Private>False</Private> | 83 | <Private>False</Private> |
84 | </ProjectReference> | 84 | </ProjectReference> |
85 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
86 | <Name>OpenSim.Framework.Console</Name> | 86 | <Name>OpenSim.Framework.Console</Name> |
87 | <Project>{AD9B8A83-DF95-4B46-A91F-32F05669A390}</Project> | 87 | <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> |
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
89 | <Private>False</Private> | 89 | <Private>False</Private> |
90 | </ProjectReference> | 90 | </ProjectReference> |
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index e3b33cb..ec65ba8 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Local" default="build"> | 2 | <project name="OpenSim.GridInterfaces.Local" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="LocalAssetServer.cs" /> | 15 | <include name="LocalAssetServer.cs" /> |
16 | <include name="LocalGridServer.cs" /> | 16 | <include name="LocalGridServer.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 27 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj index 970abb3..47657a9 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{D39D5A84-7A0B-4512-8AFE-8EC7BDD7F9B4}</ProjectGuid> | 6 | <ProjectGuid>{A6D9D790-2B1F-4088-BE12-91C4A69C1586}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -74,13 +74,13 @@ | |||
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 75 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> |
76 | <Name>OpenSim.Framework</Name> | 76 | <Name>OpenSim.Framework</Name> |
77 | <Project>{03AE7311-0158-40B2-BA49-B1E560645594}</Project> | 77 | <Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
81 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 81 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
82 | <Name>OpenSim.Framework.Console</Name> | 82 | <Name>OpenSim.Framework.Console</Name> |
83 | <Project>{AD9B8A83-DF95-4B46-A91F-32F05669A390}</Project> | 83 | <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> |
84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
85 | <Private>False</Private> | 85 | <Private>False</Private> |
86 | </ProjectReference> | 86 | </ProjectReference> |
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index 01bf0df..2060454 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build | |||
@@ -1,45 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> | 2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="RemoteAssetServer.cs" /> | 15 | <include name="RemoteAssetServer.cs" /> |
16 | <include name="RemoteGridServer.cs" /> | 16 | <include name="RemoteGridServer.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/libsecondlife.dll" /> | 25 | <include name="../../bin/libsecondlife.dll" /> |
26 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 26 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
27 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
28 | </references> | 28 | </references> |
29 | </csc> | 29 | </csc> |
30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
32 | <copy todir="${project::get-base-directory()}/../../bin/"> | 32 | <copy todir="${project::get-base-directory()}/../../bin/"> |
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
34 | <include name="*.dll"/> | 34 | <include name="*.dll"/> |
35 | <include name="*.exe"/> | 35 | <include name="*.exe"/> |
36 | </fileset> | 36 | </fileset> |
37 | </copy> | 37 | </copy> |
38 | </target> | 38 | </target> |
39 | <target name="clean"> | 39 | <target name="clean"> |
40 | <delete dir="${bin.dir}" failonerror="false" /> | 40 | <delete dir="${bin.dir}" failonerror="false" /> |
41 | <delete dir="${obj.dir}" failonerror="false" /> | 41 | <delete dir="${obj.dir}" failonerror="false" /> |
42 | </target> | 42 | </target> |
43 | <target name="doc" description="Creates documentation."> | 43 | <target name="doc" description="Creates documentation."> |
44 | </target> | 44 | </target> |
45 | </project> | 45 | </project> |
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index 5b89dd9..9bcf0b6 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{EFFAF441-6D39-4723-9F63-B8701F6190AB}</ProjectGuid> | 6 | <ProjectGuid>{5FBFB649-50BB-4CAB-B26C-29410D885559}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -70,7 +70,7 @@ | |||
70 | <ItemGroup> | 70 | <ItemGroup> |
71 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> | 71 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> |
72 | <Name>OpenSim.Physics.Manager</Name> | 72 | <Name>OpenSim.Physics.Manager</Name> |
73 | <Project>{A122E6D1-0245-40BB-9986-E7C828B2177B}</Project> | 73 | <Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> |
74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </ProjectReference> | 76 | </ProjectReference> |
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index 4217a06..f146733 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build | |||
@@ -1,42 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> | 2 | <project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="BasicPhysicsPlugin.cs" /> | 15 | <include name="BasicPhysicsPlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> | 24 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> |
25 | </references> | 25 | </references> |
26 | </csc> | 26 | </csc> |
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
28 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 28 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
29 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 29 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
31 | <include name="*.dll"/> | 31 | <include name="*.dll"/> |
32 | <include name="*.exe"/> | 32 | <include name="*.exe"/> |
33 | </fileset> | 33 | </fileset> |
34 | </copy> | 34 | </copy> |
35 | </target> | 35 | </target> |
36 | <target name="clean"> | 36 | <target name="clean"> |
37 | <delete dir="${bin.dir}" failonerror="false" /> | 37 | <delete dir="${bin.dir}" failonerror="false" /> |
38 | <delete dir="${obj.dir}" failonerror="false" /> | 38 | <delete dir="${obj.dir}" failonerror="false" /> |
39 | </target> | 39 | </target> |
40 | <target name="doc" description="Creates documentation."> | 40 | <target name="doc" description="Creates documentation."> |
41 | </target> | 41 | </target> |
42 | </project> | 42 | </project> |
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj index 9357659..26a058c 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{A122E6D1-0245-40BB-9986-E7C828B2177B}</ProjectGuid> | 6 | <ProjectGuid>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -74,7 +74,7 @@ | |||
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 75 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
76 | <Name>OpenSim.Framework.Console</Name> | 76 | <Name>OpenSim.Framework.Console</Name> |
77 | <Project>{AD9B8A83-DF95-4B46-A91F-32F05669A390}</Project> | 77 | <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 4aaca6a..47e5534 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.Manager" default="build"> | 2 | <project name="OpenSim.Physics.Manager" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="PhysicsActor.cs" /> | 15 | <include name="PhysicsActor.cs" /> |
16 | <include name="PhysicsManager.cs" /> | 16 | <include name="PhysicsManager.cs" /> |
17 | <include name="PhysicsScene.cs" /> | 17 | <include name="PhysicsScene.cs" /> |
18 | <include name="PhysicsVector.cs" /> | 18 | <include name="PhysicsVector.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
22 | <include name="${project::get-base-directory()}" /> | 22 | <include name="${project::get-base-directory()}" /> |
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | 23 | <include name="${project::get-base-directory()}/${build.dir}" /> |
24 | </lib> | 24 | </lib> |
25 | <include name="System.dll" /> | 25 | <include name="System.dll" /> |
26 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="../../bin/Axiom.MathLib.dll" /> | 27 | <include name="../../bin/Axiom.MathLib.dll" /> |
28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj index 04a02c8..9454f28 100644 --- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj +++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{B9118A0A-2A54-45C0-8B45-3C8727E1F136}</ProjectGuid> | 6 | <ProjectGuid>{58E9E005-093A-4E83-AB76-CA02CD14E53D}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -74,7 +74,7 @@ | |||
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> | 75 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> |
76 | <Name>OpenSim.Physics.Manager</Name> | 76 | <Name>OpenSim.Physics.Manager</Name> |
77 | <Project>{A122E6D1-0245-40BB-9986-E7C828B2177B}</Project> | 77 | <Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build index e738ab1..c67d820 100644 --- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build +++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.OdePlugin" default="build"> | 2 | <project name="OpenSim.Physics.OdePlugin" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="OdePlugin.cs" /> | 15 | <include name="OdePlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> | 24 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> |
25 | <include name="../../bin/../lib/Ode.NET.dll" /> | 25 | <include name="../../bin/../lib/Ode.NET.dll" /> |
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
32 | <include name="*.dll"/> | 32 | <include name="*.dll"/> |
33 | <include name="*.exe"/> | 33 | <include name="*.exe"/> |
34 | </fileset> | 34 | </fileset> |
35 | </copy> | 35 | </copy> |
36 | </target> | 36 | </target> |
37 | <target name="clean"> | 37 | <target name="clean"> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <delete dir="${bin.dir}" failonerror="false" /> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${obj.dir}" failonerror="false" /> |
40 | </target> | 40 | </target> |
41 | <target name="doc" description="Creates documentation."> | 41 | <target name="doc" description="Creates documentation."> |
42 | </target> | 42 | </target> |
43 | </project> | 43 | </project> |
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj index df02260..1cf6a1d 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{E3B7B51F-00E3-439D-9A6D-278F20B42AB7}</ProjectGuid> | 6 | <ProjectGuid>{69C8F939-AF90-46A1-8888-D779C5A8868E}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -74,7 +74,7 @@ | |||
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> | 75 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> |
76 | <Name>OpenSim.Physics.Manager</Name> | 76 | <Name>OpenSim.Physics.Manager</Name> |
77 | <Project>{A122E6D1-0245-40BB-9986-E7C828B2177B}</Project> | 77 | <Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build index 395cc6b..8f9e7dc 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.PhysXPlugin" default="build"> | 2 | <project name="OpenSim.Physics.PhysXPlugin" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="PhysXPlugin.cs" /> | 15 | <include name="PhysXPlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> | 24 | <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> |
25 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> | 25 | <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> |
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
32 | <include name="*.dll"/> | 32 | <include name="*.dll"/> |
33 | <include name="*.exe"/> | 33 | <include name="*.exe"/> |
34 | </fileset> | 34 | </fileset> |
35 | </copy> | 35 | </copy> |
36 | </target> | 36 | </target> |
37 | <target name="clean"> | 37 | <target name="clean"> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <delete dir="${bin.dir}" failonerror="false" /> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${obj.dir}" failonerror="false" /> |
40 | </target> | 40 | </target> |
41 | <target name="doc" description="Creates documentation."> | 41 | <target name="doc" description="Creates documentation."> |
42 | </target> | 42 | </target> |
43 | </project> | 43 | </project> |
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index dd5329a..2b19e20 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{E386E390-3D1E-47E8-A0AB-FBABC6A45690}</ProjectGuid> | 6 | <ProjectGuid>{A88526E3-397A-479D-93E1-8865F3336A87}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -82,19 +82,19 @@ | |||
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 83 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
84 | <Name>OpenSim.Framework.Console</Name> | 84 | <Name>OpenSim.Framework.Console</Name> |
85 | <Project>{AD9B8A83-DF95-4B46-A91F-32F05669A390}</Project> | 85 | <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 87 | <Private>False</Private> |
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 89 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
90 | <Name>OpenSim.Physics.Manager</Name> | 90 | <Name>OpenSim.Physics.Manager</Name> |
91 | <Project>{A122E6D1-0245-40BB-9986-E7C828B2177B}</Project> | 91 | <Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> |
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 93 | <Private>False</Private> |
94 | </ProjectReference> | 94 | </ProjectReference> |
95 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 95 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> |
96 | <Name>OpenSim.Framework</Name> | 96 | <Name>OpenSim.Framework</Name> |
97 | <Project>{03AE7311-0158-40B2-BA49-B1E560645594}</Project> | 97 | <Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> |
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
99 | <Private>False</Private> | 99 | <Private>False</Private> |
100 | </ProjectReference> | 100 | </ProjectReference> |
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index dced3ae..66d55fb 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -1,69 +1,69 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.RegionServer" default="build"> | 2 | <project name="OpenSim.RegionServer" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentAssetUpload.cs" /> | 14 | <include name="AgentAssetUpload.cs" /> |
15 | <include name="Grid.cs" /> | 15 | <include name="Grid.cs" /> |
16 | <include name="OpenSimApplication.cs" /> | 16 | <include name="OpenSimApplication.cs" /> |
17 | <include name="OpenSimMain.cs" /> | 17 | <include name="OpenSimMain.cs" /> |
18 | <include name="OpenSimRoot.cs" /> | 18 | <include name="OpenSimRoot.cs" /> |
19 | <include name="QueItem.cs" /> | 19 | <include name="QueItem.cs" /> |
20 | <include name="SimClient.cs" /> | 20 | <include name="SimClient.cs" /> |
21 | <include name="SimConsole.cs" /> | 21 | <include name="SimConsole.cs" /> |
22 | <include name="VersionInfo.cs" /> | 22 | <include name="VersionInfo.cs" /> |
23 | <include name="Assets/AssetCache.cs" /> | 23 | <include name="Assets/AssetCache.cs" /> |
24 | <include name="Assets/InventoryCache.cs" /> | 24 | <include name="Assets/InventoryCache.cs" /> |
25 | <include name="CAPS/SimHttp.cs" /> | 25 | <include name="CAPS/SimHttp.cs" /> |
26 | <include name="UserServer/LocalUserProfileManager.cs" /> | 26 | <include name="types/Mesh.cs" /> |
27 | <include name="UserServer/LoginServer.cs" /> | 27 | <include name="types/Triangle.cs" /> |
28 | <include name="types/Mesh.cs" /> | 28 | <include name="UserServer/LocalUserProfileManager.cs" /> |
29 | <include name="types/Triangle.cs" /> | 29 | <include name="UserServer/LoginServer.cs" /> |
30 | <include name="world/Avatar.cs" /> | 30 | <include name="world/Avatar.cs" /> |
31 | <include name="world/AvatarAnimations.cs" /> | 31 | <include name="world/AvatarAnimations.cs" /> |
32 | <include name="world/Entity.cs" /> | 32 | <include name="world/Entity.cs" /> |
33 | <include name="world/Primitive.cs" /> | 33 | <include name="world/Primitive.cs" /> |
34 | <include name="world/ScriptEngine.cs" /> | 34 | <include name="world/ScriptEngine.cs" /> |
35 | <include name="world/SurfacePatch.cs" /> | 35 | <include name="world/SurfacePatch.cs" /> |
36 | <include name="world/World.cs" /> | 36 | <include name="world/World.cs" /> |
37 | <include name="world/scripting/IScript.cs" /> | 37 | <include name="world/scripting/IScript.cs" /> |
38 | </sources> | 38 | </sources> |
39 | <references basedir="${project::get-base-directory()}"> | 39 | <references basedir="${project::get-base-directory()}"> |
40 | <lib> | 40 | <lib> |
41 | <include name="${project::get-base-directory()}" /> | 41 | <include name="${project::get-base-directory()}" /> |
42 | <include name="${project::get-base-directory()}/${build.dir}" /> | 42 | <include name="${project::get-base-directory()}/${build.dir}" /> |
43 | </lib> | 43 | </lib> |
44 | <include name="System.dll" /> | 44 | <include name="System.dll" /> |
45 | <include name="System.Xml.dll" /> | 45 | <include name="System.Xml.dll" /> |
46 | <include name="../bin/libsecondlife.dll" /> | 46 | <include name="../bin/libsecondlife.dll" /> |
47 | <include name="../bin/Axiom.MathLib.dll" /> | 47 | <include name="../bin/Axiom.MathLib.dll" /> |
48 | <include name="../bin/Db4objects.Db4o.dll" /> | 48 | <include name="../bin/Db4objects.Db4o.dll" /> |
49 | <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 49 | <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
50 | <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> | 50 | <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> |
51 | <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 51 | <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
52 | </references> | 52 | </references> |
53 | </csc> | 53 | </csc> |
54 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 54 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
55 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 55 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
56 | <copy todir="${project::get-base-directory()}/../bin/"> | 56 | <copy todir="${project::get-base-directory()}/../bin/"> |
57 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 57 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
58 | <include name="*.dll"/> | 58 | <include name="*.dll"/> |
59 | <include name="*.exe"/> | 59 | <include name="*.exe"/> |
60 | </fileset> | 60 | </fileset> |
61 | </copy> | 61 | </copy> |
62 | </target> | 62 | </target> |
63 | <target name="clean"> | 63 | <target name="clean"> |
64 | <delete dir="${bin.dir}" failonerror="false" /> | 64 | <delete dir="${bin.dir}" failonerror="false" /> |
65 | <delete dir="${obj.dir}" failonerror="false" /> | 65 | <delete dir="${obj.dir}" failonerror="false" /> |
66 | </target> | 66 | </target> |
67 | <target name="doc" description="Creates documentation."> | 67 | <target name="doc" description="Creates documentation."> |
68 | </target> | 68 | </target> |
69 | </project> | 69 | </project> |
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index f6fc0b6..6660d49 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{66112D21-35DD-49A0-AC73-559FC8966BA0}</ProjectGuid> | 6 | <ProjectGuid>{77247AFE-B2E3-4721-BA74-C01B10105E11}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -78,13 +78,13 @@ | |||
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 79 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> |
80 | <Name>OpenSim.Framework</Name> | 80 | <Name>OpenSim.Framework</Name> |
81 | <Project>{03AE7311-0158-40B2-BA49-B1E560645594}</Project> | 81 | <Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> |
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
83 | <Private>False</Private> | 83 | <Private>False</Private> |
84 | </ProjectReference> | 84 | </ProjectReference> |
85 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
86 | <Name>OpenSim.Framework.Console</Name> | 86 | <Name>OpenSim.Framework.Console</Name> |
87 | <Project>{AD9B8A83-DF95-4B46-A91F-32F05669A390}</Project> | 87 | <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> |
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
89 | <Private>False</Private> | 89 | <Private>False</Private> |
90 | </ProjectReference> | 90 | </ProjectReference> |
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index ebcda17..44e8597 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Storage.LocalStorageDb4o" default="build"> | 2 | <project name="OpenSim.Storage.LocalStorageDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="Db4LocalStorage.cs" /> | 15 | <include name="Db4LocalStorage.cs" /> |
16 | <include name="UUIDQuery.cs" /> | 16 | <include name="UUIDQuery.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 27 | <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.build b/OpenSim.build index 841287a..972331b 100644 --- a/OpenSim.build +++ b/OpenSim.build | |||
@@ -1,109 +1,109 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim" default="build"> | 2 | <project name="OpenSim" default="build"> |
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | 3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> |
4 | 4 | ||
5 | <property name="bin.dir" value="bin" /> | 5 | <property name="bin.dir" value="bin" /> |
6 | <property name="obj.dir" value="obj" /> | 6 | <property name="obj.dir" value="obj" /> |
7 | <property name="doc.dir" value="doc" /> | 7 | <property name="doc.dir" value="doc" /> |
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | 8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> |
9 | <property name="project.config" value="Release" /> | 9 | |
10 | 10 | <target name="Debug" description=""> | |
11 | <target name="Release" description=""> | 11 | <property name="project.config" value="Debug" /> |
12 | <property name="project.config" value="Release" /> | 12 | <property name="build.debug" value="true" /> |
13 | <property name="build.debug" value="false" /> | 13 | </target> |
14 | </target> | 14 | |
15 | 15 | <property name="project.config" value="Release" /> | |
16 | 16 | ||
17 | <target name="Debug" description=""> | 17 | <target name="Release" description=""> |
18 | <property name="project.config" value="Debug" /> | 18 | <property name="project.config" value="Release" /> |
19 | <property name="build.debug" value="true" /> | 19 | <property name="build.debug" value="false" /> |
20 | </target> | 20 | </target> |
21 | 21 | ||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 23 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 24 | </target> |
25 | 25 | ||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | 26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> |
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | 27 | <property name="nant.settings.currentframework" value="net-2.0" /> |
28 | </target> | 28 | </target> |
29 | 29 | ||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | 30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> |
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | 31 | <property name="nant.settings.currentframework" value="mono-2.0" /> |
32 | </target> | 32 | </target> |
33 | 33 | ||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | 34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> |
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | 35 | <property name="nant.settings.currentframework" value="mono-1.0" /> |
36 | </target> | 36 | </target> |
37 | 37 | ||
38 | <target name="init" description=""> | 38 | <target name="init" description=""> |
39 | <call target="${project.config}" /> | 39 | <call target="${project.config}" /> |
40 | <sysinfo /> | 40 | <sysinfo /> |
41 | <echo message="Platform ${sys.os.platform}" /> | 41 | <echo message="Platform ${sys.os.platform}" /> |
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | 42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> |
43 | </target> | 43 | </target> |
44 | 44 | ||
45 | <target name="clean" description=""> | 45 | <target name="clean" description=""> |
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> | 49 | <nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" /> |
50 | <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> | 50 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> |
51 | <nant buildfile="../opensim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> | 51 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> |
52 | <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> | 52 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> |
53 | <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> | 53 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> |
54 | <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> | 54 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> |
55 | <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> | 55 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> |
56 | <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> | 56 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> |
57 | <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" /> | 57 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> |
58 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> | 58 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> |
59 | <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> | 59 | <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> |
60 | <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="clean" /> | 60 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> |
61 | <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> | 61 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> |
62 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> | 62 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> |
63 | <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> | 63 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> |
64 | </target> | 64 | </target> |
65 | 65 | ||
66 | <target name="build" depends="init" description=""> | 66 | <target name="build" depends="init" description=""> |
67 | <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> | 67 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> |
68 | <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> | 68 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> |
69 | <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="build" /> | 69 | <nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="build" /> |
70 | <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> | 70 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> |
71 | <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> | 71 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> |
72 | <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> | 72 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> |
73 | <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> | 73 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> |
74 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> | 74 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> |
75 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> | 75 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> |
76 | <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> | 76 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> |
77 | <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> | 77 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> |
78 | <nant buildfile="../opensim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> | 78 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> |
79 | <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> | 79 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> |
80 | <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="build" /> | 80 | <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> |
81 | <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> | 81 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> |
82 | </target> | 82 | </target> |
83 | 83 | ||
84 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 84 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
85 | 85 | ||
86 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | 86 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> |
87 | 87 | ||
88 | <target name="package" depends="clean, doc" description="Builds all" /> | 88 | <target name="package" depends="clean, doc" description="Builds all" /> |
89 | 89 | ||
90 | <target name="doc" depends="build-release"> | 90 | <target name="doc" depends="build-release"> |
91 | <echo message="Generating all documentation from all builds" /> | 91 | <echo message="Generating all documentation from all builds" /> |
92 | <nant buildfile="../opensim/OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> | 92 | <nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" /> |
93 | <nant buildfile="../opensim/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> | 93 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> |
94 | <nant buildfile="../opensim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> | 94 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> |
95 | <nant buildfile="../opensim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> | 95 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> |
96 | <nant buildfile="../opensim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> | 96 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> |
97 | <nant buildfile="../opensim/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> | 97 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> |
98 | <nant buildfile="../opensim/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> | 98 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> |
99 | <nant buildfile="../opensim/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> | 99 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> |
100 | <nant buildfile="../opensim/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" /> | 100 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> |
101 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> | 101 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> |
102 | <nant buildfile="../opensim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> | 102 | <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> |
103 | <nant buildfile="../opensim/OpenSim/OpenSim.exe.build" target="doc" /> | 103 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> |
104 | <nant buildfile="../opensim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> | 104 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> |
105 | <nant buildfile="../opensim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> | 105 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> |
106 | <nant buildfile="../opensim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> | 106 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> |
107 | </target> | 107 | </target> |
108 | 108 | ||
109 | </project> | 109 | </project> |
diff --git a/OpenSim.sln b/OpenSim.sln index 2dae017..0d253c8 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,103 +1,124 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual Studio 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.ServerConsole", "OpenGridServices.ServerConsole\OpenGridServices.ServerConsole.csproj", "{871ABABA-7F63-4CD8-9BA8-E9297F29DD45}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.ServerConsole", "OpenGridServices.ServerConsole\OpenGridServices.ServerConsole.csproj", "{7DC4E7C8-89A4-4A8D-9617-3DF262990663}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{AD9B8A83-DF95-4B46-A91F-32F05669A390}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}" |
6 | EndProject | 6 | EndProject |
7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{7A104F58-11C3-446C-BE67-4FCD36F23F2C}" | 7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C7215018-D379-492D-9BB0-4B9DA0C6B9A0}" |
8 | EndProject | 8 | EndProject |
9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{572FF644-323A-4FDE-9A05-0F33C740630F}" | 9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{3FE545CA-1179-42DF-BDF1-F14DEA463A21}" |
10 | EndProject | 10 | EndProject |
11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{D39D5A84-7A0B-4512-8AFE-8EC7BDD7F9B4}" | 11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{A6D9D790-2B1F-4088-BE12-91C4A69C1586}" |
12 | EndProject | 12 | EndProject |
13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{66112D21-35DD-49A0-AC73-559FC8966BA0}" | 13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{77247AFE-B2E3-4721-BA74-C01B10105E11}" |
14 | EndProject | 14 | EndProject |
15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{03AE7311-0158-40B2-BA49-B1E560645594}" | 15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{26E437F6-BA50-44CD-BB44-E911E25CA88C}" |
16 | EndProject | 16 | EndProject |
17 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{2E6F5AFB-1130-4200-B089-3B0FCD111343}" | 17 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{F7DE71C5-CD20-4AD8-83A4-1363066853A6}" |
18 | EndProject | 18 | EndProject |
19 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{B9118A0A-2A54-45C0-8B45-3C8727E1F136}" | 19 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{58E9E005-093A-4E83-AB76-CA02CD14E53D}" |
20 | EndProject | 20 | EndProject |
21 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{EFFAF441-6D39-4723-9F63-B8701F6190AB}" | 21 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{5FBFB649-50BB-4CAB-B26C-29410D885559}" |
22 | EndProject | 22 | EndProject |
23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{0BC13D45-108A-45EB-8B13-2C452E2BB1C8}" | 23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{455F3378-FE4B-4A17-907D-52AEA3C1045F}" |
24 | EndProject | 24 | EndProject |
25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{E386E390-3D1E-47E8-A0AB-FBABC6A45690}" | 25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{A88526E3-397A-479D-93E1-8865F3336A87}" |
26 | EndProject | 26 | EndProject |
27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{A122E6D1-0245-40BB-9986-E7C828B2177B}" | 27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}" |
28 | EndProject | 28 | EndProject |
29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{78435A3F-EA0F-47AE-9539-E9E07D47F9A7}" | 29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{DB2D6331-438F-4C3F-83FD-B958E261CB0C}" |
30 | EndProject | 30 | EndProject |
31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{E3B7B51F-00E3-439D-9A6D-278F20B42AB7}" | 31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{69C8F939-AF90-46A1-8888-D779C5A8868E}" |
32 | EndProject | 32 | EndProject |
33 | Global | 33 | Global |
34 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 34 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
35 | Debug|Any CPU = Debug|Any CPU | 35 | Debug|Any CPU = Debug|Any CPU |
36 | Release|Any CPU = Release|Any CPU | 36 | Release|Any CPU = Release|Any CPU |
37 | EndGlobalSection | 37 | EndGlobalSection |
38 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 38 | GlobalSection(ProjectDependencies) = postSolution |
39 | {871ABABA-7F63-4CD8-9BA8-E9297F29DD45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 39 | ({C7215018-D379-492D-9BB0-4B9DA0C6B9A0}).5 = ({26E437F6-BA50-44CD-BB44-E911E25CA88C}) |
40 | {871ABABA-7F63-4CD8-9BA8-E9297F29DD45}.Debug|Any CPU.Build.0 = Debug|Any CPU | 40 | ({C7215018-D379-492D-9BB0-4B9DA0C6B9A0}).6 = ({F5AD51E9-CF59-4C70-A586-CBD161EBB85F}) |
41 | {871ABABA-7F63-4CD8-9BA8-E9297F29DD45}.Release|Any CPU.ActiveCfg = Release|Any CPU | 41 | ({A6D9D790-2B1F-4088-BE12-91C4A69C1586}).3 = ({26E437F6-BA50-44CD-BB44-E911E25CA88C}) |
42 | {871ABABA-7F63-4CD8-9BA8-E9297F29DD45}.Release|Any CPU.Build.0 = Release|Any CPU | 42 | ({A6D9D790-2B1F-4088-BE12-91C4A69C1586}).4 = ({F5AD51E9-CF59-4C70-A586-CBD161EBB85F}) |
43 | {AD9B8A83-DF95-4B46-A91F-32F05669A390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 43 | ({77247AFE-B2E3-4721-BA74-C01B10105E11}).4 = ({26E437F6-BA50-44CD-BB44-E911E25CA88C}) |
44 | {AD9B8A83-DF95-4B46-A91F-32F05669A390}.Debug|Any CPU.Build.0 = Debug|Any CPU | 44 | ({77247AFE-B2E3-4721-BA74-C01B10105E11}).5 = ({F5AD51E9-CF59-4C70-A586-CBD161EBB85F}) |
45 | {AD9B8A83-DF95-4B46-A91F-32F05669A390}.Release|Any CPU.ActiveCfg = Release|Any CPU | 45 | ({58E9E005-093A-4E83-AB76-CA02CD14E53D}).2 = ({12F74CC6-E820-4716-8A34-A7B67B9EB3CC}) |
46 | {AD9B8A83-DF95-4B46-A91F-32F05669A390}.Release|Any CPU.Build.0 = Release|Any CPU | 46 | ({5FBFB649-50BB-4CAB-B26C-29410D885559}).2 = ({12F74CC6-E820-4716-8A34-A7B67B9EB3CC}) |
47 | {7A104F58-11C3-446C-BE67-4FCD36F23F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 47 | ({455F3378-FE4B-4A17-907D-52AEA3C1045F}).5 = ({26E437F6-BA50-44CD-BB44-E911E25CA88C}) |
48 | {7A104F58-11C3-446C-BE67-4FCD36F23F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU | 48 | ({455F3378-FE4B-4A17-907D-52AEA3C1045F}).6 = ({F5AD51E9-CF59-4C70-A586-CBD161EBB85F}) |
49 | {7A104F58-11C3-446C-BE67-4FCD36F23F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU | 49 | ({455F3378-FE4B-4A17-907D-52AEA3C1045F}).7 = ({12F74CC6-E820-4716-8A34-A7B67B9EB3CC}) |
50 | {7A104F58-11C3-446C-BE67-4FCD36F23F2C}.Release|Any CPU.Build.0 = Release|Any CPU | 50 | ({455F3378-FE4B-4A17-907D-52AEA3C1045F}).8 = ({A88526E3-397A-479D-93E1-8865F3336A87}) |
51 | {572FF644-323A-4FDE-9A05-0F33C740630F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 51 | ({A88526E3-397A-479D-93E1-8865F3336A87}).5 = ({F5AD51E9-CF59-4C70-A586-CBD161EBB85F}) |
52 | {572FF644-323A-4FDE-9A05-0F33C740630F}.Debug|Any CPU.Build.0 = Debug|Any CPU | 52 | ({A88526E3-397A-479D-93E1-8865F3336A87}).6 = ({12F74CC6-E820-4716-8A34-A7B67B9EB3CC}) |
53 | {572FF644-323A-4FDE-9A05-0F33C740630F}.Release|Any CPU.ActiveCfg = Release|Any CPU | 53 | ({A88526E3-397A-479D-93E1-8865F3336A87}).7 = ({26E437F6-BA50-44CD-BB44-E911E25CA88C}) |
54 | {572FF644-323A-4FDE-9A05-0F33C740630F}.Release|Any CPU.Build.0 = Release|Any CPU | 54 | ({12F74CC6-E820-4716-8A34-A7B67B9EB3CC}).3 = ({F5AD51E9-CF59-4C70-A586-CBD161EBB85F}) |
55 | {D39D5A84-7A0B-4512-8AFE-8EC7BDD7F9B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 55 | ({DB2D6331-438F-4C3F-83FD-B958E261CB0C}).4 = ({26E437F6-BA50-44CD-BB44-E911E25CA88C}) |
56 | {D39D5A84-7A0B-4512-8AFE-8EC7BDD7F9B4}.Debug|Any CPU.Build.0 = Debug|Any CPU | 56 | ({DB2D6331-438F-4C3F-83FD-B958E261CB0C}).5 = ({F5AD51E9-CF59-4C70-A586-CBD161EBB85F}) |
57 | {D39D5A84-7A0B-4512-8AFE-8EC7BDD7F9B4}.Release|Any CPU.ActiveCfg = Release|Any CPU | 57 | ({69C8F939-AF90-46A1-8888-D779C5A8868E}).3 = ({12F74CC6-E820-4716-8A34-A7B67B9EB3CC}) |
58 | {D39D5A84-7A0B-4512-8AFE-8EC7BDD7F9B4}.Release|Any CPU.Build.0 = Release|Any CPU | 58 | EndGlobalSection |
59 | {66112D21-35DD-49A0-AC73-559FC8966BA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 59 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
60 | {66112D21-35DD-49A0-AC73-559FC8966BA0}.Debug|Any CPU.Build.0 = Debug|Any CPU | 60 | {7DC4E7C8-89A4-4A8D-9617-3DF262990663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
61 | {66112D21-35DD-49A0-AC73-559FC8966BA0}.Release|Any CPU.ActiveCfg = Release|Any CPU | 61 | {7DC4E7C8-89A4-4A8D-9617-3DF262990663}.Debug|Any CPU.Build.0 = Debug|Any CPU |
62 | {66112D21-35DD-49A0-AC73-559FC8966BA0}.Release|Any CPU.Build.0 = Release|Any CPU | 62 | {7DC4E7C8-89A4-4A8D-9617-3DF262990663}.Release|Any CPU.ActiveCfg = Release|Any CPU |
63 | {03AE7311-0158-40B2-BA49-B1E560645594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 63 | {7DC4E7C8-89A4-4A8D-9617-3DF262990663}.Release|Any CPU.Build.0 = Release|Any CPU |
64 | {03AE7311-0158-40B2-BA49-B1E560645594}.Debug|Any CPU.Build.0 = Debug|Any CPU | 64 | {F5AD51E9-CF59-4C70-A586-CBD161EBB85F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
65 | {03AE7311-0158-40B2-BA49-B1E560645594}.Release|Any CPU.ActiveCfg = Release|Any CPU | 65 | {F5AD51E9-CF59-4C70-A586-CBD161EBB85F}.Debug|Any CPU.Build.0 = Debug|Any CPU |
66 | {03AE7311-0158-40B2-BA49-B1E560645594}.Release|Any CPU.Build.0 = Release|Any CPU | 66 | {F5AD51E9-CF59-4C70-A586-CBD161EBB85F}.Release|Any CPU.ActiveCfg = Release|Any CPU |
67 | {2E6F5AFB-1130-4200-B089-3B0FCD111343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 67 | {F5AD51E9-CF59-4C70-A586-CBD161EBB85F}.Release|Any CPU.Build.0 = Release|Any CPU |
68 | {2E6F5AFB-1130-4200-B089-3B0FCD111343}.Debug|Any CPU.Build.0 = Debug|Any CPU | 68 | {C7215018-D379-492D-9BB0-4B9DA0C6B9A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
69 | {2E6F5AFB-1130-4200-B089-3B0FCD111343}.Release|Any CPU.ActiveCfg = Release|Any CPU | 69 | {C7215018-D379-492D-9BB0-4B9DA0C6B9A0}.Debug|Any CPU.Build.0 = Debug|Any CPU |
70 | {2E6F5AFB-1130-4200-B089-3B0FCD111343}.Release|Any CPU.Build.0 = Release|Any CPU | 70 | {C7215018-D379-492D-9BB0-4B9DA0C6B9A0}.Release|Any CPU.ActiveCfg = Release|Any CPU |
71 | {B9118A0A-2A54-45C0-8B45-3C8727E1F136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 71 | {C7215018-D379-492D-9BB0-4B9DA0C6B9A0}.Release|Any CPU.Build.0 = Release|Any CPU |
72 | {B9118A0A-2A54-45C0-8B45-3C8727E1F136}.Debug|Any CPU.Build.0 = Debug|Any CPU | 72 | {3FE545CA-1179-42DF-BDF1-F14DEA463A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
73 | {B9118A0A-2A54-45C0-8B45-3C8727E1F136}.Release|Any CPU.ActiveCfg = Release|Any CPU | 73 | {3FE545CA-1179-42DF-BDF1-F14DEA463A21}.Debug|Any CPU.Build.0 = Debug|Any CPU |
74 | {B9118A0A-2A54-45C0-8B45-3C8727E1F136}.Release|Any CPU.Build.0 = Release|Any CPU | 74 | {3FE545CA-1179-42DF-BDF1-F14DEA463A21}.Release|Any CPU.ActiveCfg = Release|Any CPU |
75 | {EFFAF441-6D39-4723-9F63-B8701F6190AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 75 | {3FE545CA-1179-42DF-BDF1-F14DEA463A21}.Release|Any CPU.Build.0 = Release|Any CPU |
76 | {EFFAF441-6D39-4723-9F63-B8701F6190AB}.Debug|Any CPU.Build.0 = Debug|Any CPU | 76 | {A6D9D790-2B1F-4088-BE12-91C4A69C1586}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
77 | {EFFAF441-6D39-4723-9F63-B8701F6190AB}.Release|Any CPU.ActiveCfg = Release|Any CPU | 77 | {A6D9D790-2B1F-4088-BE12-91C4A69C1586}.Debug|Any CPU.Build.0 = Debug|Any CPU |
78 | {EFFAF441-6D39-4723-9F63-B8701F6190AB}.Release|Any CPU.Build.0 = Release|Any CPU | 78 | {A6D9D790-2B1F-4088-BE12-91C4A69C1586}.Release|Any CPU.ActiveCfg = Release|Any CPU |
79 | {0BC13D45-108A-45EB-8B13-2C452E2BB1C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 79 | {A6D9D790-2B1F-4088-BE12-91C4A69C1586}.Release|Any CPU.Build.0 = Release|Any CPU |
80 | {0BC13D45-108A-45EB-8B13-2C452E2BB1C8}.Debug|Any CPU.Build.0 = Debug|Any CPU | 80 | {77247AFE-B2E3-4721-BA74-C01B10105E11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
81 | {0BC13D45-108A-45EB-8B13-2C452E2BB1C8}.Release|Any CPU.ActiveCfg = Release|Any CPU | 81 | {77247AFE-B2E3-4721-BA74-C01B10105E11}.Debug|Any CPU.Build.0 = Debug|Any CPU |
82 | {0BC13D45-108A-45EB-8B13-2C452E2BB1C8}.Release|Any CPU.Build.0 = Release|Any CPU | 82 | {77247AFE-B2E3-4721-BA74-C01B10105E11}.Release|Any CPU.ActiveCfg = Release|Any CPU |
83 | {E386E390-3D1E-47E8-A0AB-FBABC6A45690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 83 | {77247AFE-B2E3-4721-BA74-C01B10105E11}.Release|Any CPU.Build.0 = Release|Any CPU |
84 | {E386E390-3D1E-47E8-A0AB-FBABC6A45690}.Debug|Any CPU.Build.0 = Debug|Any CPU | 84 | {26E437F6-BA50-44CD-BB44-E911E25CA88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
85 | {E386E390-3D1E-47E8-A0AB-FBABC6A45690}.Release|Any CPU.ActiveCfg = Release|Any CPU | 85 | {26E437F6-BA50-44CD-BB44-E911E25CA88C}.Debug|Any CPU.Build.0 = Debug|Any CPU |
86 | {E386E390-3D1E-47E8-A0AB-FBABC6A45690}.Release|Any CPU.Build.0 = Release|Any CPU | 86 | {26E437F6-BA50-44CD-BB44-E911E25CA88C}.Release|Any CPU.ActiveCfg = Release|Any CPU |
87 | {A122E6D1-0245-40BB-9986-E7C828B2177B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 87 | {26E437F6-BA50-44CD-BB44-E911E25CA88C}.Release|Any CPU.Build.0 = Release|Any CPU |
88 | {A122E6D1-0245-40BB-9986-E7C828B2177B}.Debug|Any CPU.Build.0 = Debug|Any CPU | 88 | {F7DE71C5-CD20-4AD8-83A4-1363066853A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
89 | {A122E6D1-0245-40BB-9986-E7C828B2177B}.Release|Any CPU.ActiveCfg = Release|Any CPU | 89 | {F7DE71C5-CD20-4AD8-83A4-1363066853A6}.Debug|Any CPU.Build.0 = Debug|Any CPU |
90 | {A122E6D1-0245-40BB-9986-E7C828B2177B}.Release|Any CPU.Build.0 = Release|Any CPU | 90 | {F7DE71C5-CD20-4AD8-83A4-1363066853A6}.Release|Any CPU.ActiveCfg = Release|Any CPU |
91 | {78435A3F-EA0F-47AE-9539-E9E07D47F9A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 91 | {F7DE71C5-CD20-4AD8-83A4-1363066853A6}.Release|Any CPU.Build.0 = Release|Any CPU |
92 | {78435A3F-EA0F-47AE-9539-E9E07D47F9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU | 92 | {58E9E005-093A-4E83-AB76-CA02CD14E53D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
93 | {78435A3F-EA0F-47AE-9539-E9E07D47F9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU | 93 | {58E9E005-093A-4E83-AB76-CA02CD14E53D}.Debug|Any CPU.Build.0 = Debug|Any CPU |
94 | {78435A3F-EA0F-47AE-9539-E9E07D47F9A7}.Release|Any CPU.Build.0 = Release|Any CPU | 94 | {58E9E005-093A-4E83-AB76-CA02CD14E53D}.Release|Any CPU.ActiveCfg = Release|Any CPU |
95 | {E3B7B51F-00E3-439D-9A6D-278F20B42AB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 95 | {58E9E005-093A-4E83-AB76-CA02CD14E53D}.Release|Any CPU.Build.0 = Release|Any CPU |
96 | {E3B7B51F-00E3-439D-9A6D-278F20B42AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU | 96 | {5FBFB649-50BB-4CAB-B26C-29410D885559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
97 | {E3B7B51F-00E3-439D-9A6D-278F20B42AB7}.Release|Any CPU.ActiveCfg = Release|Any CPU | 97 | {5FBFB649-50BB-4CAB-B26C-29410D885559}.Debug|Any CPU.Build.0 = Debug|Any CPU |
98 | {E3B7B51F-00E3-439D-9A6D-278F20B42AB7}.Release|Any CPU.Build.0 = Release|Any CPU | 98 | {5FBFB649-50BB-4CAB-B26C-29410D885559}.Release|Any CPU.ActiveCfg = Release|Any CPU |
99 | EndGlobalSection | 99 | {5FBFB649-50BB-4CAB-B26C-29410D885559}.Release|Any CPU.Build.0 = Release|Any CPU |
100 | GlobalSection(SolutionProperties) = preSolution | 100 | {455F3378-FE4B-4A17-907D-52AEA3C1045F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
101 | HideSolutionNode = FALSE | 101 | {455F3378-FE4B-4A17-907D-52AEA3C1045F}.Debug|Any CPU.Build.0 = Debug|Any CPU |
102 | EndGlobalSection | 102 | {455F3378-FE4B-4A17-907D-52AEA3C1045F}.Release|Any CPU.ActiveCfg = Release|Any CPU |
103 | {455F3378-FE4B-4A17-907D-52AEA3C1045F}.Release|Any CPU.Build.0 = Release|Any CPU | ||
104 | {A88526E3-397A-479D-93E1-8865F3336A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
105 | {A88526E3-397A-479D-93E1-8865F3336A87}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
106 | {A88526E3-397A-479D-93E1-8865F3336A87}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
107 | {A88526E3-397A-479D-93E1-8865F3336A87}.Release|Any CPU.Build.0 = Release|Any CPU | ||
108 | {12F74CC6-E820-4716-8A34-A7B67B9EB3CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
109 | {12F74CC6-E820-4716-8A34-A7B67B9EB3CC}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
110 | {12F74CC6-E820-4716-8A34-A7B67B9EB3CC}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
111 | {12F74CC6-E820-4716-8A34-A7B67B9EB3CC}.Release|Any CPU.Build.0 = Release|Any CPU | ||
112 | {DB2D6331-438F-4C3F-83FD-B958E261CB0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
113 | {DB2D6331-438F-4C3F-83FD-B958E261CB0C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
114 | {DB2D6331-438F-4C3F-83FD-B958E261CB0C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
115 | {DB2D6331-438F-4C3F-83FD-B958E261CB0C}.Release|Any CPU.Build.0 = Release|Any CPU | ||
116 | {69C8F939-AF90-46A1-8888-D779C5A8868E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
117 | {69C8F939-AF90-46A1-8888-D779C5A8868E}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
118 | {69C8F939-AF90-46A1-8888-D779C5A8868E}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
119 | {69C8F939-AF90-46A1-8888-D779C5A8868E}.Release|Any CPU.Build.0 = Release|Any CPU | ||
120 | EndGlobalSection | ||
121 | GlobalSection(SolutionProperties) = preSolution | ||
122 | HideSolutionNode = FALSE | ||
123 | EndGlobalSection | ||
103 | EndGlobal | 124 | EndGlobal |
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj index 2a83498..e873a91 100644 --- a/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{0BC13D45-108A-45EB-8B13-2C452E2BB1C8}</ProjectGuid> | 6 | <ProjectGuid>{455F3378-FE4B-4A17-907D-52AEA3C1045F}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -82,25 +82,25 @@ | |||
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 83 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> |
84 | <Name>OpenSim.Framework</Name> | 84 | <Name>OpenSim.Framework</Name> |
85 | <Project>{03AE7311-0158-40B2-BA49-B1E560645594}</Project> | 85 | <Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 87 | <Private>False</Private> |
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 89 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
90 | <Name>OpenSim.Framework.Console</Name> | 90 | <Name>OpenSim.Framework.Console</Name> |
91 | <Project>{AD9B8A83-DF95-4B46-A91F-32F05669A390}</Project> | 91 | <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> |
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 93 | <Private>False</Private> |
94 | </ProjectReference> | 94 | </ProjectReference> |
95 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 95 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
96 | <Name>OpenSim.Physics.Manager</Name> | 96 | <Name>OpenSim.Physics.Manager</Name> |
97 | <Project>{A122E6D1-0245-40BB-9986-E7C828B2177B}</Project> | 97 | <Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> |
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
99 | <Private>False</Private> | 99 | <Private>False</Private> |
100 | </ProjectReference> | 100 | </ProjectReference> |
101 | <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> | 101 | <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> |
102 | <Name>OpenSim.RegionServer</Name> | 102 | <Name>OpenSim.RegionServer</Name> |
103 | <Project>{E386E390-3D1E-47E8-A0AB-FBABC6A45690}</Project> | 103 | <Project>{A88526E3-397A-479D-93E1-8865F3336A87}</Project> |
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
105 | <Private>False</Private> | 105 | <Private>False</Private> |
106 | </ProjectReference> | 106 | </ProjectReference> |
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build index fc516df..7d69d90 100644 --- a/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim.exe.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim" default="build"> | 2 | <project name="OpenSim" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 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" > | 11 | <resources prefix="OpenSim" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="RegionServer.cs" /> | 14 | <include name="RegionServer.cs" /> |
15 | </sources> | 15 | </sources> |
16 | <references basedir="${project::get-base-directory()}"> | 16 | <references basedir="${project::get-base-directory()}"> |
17 | <lib> | 17 | <lib> |
18 | <include name="${project::get-base-directory()}" /> | 18 | <include name="${project::get-base-directory()}" /> |
19 | <include name="${project::get-base-directory()}/${build.dir}" /> | 19 | <include name="${project::get-base-directory()}/${build.dir}" /> |
20 | </lib> | 20 | </lib> |
21 | <include name="System.dll" /> | 21 | <include name="System.dll" /> |
22 | <include name="System.Xml.dll" /> | 22 | <include name="System.Xml.dll" /> |
23 | <include name="../bin/libsecondlife.dll" /> | 23 | <include name="../bin/libsecondlife.dll" /> |
24 | <include name="../bin/Axiom.MathLib.dll" /> | 24 | <include name="../bin/Axiom.MathLib.dll" /> |
25 | <include name="../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> | 26 | <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> |
27 | <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> | 27 | <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> |
28 | <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> | 28 | <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> |
29 | <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" /> | 29 | <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
33 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
38 | </fileset> | 38 | </fileset> |
39 | </copy> | 39 | </copy> |
40 | </target> | 40 | </target> |
41 | <target name="clean"> | 41 | <target name="clean"> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <delete dir="${bin.dir}" failonerror="false" /> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${obj.dir}" failonerror="false" /> |
44 | </target> | 44 | </target> |
45 | <target name="doc" description="Creates documentation."> | 45 | <target name="doc" description="Creates documentation."> |
46 | </target> | 46 | </target> |
47 | </project> | 47 | </project> |
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build index 188a8a7..395fb31 100644 --- a/Prebuild/Prebuild.build +++ b/Prebuild/Prebuild.build | |||
@@ -1,67 +1,67 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="Prebuild" default="build"> | 2 | <project name="Prebuild" default="build"> |
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | 3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> |
4 | 4 | ||
5 | <property name="bin.dir" value="bin" /> | 5 | <property name="bin.dir" value="bin" /> |
6 | <property name="obj.dir" value="obj" /> | 6 | <property name="obj.dir" value="obj" /> |
7 | <property name="doc.dir" value="doc" /> | 7 | <property name="doc.dir" value="doc" /> |
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | 8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> |
9 | <property name="project.config" value="Release" /> | 9 | |
10 | 10 | <target name="Debug" description=""> | |
11 | <target name="Release" description=""> | 11 | <property name="project.config" value="Debug" /> |
12 | <property name="project.config" value="Release" /> | 12 | <property name="build.debug" value="true" /> |
13 | <property name="build.debug" value="false" /> | 13 | </target> |
14 | </target> | 14 | |
15 | 15 | <property name="project.config" value="Release" /> | |
16 | 16 | ||
17 | <target name="Debug" description=""> | 17 | <target name="Release" description=""> |
18 | <property name="project.config" value="Debug" /> | 18 | <property name="project.config" value="Release" /> |
19 | <property name="build.debug" value="true" /> | 19 | <property name="build.debug" value="false" /> |
20 | </target> | 20 | </target> |
21 | 21 | ||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 23 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 24 | </target> |
25 | 25 | ||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | 26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> |
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | 27 | <property name="nant.settings.currentframework" value="net-2.0" /> |
28 | </target> | 28 | </target> |
29 | 29 | ||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | 30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> |
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | 31 | <property name="nant.settings.currentframework" value="mono-2.0" /> |
32 | </target> | 32 | </target> |
33 | 33 | ||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | 34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> |
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | 35 | <property name="nant.settings.currentframework" value="mono-1.0" /> |
36 | </target> | 36 | </target> |
37 | 37 | ||
38 | <target name="init" description=""> | 38 | <target name="init" description=""> |
39 | <call target="${project.config}" /> | 39 | <call target="${project.config}" /> |
40 | <sysinfo /> | 40 | <sysinfo /> |
41 | <echo message="Platform ${sys.os.platform}" /> | 41 | <echo message="Platform ${sys.os.platform}" /> |
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | 42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> |
43 | </target> | 43 | </target> |
44 | 44 | ||
45 | <target name="clean" description=""> | 45 | <target name="clean" description=""> |
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="clean" /> | 49 | <nant buildfile="src/Prebuild.exe.build" target="clean" /> |
50 | </target> | 50 | </target> |
51 | 51 | ||
52 | <target name="build" depends="init" description=""> | 52 | <target name="build" depends="init" description=""> |
53 | <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="build" /> | 53 | <nant buildfile="src/Prebuild.exe.build" target="build" /> |
54 | </target> | 54 | </target> |
55 | 55 | ||
56 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 56 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
57 | 57 | ||
58 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | 58 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> |
59 | 59 | ||
60 | <target name="package" depends="clean, doc" description="Builds all" /> | 60 | <target name="package" depends="clean, doc" description="Builds all" /> |
61 | 61 | ||
62 | <target name="doc" depends="build-release"> | 62 | <target name="doc" depends="build-release"> |
63 | <echo message="Generating all documentation from all builds" /> | 63 | <echo message="Generating all documentation from all builds" /> |
64 | <nant buildfile="../Prebuild/src/Prebuild.exe.build" target="doc" /> | 64 | <nant buildfile="src/Prebuild.exe.build" target="doc" /> |
65 | </target> | 65 | </target> |
66 | 66 | ||
67 | </project> | 67 | </project> |
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index 27f9fd9..fe5198c 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln | |||
@@ -1,11 +1,6 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual Studio 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{67E2564D-3E0A-4AA9-93C7-A7755C92FC7C}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}" |
4 | EndProject | ||
5 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{468F1D07-AD17-4CC3-ABD0-2CA268E4E1A6}" | ||
6 | ProjectSection(SolutionItems) = preProject | ||
7 | prebuild = prebuild | ||
8 | EndProjectSection | ||
9 | EndProject | 4 | EndProject |
10 | Global | 5 | Global |
11 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 6 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
@@ -13,10 +8,10 @@ Global | |||
13 | Release|Any CPU = Release|Any CPU | 8 | Release|Any CPU = Release|Any CPU |
14 | EndGlobalSection | 9 | EndGlobalSection |
15 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 10 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
16 | {67E2564D-3E0A-4AA9-93C7-A7755C92FC7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 11 | {2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
17 | {67E2564D-3E0A-4AA9-93C7-A7755C92FC7C}.Debug|Any CPU.Build.0 = Debug|Any CPU | 12 | {2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU |
18 | {67E2564D-3E0A-4AA9-93C7-A7755C92FC7C}.Release|Any CPU.ActiveCfg = Release|Any CPU | 13 | {2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}.Release|Any CPU.ActiveCfg = Release|Any CPU |
19 | {67E2564D-3E0A-4AA9-93C7-A7755C92FC7C}.Release|Any CPU.Build.0 = Release|Any CPU | 14 | {2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}.Release|Any CPU.Build.0 = Release|Any CPU |
20 | EndGlobalSection | 15 | EndGlobalSection |
21 | GlobalSection(SolutionProperties) = preSolution | 16 | GlobalSection(SolutionProperties) = preSolution |
22 | HideSolutionNode = FALSE | 17 | HideSolutionNode = FALSE |
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index 51039f3..d8db8c2 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{67E2564D-3E0A-4AA9-93C7-A7755C92FC7C}</ProjectGuid> | 6 | <ProjectGuid>{2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon>App.ico</ApplicationIcon> | 9 | <ApplicationIcon>App.ico</ApplicationIcon> |
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index 628e7e1..43f5516 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build | |||
@@ -1,80 +1,80 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="Prebuild" default="build"> | 2 | <project name="Prebuild" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> | 10 | <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> |
11 | <resources prefix="Prebuild" dynamicprefix="true" > | 11 | <resources prefix="Prebuild" dynamicprefix="true" > |
12 | <include name="App.ico" /> | 12 | <include name="App.ico" /> |
13 | <include name="data/prebuild-1.7.xsd" /> | 13 | <include name="data/prebuild-1.7.xsd" /> |
14 | </resources> | 14 | </resources> |
15 | <sources failonempty="true"> | 15 | <sources failonempty="true"> |
16 | <include name="Prebuild.cs" /> | 16 | <include name="Prebuild.cs" /> |
17 | <include name="Core/FatalException.cs" /> | 17 | <include name="Core/FatalException.cs" /> |
18 | <include name="Core/Kernel.cs" /> | 18 | <include name="Core/Kernel.cs" /> |
19 | <include name="Core/UnknownLanguageException.cs" /> | 19 | <include name="Core/UnknownLanguageException.cs" /> |
20 | <include name="Core/WarningException.cs" /> | 20 | <include name="Core/WarningException.cs" /> |
21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | 21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> |
22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | 22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> |
23 | <include name="Core/Attributes/TargetAttribute.cs" /> | 23 | <include name="Core/Attributes/TargetAttribute.cs" /> |
24 | <include name="Core/Interfaces/IDataNode.cs" /> | 24 | <include name="Core/Interfaces/IDataNode.cs" /> |
25 | <include name="Core/Interfaces/ITarget.cs" /> | 25 | <include name="Core/Interfaces/ITarget.cs" /> |
26 | <include name="Core/Nodes/ConfigurationNode.cs" /> | 26 | <include name="Core/Nodes/ConfigurationNode.cs" /> |
27 | <include name="Core/Nodes/DataNode.cs" /> | 27 | <include name="Core/Nodes/DataNode.cs" /> |
28 | <include name="Core/Nodes/ExcludeNode.cs" /> | 28 | <include name="Core/Nodes/ExcludeNode.cs" /> |
29 | <include name="Core/Nodes/FileNode.cs" /> | 29 | <include name="Core/Nodes/FileNode.cs" /> |
30 | <include name="Core/Nodes/FilesNode.cs" /> | 30 | <include name="Core/Nodes/FilesNode.cs" /> |
31 | <include name="Core/Nodes/MatchNode.cs" /> | 31 | <include name="Core/Nodes/MatchNode.cs" /> |
32 | <include name="Core/Nodes/OptionsNode.cs" /> | 32 | <include name="Core/Nodes/OptionsNode.cs" /> |
33 | <include name="Core/Nodes/ProcessNode.cs" /> | 33 | <include name="Core/Nodes/ProcessNode.cs" /> |
34 | <include name="Core/Nodes/ProjectNode.cs" /> | 34 | <include name="Core/Nodes/ProjectNode.cs" /> |
35 | <include name="Core/Nodes/ReferenceNode.cs" /> | 35 | <include name="Core/Nodes/ReferenceNode.cs" /> |
36 | <include name="Core/Nodes/ReferencePathNode.cs" /> | 36 | <include name="Core/Nodes/ReferencePathNode.cs" /> |
37 | <include name="Core/Nodes/SolutionNode.cs" /> | 37 | <include name="Core/Nodes/SolutionNode.cs" /> |
38 | <include name="Core/Parse/IfContext.cs" /> | 38 | <include name="Core/Parse/IfContext.cs" /> |
39 | <include name="Core/Parse/Preprocessor.cs" /> | 39 | <include name="Core/Parse/Preprocessor.cs" /> |
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | 40 | <include name="Core/Targets/AutotoolsTarget.cs" /> |
41 | <include name="Core/Targets/DebugTarget.cs" /> | 41 | <include name="Core/Targets/DebugTarget.cs" /> |
42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> | 42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> |
43 | <include name="Core/Targets/NAntTarget.cs" /> | 43 | <include name="Core/Targets/NAntTarget.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | 44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> |
45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> | 45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> |
46 | <include name="Core/Targets/VS2002Target.cs" /> | 46 | <include name="Core/Targets/VS2002Target.cs" /> |
47 | <include name="Core/Targets/VS2003Target.cs" /> | 47 | <include name="Core/Targets/VS2003Target.cs" /> |
48 | <include name="Core/Targets/VS2005Target.cs" /> | 48 | <include name="Core/Targets/VS2005Target.cs" /> |
49 | <include name="Core/Utilities/CommandLineCollection.cs" /> | 49 | <include name="Core/Utilities/CommandLineCollection.cs" /> |
50 | <include name="Core/Utilities/CurrentDirectory.cs" /> | 50 | <include name="Core/Utilities/CurrentDirectory.cs" /> |
51 | <include name="Core/Utilities/Helper.cs" /> | 51 | <include name="Core/Utilities/Helper.cs" /> |
52 | <include name="Core/Utilities/Log.cs" /> | 52 | <include name="Core/Utilities/Log.cs" /> |
53 | <include name="Properties/AssemblyInfo.cs" /> | 53 | <include name="Properties/AssemblyInfo.cs" /> |
54 | </sources> | 54 | </sources> |
55 | <references basedir="${project::get-base-directory()}"> | 55 | <references basedir="${project::get-base-directory()}"> |
56 | <lib> | 56 | <lib> |
57 | <include name="${project::get-base-directory()}" /> | 57 | <include name="${project::get-base-directory()}" /> |
58 | <include name="${project::get-base-directory()}/${build.dir}" /> | 58 | <include name="${project::get-base-directory()}/${build.dir}" /> |
59 | </lib> | 59 | </lib> |
60 | <include name="System.EnterpriseServices.dll" /> | 60 | <include name="System.EnterpriseServices.dll" /> |
61 | <include name="System.Xml.dll" /> | 61 | <include name="System.Xml.dll" /> |
62 | <include name="System.dll" /> | 62 | <include name="System.dll" /> |
63 | </references> | 63 | </references> |
64 | </csc> | 64 | </csc> |
65 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 65 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
66 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 66 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
67 | <copy todir="${project::get-base-directory()}/../../bin/"> | 67 | <copy todir="${project::get-base-directory()}/../../bin/"> |
68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
69 | <include name="*.dll"/> | 69 | <include name="*.dll"/> |
70 | <include name="*.exe"/> | 70 | <include name="*.exe"/> |
71 | </fileset> | 71 | </fileset> |
72 | </copy> | 72 | </copy> |
73 | </target> | 73 | </target> |
74 | <target name="clean"> | 74 | <target name="clean"> |
75 | <delete dir="${bin.dir}" failonerror="false" /> | 75 | <delete dir="${bin.dir}" failonerror="false" /> |
76 | <delete dir="${obj.dir}" failonerror="false" /> | 76 | <delete dir="${obj.dir}" failonerror="false" /> |
77 | </target> | 77 | </target> |
78 | <target name="doc" description="Creates documentation."> | 78 | <target name="doc" description="Creates documentation."> |
79 | </target> | 79 | </target> |
80 | </project> | 80 | </project> |