diff options
28 files changed, 1165 insertions, 1145 deletions
diff --git a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build index 61d3efd..73e09ce 100644 --- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build +++ b/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Config.GridConfigDb4o" default="build"> | 2 | <project name="OpenGrid.Config.GridConfigDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Config.GridConfigDb4o" 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="DbGridConfig.cs" /> | 15 | <include name="DbGridConfig.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.dll" /> | 23 | <include name="System.Data.dll.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="../../bin/Db4objects.Db4o.dll" /> | 26 | <include name="../../bin/Db4objects.Db4o.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 | </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/OpenGridServices.GridServer/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs index 33e1e71..774c90a 100644 --- a/OpenGridServices.GridServer/GridHttp.cs +++ b/OpenGridServices.GridServer/GridHttp.cs | |||
@@ -114,7 +114,6 @@ namespace OpenGridServices.GridServer | |||
114 | SimNeighboursData.Add(NeighbourBlock); | 114 | SimNeighboursData.Add(NeighbourBlock); |
115 | } | 115 | } |
116 | } | 116 | } |
117 | |||
118 | 117 | ||
119 | SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString(); | 118 | SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString(); |
120 | SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString(); | 119 | SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString(); |
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index 90eaf1f..111e2f7 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | |||
@@ -1,48 +1,48 @@ | |||
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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="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="GridHttp.cs" /> | 14 | <include name="GridHttp.cs" /> |
15 | <include name="Main.cs" /> | 15 | <include name="Main.cs" /> |
16 | <include name="SimProfiles.cs" /> | 16 | <include name="SimProfiles.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/libsecondlife.dll" /> | 29 | <include name="../bin/libsecondlife.dll" /> |
30 | <include name="../bin/Db4objects.Db4o.dll" /> | 30 | <include name="../bin/Db4objects.Db4o.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/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 7212a7b..fd1be15 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build | |||
@@ -1,47 +1,47 @@ | |||
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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="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="Main.cs" /> | 14 | <include name="Main.cs" /> |
15 | <include name="UserHttp.cs" /> | 15 | <include name="UserHttp.cs" /> |
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.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" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../bin/OpenSim.Framework.dll" /> | 26 | <include name="../bin/OpenSim.Framework.dll" /> |
27 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="../bin/libsecondlife.dll" /> | 28 | <include name="../bin/libsecondlife.dll" /> |
29 | <include name="../bin/Db4objects.Db4o.dll" /> | 29 | <include name="../bin/Db4objects.Db4o.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.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build index 3ec42a8..fd22f7d 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Config.SimConfigDb4o" default="build"> | 2 | <project name="OpenSim.Config.SimConfigDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="DbSimConfig.cs" /> | 15 | <include name="DbSimConfig.cs" /> |
16 | </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.dll" /> | 23 | <include name="System.Data.dll.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="../../bin/Db4objects.Db4o.dll" /> | 26 | <include name="../../bin/Db4objects.Db4o.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 | </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.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build index fa90bb6..a3019ee 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build | |||
@@ -1,42 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework.Console" default="build"> | 2 | <project name="OpenSim.Framework.Console" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="ConsoleBase.cs" /> | 15 | <include name="ConsoleBase.cs" /> |
16 | <include name="ConsoleCallbacksBase.cs" /> | 16 | <include name="ConsoleCallbacksBase.cs" /> |
17 | <include name="MainConsole.cs" /> | 17 | <include name="MainConsole.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 | </references> | 25 | </references> |
26 | </csc> | 26 | </csc> |
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
28 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 28 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
29 | <copy todir="${project::get-base-directory()}/../bin/"> | 29 | <copy todir="${project::get-base-directory()}/../bin/"> |
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.Framework/IGridServer.cs b/OpenSim.Framework/IGridServer.cs index 026dfab..001ce3b 100644 --- a/OpenSim.Framework/IGridServer.cs +++ b/OpenSim.Framework/IGridServer.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Interfaces | |||
48 | AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); | 48 | AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); |
49 | bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); | 49 | bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); |
50 | string GetName(); | 50 | string GetName(); |
51 | bool RequestConnection(); | 51 | bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port); |
52 | void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); | 52 | void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); |
53 | void Close(); | 53 | void Close(); |
54 | } | 54 | } |
diff --git a/OpenSim.Framework/LocalGridBase.cs b/OpenSim.Framework/LocalGridBase.cs index c9b278a..6857d6d 100644 --- a/OpenSim.Framework/LocalGridBase.cs +++ b/OpenSim.Framework/LocalGridBase.cs | |||
@@ -12,7 +12,7 @@ namespace OpenSim.Framework.Interfaces | |||
12 | public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); | 12 | public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); |
13 | public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); | 13 | public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); |
14 | public abstract string GetName(); | 14 | public abstract string GetName(); |
15 | public abstract bool RequestConnection(); | 15 | public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port); |
16 | public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); | 16 | public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); |
17 | public abstract void AddNewSession(Login session); | 17 | public abstract void AddNewSession(Login session); |
18 | public abstract void Close(); | 18 | public abstract void Close(); |
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index 89010d2..b351625 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -1,67 +1,67 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework" default="build"> | 2 | <project name="OpenSim.Framework" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentCiruitData.cs" /> | 14 | <include name="AgentCiruitData.cs" /> |
15 | <include name="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="IGenericConfig.cs" /> | 21 | <include name="IGenericConfig.cs" /> |
22 | <include name="IGridConfig.cs" /> | 22 | <include name="IGridConfig.cs" /> |
23 | <include name="IGridServer.cs" /> | 23 | <include name="IGridServer.cs" /> |
24 | <include name="ILocalStorage.cs" /> | 24 | <include name="ILocalStorage.cs" /> |
25 | <include name="IUserConfig.cs" /> | 25 | <include name="IUserConfig.cs" /> |
26 | <include name="IUserServer.cs" /> | 26 | <include name="IUserServer.cs" /> |
27 | <include name="LocalGridBase.cs" /> | 27 | <include name="LocalGridBase.cs" /> |
28 | <include name="Login.cs" /> | 28 | <include name="Login.cs" /> |
29 | <include name="LoginService.cs" /> | 29 | <include name="LoginService.cs" /> |
30 | <include name="NeighbourInfo.cs" /> | 30 | <include name="NeighbourInfo.cs" /> |
31 | <include name="PrimData.cs" /> | 31 | <include name="PrimData.cs" /> |
32 | <include name="RemoteGridBase.cs" /> | 32 | <include name="RemoteGridBase.cs" /> |
33 | <include name="SimProfile.cs" /> | 33 | <include name="SimProfile.cs" /> |
34 | <include name="SimProfileBase.cs" /> | 34 | <include name="SimProfileBase.cs" /> |
35 | <include name="UserProfile.cs" /> | 35 | <include name="UserProfile.cs" /> |
36 | <include name="UserProfileManager.cs" /> | 36 | <include name="UserProfileManager.cs" /> |
37 | <include name="UserProfileManagerBase.cs" /> | 37 | <include name="UserProfileManagerBase.cs" /> |
38 | <include name="Util.cs" /> | 38 | <include name="Util.cs" /> |
39 | <include name="Properties/AssemblyInfo.cs" /> | 39 | <include name="Properties/AssemblyInfo.cs" /> |
40 | </sources> | 40 | </sources> |
41 | <references basedir="${project::get-base-directory()}"> | 41 | <references basedir="${project::get-base-directory()}"> |
42 | <lib> | 42 | <lib> |
43 | <include name="${project::get-base-directory()}" /> | 43 | <include name="${project::get-base-directory()}" /> |
44 | <include name="${project::get-base-directory()}/${build.dir}" /> | 44 | <include name="${project::get-base-directory()}/${build.dir}" /> |
45 | </lib> | 45 | </lib> |
46 | <include name="System.dll" /> | 46 | <include name="System.dll" /> |
47 | <include name="System.Xml.dll" /> | 47 | <include name="System.Xml.dll" /> |
48 | <include name="../bin/libsecondlife.dll" /> | 48 | <include name="../bin/libsecondlife.dll" /> |
49 | <include name="../bin/Db4objects.Db4o.dll" /> | 49 | <include name="../bin/Db4objects.Db4o.dll" /> |
50 | </references> | 50 | </references> |
51 | </csc> | 51 | </csc> |
52 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 52 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
53 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 53 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
54 | <copy todir="${project::get-base-directory()}/../bin/"> | 54 | <copy todir="${project::get-base-directory()}/../bin/"> |
55 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 55 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
56 | <include name="*.dll"/> | 56 | <include name="*.dll"/> |
57 | <include name="*.exe"/> | 57 | <include name="*.exe"/> |
58 | </fileset> | 58 | </fileset> |
59 | </copy> | 59 | </copy> |
60 | </target> | 60 | </target> |
61 | <target name="clean"> | 61 | <target name="clean"> |
62 | <delete dir="${bin.dir}" failonerror="false" /> | 62 | <delete dir="${bin.dir}" failonerror="false" /> |
63 | <delete dir="${obj.dir}" failonerror="false" /> | 63 | <delete dir="${obj.dir}" failonerror="false" /> |
64 | </target> | 64 | </target> |
65 | <target name="doc" description="Creates documentation."> | 65 | <target name="doc" description="Creates documentation."> |
66 | </target> | 66 | </target> |
67 | </project> | 67 | </project> |
diff --git a/OpenSim.Framework/RemoteGridBase.cs b/OpenSim.Framework/RemoteGridBase.cs index 6ca57df..e1f0b9b 100644 --- a/OpenSim.Framework/RemoteGridBase.cs +++ b/OpenSim.Framework/RemoteGridBase.cs | |||
@@ -18,7 +18,7 @@ namespace OpenSim.Framework.Interfaces | |||
18 | public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); | 18 | public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); |
19 | public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); | 19 | public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); |
20 | public abstract string GetName(); | 20 | public abstract string GetName(); |
21 | public abstract bool RequestConnection(); | 21 | public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port); |
22 | public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); | 22 | public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); |
23 | public abstract void Close(); | 23 | public abstract void Close(); |
24 | } | 24 | } |
diff --git a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build index f34e4ac..6335985 100644 --- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build +++ b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build | |||
@@ -1,42 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GenericConfig.Xml" default="build"> | 2 | <project name="OpenSim.GenericConfig.Xml" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="XmlConfig.cs" /> | 14 | <include name="XmlConfig.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.Xml.dll" /> | 23 | <include name="System.Xml.dll" /> |
24 | <include name="../../bin/OpenSim.Framework.dll" /> | 24 | <include name="../../bin/OpenSim.Framework.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/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
28 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 28 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
29 | <copy todir="${project::get-base-directory()}/../../bin/"> | 29 | <copy todir="${project::get-base-directory()}/../../bin/"> |
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.GridInterfaces/Local/LocalGridServer.cs b/OpenSim.GridInterfaces/Local/LocalGridServer.cs index d70e989..311179b 100644 --- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs +++ b/OpenSim.GridInterfaces/Local/LocalGridServer.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.GridInterfaces.Local | |||
63 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created"); | 63 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created"); |
64 | } | 64 | } |
65 | 65 | ||
66 | public override bool RequestConnection() | 66 | public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) |
67 | { | 67 | { |
68 | return true; | 68 | return true; |
69 | } | 69 | } |
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index 6bf398e..c7a1966 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Local" default="build"> | 2 | <project name="OpenSim.GridInterfaces.Local" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="LocalAssetServer.cs" /> | 15 | <include name="LocalAssetServer.cs" /> |
16 | <include name="LocalGridServer.cs" /> | 16 | <include name="LocalGridServer.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../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 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index dd6db18..4788f32 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build | |||
@@ -1,45 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> | 2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="RemoteAssetServer.cs" /> | 15 | <include name="RemoteAssetServer.cs" /> |
16 | <include name="RemoteGridServer.cs" /> | 16 | <include name="RemoteGridServer.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/libsecondlife.dll" /> | 25 | <include name="../../bin/libsecondlife.dll" /> |
26 | <include name="../../bin/OpenSim.Framework.dll" /> | 26 | <include name="../../bin/OpenSim.Framework.dll" /> |
27 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../bin/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.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs index 5f48916..d51d212 100644 --- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs +++ b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs | |||
@@ -25,12 +25,14 @@ | |||
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | using System; | 27 | using System; |
28 | using System.Collections; | ||
28 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
29 | using System.Threading; | 30 | using System.Threading; |
30 | using System.Net; | 31 | using System.Net; |
31 | using System.Net.Sockets; | 32 | using System.Net.Sockets; |
32 | using System.IO; | 33 | using System.IO; |
33 | using libsecondlife; | 34 | using libsecondlife; |
35 | using Nwc.XmlRpc; | ||
34 | using OpenSim.Framework.Interfaces; | 36 | using OpenSim.Framework.Interfaces; |
35 | using OpenSim.Framework.Assets; | 37 | using OpenSim.Framework.Assets; |
36 | 38 | ||
@@ -54,10 +56,28 @@ namespace OpenSim.GridInterfaces.Remote | |||
54 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); | 56 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); |
55 | } | 57 | } |
56 | 58 | ||
57 | public override bool RequestConnection() | 59 | public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) |
58 | { | 60 | { |
59 | return true; | 61 | Hashtable GridParams = new Hashtable(); |
60 | } | 62 | GridParams["authkey"]=GridSendKey; |
63 | GridParams["UUID"]=SimUUID.ToString(); | ||
64 | GridParams["sim_ip"]=sim_ip; | ||
65 | GridParams["sim_port"]=sim_port.ToString(); | ||
66 | ArrayList SendParams = new ArrayList(); | ||
67 | SendParams.Add(GridParams); | ||
68 | |||
69 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); | ||
70 | XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000); | ||
71 | Hashtable GridRespData = (Hashtable)GridResp.Value; | ||
72 | |||
73 | if(GridRespData.ContainsKey("error")) { | ||
74 | string errorstring = (string)GridRespData["error"]; | ||
75 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:"); | ||
76 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring); | ||
77 | return false; | ||
78 | } | ||
79 | return true; | ||
80 | } | ||
61 | 81 | ||
62 | public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) | 82 | public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) |
63 | { | 83 | { |
@@ -82,7 +102,7 @@ namespace OpenSim.GridInterfaces.Remote | |||
82 | user.LoginInfo.Agent = agentID; | 102 | user.LoginInfo.Agent = agentID; |
83 | user.LoginInfo.Session = sessionID; | 103 | user.LoginInfo.Session = sessionID; |
84 | user.LoginInfo.SecureSession = validcircuit.SecureSessionID; | 104 | user.LoginInfo.SecureSession = validcircuit.SecureSessionID; |
85 | user.LoginInfo.First = validcircuit.firstname; | 105 | user.LoginInfo.First = validcircuit.firstname; |
86 | user.LoginInfo.Last = validcircuit.lastname; | 106 | user.LoginInfo.Last = validcircuit.lastname; |
87 | } | 107 | } |
88 | else | 108 | else |
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index 3497a55..7b063a3 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build | |||
@@ -1,42 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> | 2 | <project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="BasicPhysicsPlugin.cs" /> | 15 | <include name="BasicPhysicsPlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> | 24 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
25 | </references> | 25 | </references> |
26 | </csc> | 26 | </csc> |
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
28 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 28 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
29 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 29 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
31 | <include name="*.dll"/> | 31 | <include name="*.dll"/> |
32 | <include name="*.exe"/> | 32 | <include name="*.exe"/> |
33 | </fileset> | 33 | </fileset> |
34 | </copy> | 34 | </copy> |
35 | </target> | 35 | </target> |
36 | <target name="clean"> | 36 | <target name="clean"> |
37 | <delete dir="${bin.dir}" failonerror="false" /> | 37 | <delete dir="${bin.dir}" failonerror="false" /> |
38 | <delete dir="${obj.dir}" failonerror="false" /> | 38 | <delete dir="${obj.dir}" failonerror="false" /> |
39 | </target> | 39 | </target> |
40 | <target name="doc" description="Creates documentation."> | 40 | <target name="doc" description="Creates documentation."> |
41 | </target> | 41 | </target> |
42 | </project> | 42 | </project> |
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 4b5ee51..1554485 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.Manager" default="build"> | 2 | <project name="OpenSim.Physics.Manager" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="PhysicsActor.cs" /> | 15 | <include name="PhysicsActor.cs" /> |
16 | <include name="PhysicsManager.cs" /> | 16 | <include name="PhysicsManager.cs" /> |
17 | <include name="PhysicsScene.cs" /> | 17 | <include name="PhysicsScene.cs" /> |
18 | <include name="PhysicsVector.cs" /> | 18 | <include name="PhysicsVector.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
22 | <include name="${project::get-base-directory()}" /> | 22 | <include name="${project::get-base-directory()}" /> |
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | 23 | <include name="${project::get-base-directory()}/${build.dir}" /> |
24 | </lib> | 24 | </lib> |
25 | <include name="System.dll" /> | 25 | <include name="System.dll" /> |
26 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="../../bin/Axiom.MathLib.dll" /> | 27 | <include name="../../bin/Axiom.MathLib.dll" /> |
28 | <include name="../../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 | </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.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build index f25361a..098472a 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.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="../../bin/OpenSim.Physics.Manager.dll" /> | 24 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
25 | <include name="../../bin/Ode.NET.dll" /> | 25 | <include name="../../bin/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.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build index 5ab70bb..3ae7013 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.PhysXPlugin" default="build"> | 2 | <project name="OpenSim.Physics.PhysXPlugin" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="PhysXPlugin.cs" /> | 15 | <include name="PhysXPlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> | 24 | <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> |
25 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> | 25 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
32 | <include name="*.dll"/> | 32 | <include name="*.dll"/> |
33 | <include name="*.exe"/> | 33 | <include name="*.exe"/> |
34 | </fileset> | 34 | </fileset> |
35 | </copy> | 35 | </copy> |
36 | </target> | 36 | </target> |
37 | <target name="clean"> | 37 | <target name="clean"> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <delete dir="${bin.dir}" failonerror="false" /> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${obj.dir}" failonerror="false" /> |
40 | </target> | 40 | </target> |
41 | <target name="doc" description="Creates documentation."> | 41 | <target name="doc" description="Creates documentation."> |
42 | </target> | 42 | </target> |
43 | </project> | 43 | </project> |
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 4a08551..9a1a8eb 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -1,77 +1,77 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.RegionServer" default="build"> | 2 | <project name="OpenSim.RegionServer" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentAssetUpload.cs" /> | 14 | <include name="AgentAssetUpload.cs" /> |
15 | <include name="ConsoleCmds.cs" /> | 15 | <include name="ConsoleCmds.cs" /> |
16 | <include name="Grid.cs" /> | 16 | <include name="Grid.cs" /> |
17 | <include name="OpenSimMain.cs" /> | 17 | <include name="OpenSimMain.cs" /> |
18 | <include name="OpenSimNetworkHandler.cs" /> | 18 | <include name="OpenSimNetworkHandler.cs" /> |
19 | <include name="PacketServer.cs" /> | 19 | <include name="PacketServer.cs" /> |
20 | <include name="QueItem.cs" /> | 20 | <include name="QueItem.cs" /> |
21 | <include name="RegionInfo.cs" /> | 21 | <include name="RegionInfo.cs" /> |
22 | <include name="SimClient.cs" /> | 22 | <include name="SimClient.cs" /> |
23 | <include name="SimConsole.cs" /> | 23 | <include name="SimConsole.cs" /> |
24 | <include name="VersionInfo.cs" /> | 24 | <include name="VersionInfo.cs" /> |
25 | <include name="Assets/AssetCache.cs" /> | 25 | <include name="Assets/AssetCache.cs" /> |
26 | <include name="Assets/InventoryCache.cs" /> | 26 | <include name="Assets/InventoryCache.cs" /> |
27 | <include name="CAPS/AdminWebFront.cs" /> | 27 | <include name="CAPS/AdminWebFront.cs" /> |
28 | <include name="types/Mesh.cs" /> | 28 | <include name="types/Mesh.cs" /> |
29 | <include name="types/Triangle.cs" /> | 29 | <include name="types/Triangle.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 | <include name="world/scripting/IScriptContext.cs" /> | 38 | <include name="world/scripting/IScriptContext.cs" /> |
39 | <include name="world/scripting/IScriptEntity.cs" /> | 39 | <include name="world/scripting/IScriptEntity.cs" /> |
40 | <include name="world/scripting/IScriptHandler.cs" /> | 40 | <include name="world/scripting/IScriptHandler.cs" /> |
41 | <include name="world/scripting/Script.cs" /> | 41 | <include name="world/scripting/Script.cs" /> |
42 | <include name="world/scripting/ScriptFactory.cs" /> | 42 | <include name="world/scripting/ScriptFactory.cs" /> |
43 | <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> | 43 | <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> |
44 | </sources> | 44 | </sources> |
45 | <references basedir="${project::get-base-directory()}"> | 45 | <references basedir="${project::get-base-directory()}"> |
46 | <lib> | 46 | <lib> |
47 | <include name="${project::get-base-directory()}" /> | 47 | <include name="${project::get-base-directory()}" /> |
48 | <include name="${project::get-base-directory()}/${build.dir}" /> | 48 | <include name="${project::get-base-directory()}/${build.dir}" /> |
49 | </lib> | 49 | </lib> |
50 | <include name="System.dll" /> | 50 | <include name="System.dll" /> |
51 | <include name="System.Xml.dll" /> | 51 | <include name="System.Xml.dll" /> |
52 | <include name="../bin/libsecondlife.dll" /> | 52 | <include name="../bin/libsecondlife.dll" /> |
53 | <include name="../bin/Axiom.MathLib.dll" /> | 53 | <include name="../bin/Axiom.MathLib.dll" /> |
54 | <include name="../bin/Db4objects.Db4o.dll" /> | 54 | <include name="../bin/Db4objects.Db4o.dll" /> |
55 | <include name="../bin/OpenSim.Framework.dll" /> | 55 | <include name="../bin/OpenSim.Framework.dll" /> |
56 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 56 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
57 | <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> | 57 | <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> |
58 | <include name="../bin/OpenSim.Physics.Manager.dll" /> | 58 | <include name="../bin/OpenSim.Physics.Manager.dll" /> |
59 | <include name="../bin/OpenSim.Servers.dll" /> | 59 | <include name="../bin/OpenSim.Servers.dll" /> |
60 | </references> | 60 | </references> |
61 | </csc> | 61 | </csc> |
62 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 62 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
63 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 63 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
64 | <copy todir="${project::get-base-directory()}/../bin/"> | 64 | <copy todir="${project::get-base-directory()}/../bin/"> |
65 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 65 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
66 | <include name="*.dll"/> | 66 | <include name="*.dll"/> |
67 | <include name="*.exe"/> | 67 | <include name="*.exe"/> |
68 | </fileset> | 68 | </fileset> |
69 | </copy> | 69 | </copy> |
70 | </target> | 70 | </target> |
71 | <target name="clean"> | 71 | <target name="clean"> |
72 | <delete dir="${bin.dir}" failonerror="false" /> | 72 | <delete dir="${bin.dir}" failonerror="false" /> |
73 | <delete dir="${obj.dir}" failonerror="false" /> | 73 | <delete dir="${obj.dir}" failonerror="false" /> |
74 | </target> | 74 | </target> |
75 | <target name="doc" description="Creates documentation."> | 75 | <target name="doc" description="Creates documentation."> |
76 | </target> | 76 | </target> |
77 | </project> | 77 | </project> |
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index 316bcd9..5db654e 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs | |||
@@ -54,7 +54,8 @@ namespace OpenSim | |||
54 | 54 | ||
55 | public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback | 55 | public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback |
56 | { | 56 | { |
57 | //private SimConfig Cfg; | 57 | |
58 | //private SimConfig Cfg; | ||
58 | private IGenericConfig localConfig; | 59 | private IGenericConfig localConfig; |
59 | //private IGenericConfig remoteConfig; | 60 | //private IGenericConfig remoteConfig; |
60 | private PhysicsManager physManager; | 61 | private PhysicsManager physManager; |
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 8be321d..439f440 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Storage.LocalStorageDb4o" default="build"> | 2 | <project name="OpenSim.Storage.LocalStorageDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="Db4LocalStorage.cs" /> | 15 | <include name="Db4LocalStorage.cs" /> |
16 | <include name="MapStorage.cs" /> | 16 | <include name="MapStorage.cs" /> |
17 | <include name="UUIDQuery.cs" /> | 17 | <include name="UUIDQuery.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.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../../bin/Db4objects.Db4o.dll" /> | 26 | <include name="../../bin/Db4objects.Db4o.dll" /> |
27 | <include name="../../bin/libsecondlife.dll" /> | 27 | <include name="../../bin/libsecondlife.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 | </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.build b/OpenSim.build index 069b031..d4a006d 100644 --- a/OpenSim.build +++ b/OpenSim.build | |||
@@ -1,118 +1,118 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim" default="build"> | 2 | <project name="OpenSim" default="build"> |
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | 3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> |
4 | 4 | ||
5 | <property name="bin.dir" value="bin" /> | 5 | <property name="bin.dir" value="bin" /> |
6 | <property name="obj.dir" value="obj" /> | 6 | <property name="obj.dir" value="obj" /> |
7 | <property name="doc.dir" value="doc" /> | 7 | <property name="doc.dir" value="doc" /> |
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | 8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> |
9 | 9 | <property name="project.config" value="Release" /> | |
10 | <target name="Debug" description=""> | 10 | |
11 | <property name="project.config" value="Debug" /> | 11 | <target name="Release" description=""> |
12 | <property name="build.debug" value="true" /> | 12 | <property name="project.config" value="Release" /> |
13 | </target> | 13 | <property name="build.debug" value="false" /> |
14 | 14 | </target> | |
15 | <property name="project.config" value="Release" /> | 15 | |
16 | 16 | ||
17 | <target name="Release" description=""> | 17 | <target name="Debug" description=""> |
18 | <property name="project.config" value="Release" /> | 18 | <property name="project.config" value="Debug" /> |
19 | <property name="build.debug" value="false" /> | 19 | <property name="build.debug" value="true" /> |
20 | </target> | 20 | </target> |
21 | 21 | ||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 23 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 24 | </target> |
25 | 25 | ||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | 26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> |
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | 27 | <property name="nant.settings.currentframework" value="net-2.0" /> |
28 | </target> | 28 | </target> |
29 | 29 | ||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | 30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> |
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | 31 | <property name="nant.settings.currentframework" value="mono-2.0" /> |
32 | </target> | 32 | </target> |
33 | 33 | ||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | 34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> |
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | 35 | <property name="nant.settings.currentframework" value="mono-1.0" /> |
36 | </target> | 36 | </target> |
37 | 37 | ||
38 | <target name="init" description=""> | 38 | <target name="init" description=""> |
39 | <call target="${project.config}" /> | 39 | <call target="${project.config}" /> |
40 | <sysinfo /> | 40 | <sysinfo /> |
41 | <echo message="Platform ${sys.os.platform}" /> | 41 | <echo message="Platform ${sys.os.platform}" /> |
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | 42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> |
43 | </target> | 43 | </target> |
44 | 44 | ||
45 | <target name="clean" description=""> | 45 | <target name="clean" description=""> |
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> | 49 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> |
50 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> | 50 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> |
51 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> | 51 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> |
52 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> | 52 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" /> |
53 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> | 53 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> |
54 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> | 54 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> |
55 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> | 55 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> |
56 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> | 56 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> |
57 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> | 57 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> |
58 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" /> | 58 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> |
59 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> | 59 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> |
60 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> | 60 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> |
61 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> | 61 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> |
62 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> | 62 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> |
63 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> | 63 | <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> |
64 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" /> | 64 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> |
65 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> | 65 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" /> |
66 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> | 66 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> |
67 | </target> | 67 | </target> |
68 | 68 | ||
69 | <target name="build" depends="init" description=""> | 69 | <target name="build" depends="init" description=""> |
70 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> | 70 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> |
71 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> | 71 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> |
72 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" /> | 72 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" /> |
73 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> | 73 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> |
74 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> | 74 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> |
75 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> | 75 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> |
76 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> | 76 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> |
77 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" /> | 77 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" /> |
78 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" /> | 78 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" /> |
79 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> | 79 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> |
80 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> | 80 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> |
81 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> | 81 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> |
82 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> | 82 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> |
83 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> | 83 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> |
84 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" /> | 84 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" /> |
85 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> | 85 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> |
86 | <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> | 86 | <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> |
87 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> | 87 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> |
88 | </target> | 88 | </target> |
89 | 89 | ||
90 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 90 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
91 | 91 | ||
92 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | 92 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> |
93 | 93 | ||
94 | <target name="package" depends="clean, doc" description="Builds all" /> | 94 | <target name="package" depends="clean, doc" description="Builds all" /> |
95 | 95 | ||
96 | <target name="doc" depends="build-release"> | 96 | <target name="doc" depends="build-release"> |
97 | <echo message="Generating all documentation from all builds" /> | 97 | <echo message="Generating all documentation from all builds" /> |
98 | <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> | 98 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> |
99 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> | 99 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> |
100 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> | 100 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> |
101 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> | 101 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" /> |
102 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> | 102 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> |
103 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> | 103 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> |
104 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> | 104 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> |
105 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> | 105 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> |
106 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> | 106 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> |
107 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" /> | 107 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> |
108 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> | 108 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> |
109 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> | 109 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> |
110 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> | 110 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> |
111 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> | 111 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> |
112 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> | 112 | <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> |
113 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" /> | 113 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> |
114 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> | 114 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" /> |
115 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> | 115 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> |
116 | </target> | 116 | </target> |
117 | 117 | ||
118 | </project> | 118 | </project> |
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build index 02445df..54b7a3b 100644 --- a/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim.exe.build | |||
@@ -1,48 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim" default="build"> | 2 | <project name="OpenSim" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenSim" dynamicprefix="true" > | 11 | <resources prefix="OpenSim" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Application.cs" /> | 14 | <include name="Application.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="../bin/OpenSim.Framework.dll" /> | 26 | <include name="../bin/OpenSim.Framework.dll" /> |
27 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="../bin/OpenSim.Physics.Manager.dll" /> | 28 | <include name="../bin/OpenSim.Physics.Manager.dll" /> |
29 | <include name="../bin/OpenSim.Servers.dll" /> | 29 | <include name="../bin/OpenSim.Servers.dll" /> |
30 | <include name="../bin/OpenSim.RegionServer.dll" /> | 30 | <include name="../bin/OpenSim.RegionServer.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/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build index 8494a0b..0abcfa1 100644 --- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build +++ b/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenUser.Config.UserConfigDb4o" default="build"> | 2 | <project name="OpenUser.Config.UserConfigDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenUser.Config.UserConfigDb4o" 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="DbUserConfig.cs" /> | 15 | <include name="DbUserConfig.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.dll" /> | 23 | <include name="System.Data.dll.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="../../bin/Db4objects.Db4o.dll" /> | 26 | <include name="../../bin/Db4objects.Db4o.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 | </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/Prebuild/Prebuild.build b/Prebuild/Prebuild.build index 395fb31..743b826 100644 --- a/Prebuild/Prebuild.build +++ b/Prebuild/Prebuild.build | |||
@@ -1,67 +1,67 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="Prebuild" default="build"> | 2 | <project name="Prebuild" default="build"> |
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | 3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> |
4 | 4 | ||
5 | <property name="bin.dir" value="bin" /> | 5 | <property name="bin.dir" value="bin" /> |
6 | <property name="obj.dir" value="obj" /> | 6 | <property name="obj.dir" value="obj" /> |
7 | <property name="doc.dir" value="doc" /> | 7 | <property name="doc.dir" value="doc" /> |
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | 8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> |
9 | 9 | <property name="project.config" value="Release" /> | |
10 | <target name="Debug" description=""> | 10 | |
11 | <property name="project.config" value="Debug" /> | 11 | <target name="Release" description=""> |
12 | <property name="build.debug" value="true" /> | 12 | <property name="project.config" value="Release" /> |
13 | </target> | 13 | <property name="build.debug" value="false" /> |
14 | 14 | </target> | |
15 | <property name="project.config" value="Release" /> | 15 | |
16 | 16 | ||
17 | <target name="Release" description=""> | 17 | <target name="Debug" description=""> |
18 | <property name="project.config" value="Release" /> | 18 | <property name="project.config" value="Debug" /> |
19 | <property name="build.debug" value="false" /> | 19 | <property name="build.debug" value="true" /> |
20 | </target> | 20 | </target> |
21 | 21 | ||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 23 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 24 | </target> |
25 | 25 | ||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | 26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> |
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | 27 | <property name="nant.settings.currentframework" value="net-2.0" /> |
28 | </target> | 28 | </target> |
29 | 29 | ||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | 30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> |
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | 31 | <property name="nant.settings.currentframework" value="mono-2.0" /> |
32 | </target> | 32 | </target> |
33 | 33 | ||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | 34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> |
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | 35 | <property name="nant.settings.currentframework" value="mono-1.0" /> |
36 | </target> | 36 | </target> |
37 | 37 | ||
38 | <target name="init" description=""> | 38 | <target name="init" description=""> |
39 | <call target="${project.config}" /> | 39 | <call target="${project.config}" /> |
40 | <sysinfo /> | 40 | <sysinfo /> |
41 | <echo message="Platform ${sys.os.platform}" /> | 41 | <echo message="Platform ${sys.os.platform}" /> |
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | 42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> |
43 | </target> | 43 | </target> |
44 | 44 | ||
45 | <target name="clean" description=""> | 45 | <target name="clean" description=""> |
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="src/Prebuild.exe.build" target="clean" /> | 49 | <nant buildfile="src/Prebuild.exe.build" target="clean" /> |
50 | </target> | 50 | </target> |
51 | 51 | ||
52 | <target name="build" depends="init" description=""> | 52 | <target name="build" depends="init" description=""> |
53 | <nant buildfile="src/Prebuild.exe.build" target="build" /> | 53 | <nant buildfile="src/Prebuild.exe.build" target="build" /> |
54 | </target> | 54 | </target> |
55 | 55 | ||
56 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 56 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
57 | 57 | ||
58 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | 58 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> |
59 | 59 | ||
60 | <target name="package" depends="clean, doc" description="Builds all" /> | 60 | <target name="package" depends="clean, doc" description="Builds all" /> |
61 | 61 | ||
62 | <target name="doc" depends="build-release"> | 62 | <target name="doc" depends="build-release"> |
63 | <echo message="Generating all documentation from all builds" /> | 63 | <echo message="Generating all documentation from all builds" /> |
64 | <nant buildfile="src/Prebuild.exe.build" target="doc" /> | 64 | <nant buildfile="src/Prebuild.exe.build" target="doc" /> |
65 | </target> | 65 | </target> |
66 | 66 | ||
67 | </project> | 67 | </project> |
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index 43f5516..628e7e1 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build | |||
@@ -1,80 +1,80 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="Prebuild" default="build"> | 2 | <project name="Prebuild" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> | 10 | <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> |
11 | <resources prefix="Prebuild" dynamicprefix="true" > | 11 | <resources prefix="Prebuild" dynamicprefix="true" > |
12 | <include name="App.ico" /> | 12 | <include name="App.ico" /> |
13 | <include name="data/prebuild-1.7.xsd" /> | 13 | <include name="data/prebuild-1.7.xsd" /> |
14 | </resources> | 14 | </resources> |
15 | <sources failonempty="true"> | 15 | <sources failonempty="true"> |
16 | <include name="Prebuild.cs" /> | 16 | <include name="Prebuild.cs" /> |
17 | <include name="Core/FatalException.cs" /> | 17 | <include name="Core/FatalException.cs" /> |
18 | <include name="Core/Kernel.cs" /> | 18 | <include name="Core/Kernel.cs" /> |
19 | <include name="Core/UnknownLanguageException.cs" /> | 19 | <include name="Core/UnknownLanguageException.cs" /> |
20 | <include name="Core/WarningException.cs" /> | 20 | <include name="Core/WarningException.cs" /> |
21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | 21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> |
22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | 22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> |
23 | <include name="Core/Attributes/TargetAttribute.cs" /> | 23 | <include name="Core/Attributes/TargetAttribute.cs" /> |
24 | <include name="Core/Interfaces/IDataNode.cs" /> | 24 | <include name="Core/Interfaces/IDataNode.cs" /> |
25 | <include name="Core/Interfaces/ITarget.cs" /> | 25 | <include name="Core/Interfaces/ITarget.cs" /> |
26 | <include name="Core/Nodes/ConfigurationNode.cs" /> | 26 | <include name="Core/Nodes/ConfigurationNode.cs" /> |
27 | <include name="Core/Nodes/DataNode.cs" /> | 27 | <include name="Core/Nodes/DataNode.cs" /> |
28 | <include name="Core/Nodes/ExcludeNode.cs" /> | 28 | <include name="Core/Nodes/ExcludeNode.cs" /> |
29 | <include name="Core/Nodes/FileNode.cs" /> | 29 | <include name="Core/Nodes/FileNode.cs" /> |
30 | <include name="Core/Nodes/FilesNode.cs" /> | 30 | <include name="Core/Nodes/FilesNode.cs" /> |
31 | <include name="Core/Nodes/MatchNode.cs" /> | 31 | <include name="Core/Nodes/MatchNode.cs" /> |
32 | <include name="Core/Nodes/OptionsNode.cs" /> | 32 | <include name="Core/Nodes/OptionsNode.cs" /> |
33 | <include name="Core/Nodes/ProcessNode.cs" /> | 33 | <include name="Core/Nodes/ProcessNode.cs" /> |
34 | <include name="Core/Nodes/ProjectNode.cs" /> | 34 | <include name="Core/Nodes/ProjectNode.cs" /> |
35 | <include name="Core/Nodes/ReferenceNode.cs" /> | 35 | <include name="Core/Nodes/ReferenceNode.cs" /> |
36 | <include name="Core/Nodes/ReferencePathNode.cs" /> | 36 | <include name="Core/Nodes/ReferencePathNode.cs" /> |
37 | <include name="Core/Nodes/SolutionNode.cs" /> | 37 | <include name="Core/Nodes/SolutionNode.cs" /> |
38 | <include name="Core/Parse/IfContext.cs" /> | 38 | <include name="Core/Parse/IfContext.cs" /> |
39 | <include name="Core/Parse/Preprocessor.cs" /> | 39 | <include name="Core/Parse/Preprocessor.cs" /> |
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | 40 | <include name="Core/Targets/AutotoolsTarget.cs" /> |
41 | <include name="Core/Targets/DebugTarget.cs" /> | 41 | <include name="Core/Targets/DebugTarget.cs" /> |
42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> | 42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> |
43 | <include name="Core/Targets/NAntTarget.cs" /> | 43 | <include name="Core/Targets/NAntTarget.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | 44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> |
45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> | 45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> |
46 | <include name="Core/Targets/VS2002Target.cs" /> | 46 | <include name="Core/Targets/VS2002Target.cs" /> |
47 | <include name="Core/Targets/VS2003Target.cs" /> | 47 | <include name="Core/Targets/VS2003Target.cs" /> |
48 | <include name="Core/Targets/VS2005Target.cs" /> | 48 | <include name="Core/Targets/VS2005Target.cs" /> |
49 | <include name="Core/Utilities/CommandLineCollection.cs" /> | 49 | <include name="Core/Utilities/CommandLineCollection.cs" /> |
50 | <include name="Core/Utilities/CurrentDirectory.cs" /> | 50 | <include name="Core/Utilities/CurrentDirectory.cs" /> |
51 | <include name="Core/Utilities/Helper.cs" /> | 51 | <include name="Core/Utilities/Helper.cs" /> |
52 | <include name="Core/Utilities/Log.cs" /> | 52 | <include name="Core/Utilities/Log.cs" /> |
53 | <include name="Properties/AssemblyInfo.cs" /> | 53 | <include name="Properties/AssemblyInfo.cs" /> |
54 | </sources> | 54 | </sources> |
55 | <references basedir="${project::get-base-directory()}"> | 55 | <references basedir="${project::get-base-directory()}"> |
56 | <lib> | 56 | <lib> |
57 | <include name="${project::get-base-directory()}" /> | 57 | <include name="${project::get-base-directory()}" /> |
58 | <include name="${project::get-base-directory()}/${build.dir}" /> | 58 | <include name="${project::get-base-directory()}/${build.dir}" /> |
59 | </lib> | 59 | </lib> |
60 | <include name="System.EnterpriseServices.dll" /> | 60 | <include name="System.EnterpriseServices.dll" /> |
61 | <include name="System.Xml.dll" /> | 61 | <include name="System.Xml.dll" /> |
62 | <include name="System.dll" /> | 62 | <include name="System.dll" /> |
63 | </references> | 63 | </references> |
64 | </csc> | 64 | </csc> |
65 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 65 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
66 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 66 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
67 | <copy todir="${project::get-base-directory()}/../../bin/"> | 67 | <copy todir="${project::get-base-directory()}/../../bin/"> |
68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
69 | <include name="*.dll"/> | 69 | <include name="*.dll"/> |
70 | <include name="*.exe"/> | 70 | <include name="*.exe"/> |
71 | </fileset> | 71 | </fileset> |
72 | </copy> | 72 | </copy> |
73 | </target> | 73 | </target> |
74 | <target name="clean"> | 74 | <target name="clean"> |
75 | <delete dir="${bin.dir}" failonerror="false" /> | 75 | <delete dir="${bin.dir}" failonerror="false" /> |
76 | <delete dir="${obj.dir}" failonerror="false" /> | 76 | <delete dir="${obj.dir}" failonerror="false" /> |
77 | </target> | 77 | </target> |
78 | <target name="doc" description="Creates documentation."> | 78 | <target name="doc" description="Creates documentation."> |
79 | </target> | 79 | </target> |
80 | </project> | 80 | </project> |
diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build index 1d4b496..74d1072 100644 --- a/Servers/OpenSim.Servers.dll.build +++ b/Servers/OpenSim.Servers.dll.build | |||
@@ -1,48 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Servers" default="build"> | 2 | <project name="OpenSim.Servers" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Servers" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Servers" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="BaseHttpServer.cs" /> | 14 | <include name="BaseHttpServer.cs" /> |
15 | <include name="IRestHandler.cs" /> | 15 | <include name="IRestHandler.cs" /> |
16 | <include name="LocalUserProfileManager.cs" /> | 16 | <include name="LocalUserProfileManager.cs" /> |
17 | <include name="LoginResponse.cs" /> | 17 | <include name="LoginResponse.cs" /> |
18 | <include name="LoginServer.cs" /> | 18 | <include name="LoginServer.cs" /> |
19 | <include name="XmlRpcMethod.cs" /> | 19 | <include name="XmlRpcMethod.cs" /> |
20 | </sources> | 20 | </sources> |
21 | <references basedir="${project::get-base-directory()}"> | 21 | <references basedir="${project::get-base-directory()}"> |
22 | <lib> | 22 | <lib> |
23 | <include name="${project::get-base-directory()}" /> | 23 | <include name="${project::get-base-directory()}" /> |
24 | <include name="${project::get-base-directory()}/${build.dir}" /> | 24 | <include name="${project::get-base-directory()}/${build.dir}" /> |
25 | </lib> | 25 | </lib> |
26 | <include name="System.dll" /> | 26 | <include name="System.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/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> |