diff options
author | lbsa71 | 2007-06-13 19:58:57 +0000 |
---|---|---|
committer | lbsa71 | 2007-06-13 19:58:57 +0000 |
commit | 69b3a8a9b84a0fb1918f728e27a92ab52128ae3c (patch) | |
tree | 4b34856cad308a93f23a8b593d1174b104c92b59 /OpenSim | |
parent | * Applying danx0r's ODE patch (diff) | |
download | opensim-SC-69b3a8a9b84a0fb1918f728e27a92ab52128ae3c.zip opensim-SC-69b3a8a9b84a0fb1918f728e27a92ab52128ae3c.tar.gz opensim-SC-69b3a8a9b84a0fb1918f728e27a92ab52128ae3c.tar.bz2 opensim-SC-69b3a8a9b84a0fb1918f728e27a92ab52128ae3c.tar.xz |
* First attempt at fixing differing build files on different .net flavours.
* And, as always, some bin ignores
Diffstat (limited to '')
13 files changed, 73 insertions, 73 deletions
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index fc2d94b..c3c4ae4 100644 --- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build | |||
@@ -20,12 +20,12 @@ | |||
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" /> | ||
24 | <include name="System.Xml.dll" /> | ||
25 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 23 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../../../bin/libsecondlife.dll" /> | 24 | <include name="../../../bin/libsecondlife.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.dll" /> | 25 | <include name="../../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
27 | <include name="System.dll" /> | ||
28 | <include name="System.Xml.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/" /> |
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index daf35c6..860251f 100644 --- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build | |||
@@ -20,11 +20,11 @@ | |||
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" /> | ||
24 | <include name="System.Xml.dll" /> | ||
25 | <include name="../../../bin/libsecondlife.dll" /> | 23 | <include name="../../../bin/libsecondlife.dll" /> |
26 | <include name="../../../bin/OpenSim.Framework.dll" /> | 24 | <include name="../../../bin/OpenSim.Framework.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
26 | <include name="System.dll" /> | ||
27 | <include name="System.Xml.dll" /> | ||
28 | <include name="../../../bin/XMLRPC.dll" /> | 28 | <include name="../../../bin/XMLRPC.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index 5845387..00ca3f9 100644 --- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build | |||
@@ -19,9 +19,9 @@ | |||
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" /> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | 22 | <include name="../../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> | 23 | <include name="../../../bin/OpenSim.Physics.Manager.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/Physics/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" /> |
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 726444a..fc3e1e6 100644 --- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build | |||
@@ -22,11 +22,11 @@ | |||
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" /> | ||
26 | <include name="System.Xml.dll" /> | ||
27 | <include name="../../../bin/Axiom.MathLib.dll" /> | 25 | <include name="../../../bin/Axiom.MathLib.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.dll" /> | 26 | <include name="../../../bin/OpenSim.Framework.dll" /> |
29 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="System.dll" /> | ||
29 | <include name="System.Xml.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/" /> |
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build index a49782f..c93c0c2 100644 --- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build +++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build | |||
@@ -19,10 +19,10 @@ | |||
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" /> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | 22 | <include name="../../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> | ||
25 | <include name="../../../bin/Ode.NET.dll" /> | 23 | <include name="../../../bin/Ode.NET.dll" /> |
24 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> | ||
25 | <include name="System.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/" /> |
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build index 2ea5534..be7a847 100644 --- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build +++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build | |||
@@ -19,10 +19,10 @@ | |||
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" /> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | 22 | <include name="../../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> | 23 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> |
24 | <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" /> | ||
25 | <include name="System.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/" /> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 5f33913..13341b3 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -11,66 +11,66 @@ | |||
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="OpenSimMain.cs" /> | 14 | <include name="AgentAssetUpload.cs" /> |
15 | <include name="UDPServer.cs" /> | 15 | <include name="AuthenticateSessionsBase.cs" /> |
16 | <include name="AuthenticateSessionsLocal.cs" /> | 16 | <include name="AuthenticateSessionsLocal.cs" /> |
17 | <include name="AuthenticateSessionsRemote.cs" /> | 17 | <include name="AuthenticateSessionsRemote.cs" /> |
18 | <include name="OpenSimNetworkHandler.cs" /> | ||
19 | <include name="Grid.cs" /> | 18 | <include name="Grid.cs" /> |
19 | <include name="OpenSimMain.cs" /> | ||
20 | <include name="OpenSimNetworkHandler.cs" /> | ||
20 | <include name="PacketServer.cs" /> | 21 | <include name="PacketServer.cs" /> |
21 | <include name="AuthenticateSessionsBase.cs" /> | ||
22 | <include name="VersionInfo.cs" /> | ||
23 | <include name="AgentAssetUpload.cs" /> | ||
24 | <include name="RegionInfoBase.cs" /> | ||
25 | <include name="RegionInfo.cs" /> | 22 | <include name="RegionInfo.cs" /> |
23 | <include name="RegionInfoBase.cs" /> | ||
26 | <include name="RegionServerBase.cs" /> | 24 | <include name="RegionServerBase.cs" /> |
25 | <include name="UDPServer.cs" /> | ||
26 | <include name="VersionInfo.cs" /> | ||
27 | <include name="Assets/AssetCache.cs" /> | ||
28 | <include name="Assets/InventoryCache.cs" /> | ||
29 | <include name="CAPS/AdminWebFront.cs" /> | ||
30 | <include name="Client/ClientView.cs" /> | ||
31 | <include name="Client/ClientView.Grid.cs" /> | ||
32 | <include name="Client/ClientView.PacketHandlers.cs" /> | ||
33 | <include name="Client/ClientView.ProcessPackets.cs" /> | ||
34 | <include name="Client/ClientViewBase.cs" /> | ||
35 | <include name="Estate/EstateManager.cs" /> | ||
36 | <include name="Scripting/IScriptContext.cs" /> | ||
37 | <include name="Scripting/IScriptEntity.cs" /> | ||
38 | <include name="Scripting/IScriptHandler.cs" /> | ||
39 | <include name="Scripting/Script.cs" /> | ||
40 | <include name="Scripting/ScriptFactory.cs" /> | ||
41 | <include name="Scripting/Scripts/FollowRandomAvatar.cs" /> | ||
27 | <include name="Simulator/Avatar.Client.cs" /> | 42 | <include name="Simulator/Avatar.Client.cs" /> |
28 | <include name="Simulator/Entity.cs" /> | 43 | <include name="Simulator/Avatar.cs" /> |
29 | <include name="Simulator/World.PacketHandlers.cs" /> | 44 | <include name="Simulator/Avatar.Update.cs" /> |
30 | <include name="Simulator/AvatarAnimations.cs" /> | 45 | <include name="Simulator/AvatarAnimations.cs" /> |
31 | <include name="Simulator/WorldBase.cs" /> | 46 | <include name="Simulator/Entity.cs" /> |
47 | <include name="Simulator/ParcelManager.cs" /> | ||
32 | <include name="Simulator/Primitive.cs" /> | 48 | <include name="Simulator/Primitive.cs" /> |
33 | <include name="Simulator/World.Scripting.cs" /> | ||
34 | <include name="Simulator/Primitive2.cs" /> | 49 | <include name="Simulator/Primitive2.cs" /> |
35 | <include name="Simulator/SceneObject.cs" /> | 50 | <include name="Simulator/SceneObject.cs" /> |
36 | <include name="Simulator/Avatar.cs" /> | ||
37 | <include name="Simulator/Avatar.Update.cs" /> | ||
38 | <include name="Simulator/World.cs" /> | 51 | <include name="Simulator/World.cs" /> |
39 | <include name="Simulator/ParcelManager.cs" /> | 52 | <include name="Simulator/World.PacketHandlers.cs" /> |
40 | <include name="Estate/EstateManager.cs" /> | 53 | <include name="Simulator/World.Scripting.cs" /> |
41 | <include name="CAPS/AdminWebFront.cs" /> | 54 | <include name="Simulator/WorldBase.cs" /> |
42 | <include name="Assets/InventoryCache.cs" /> | ||
43 | <include name="Assets/AssetCache.cs" /> | ||
44 | <include name="Scripting/IScriptHandler.cs" /> | ||
45 | <include name="Scripting/ScriptFactory.cs" /> | ||
46 | <include name="Scripting/IScriptContext.cs" /> | ||
47 | <include name="Scripting/Script.cs" /> | ||
48 | <include name="Scripting/IScriptEntity.cs" /> | ||
49 | <include name="Scripting/Scripts/FollowRandomAvatar.cs" /> | ||
50 | <include name="Types/Mesh.cs" /> | 55 | <include name="Types/Mesh.cs" /> |
51 | <include name="Types/Triangle.cs" /> | 56 | <include name="Types/Triangle.cs" /> |
52 | <include name="Client/ClientView.Grid.cs" /> | ||
53 | <include name="Client/ClientView.PacketHandlers.cs" /> | ||
54 | <include name="Client/ClientViewBase.cs" /> | ||
55 | <include name="Client/ClientView.ProcessPackets.cs" /> | ||
56 | <include name="Client/ClientView.cs" /> | ||
57 | </sources> | 57 | </sources> |
58 | <references basedir="${project::get-base-directory()}"> | 58 | <references basedir="${project::get-base-directory()}"> |
59 | <lib> | 59 | <lib> |
60 | <include name="${project::get-base-directory()}" /> | 60 | <include name="${project::get-base-directory()}" /> |
61 | <include name="${project::get-base-directory()}/${build.dir}" /> | 61 | <include name="${project::get-base-directory()}/${build.dir}" /> |
62 | </lib> | 62 | </lib> |
63 | <include name="System.dll" /> | ||
64 | <include name="System.Xml.dll" /> | ||
65 | <include name="../../bin/libsecondlife.dll" /> | ||
66 | <include name="../../bin/Axiom.MathLib.dll" /> | 63 | <include name="../../bin/Axiom.MathLib.dll" /> |
67 | <include name="../../bin/Db4objects.Db4o.dll" /> | 64 | <include name="../../bin/Db4objects.Db4o.dll" /> |
68 | <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" /> | 65 | <include name="../../bin/libsecondlife.dll" /> |
69 | <include name="../../bin/OpenSim.Framework.dll" /> | 66 | <include name="../../bin/OpenSim.Framework.dll" /> |
70 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 67 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
71 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> | 68 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> |
72 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> | 69 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
73 | <include name="../../bin/OpenSim.Servers.dll" /> | 70 | <include name="../../bin/OpenSim.Servers.dll" /> |
71 | <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" /> | ||
72 | <include name="System.dll" /> | ||
73 | <include name="System.Xml.dll" /> | ||
74 | <include name="../../bin/XMLRPC.dll" /> | 74 | <include name="../../bin/XMLRPC.dll" /> |
75 | </references> | 75 | </references> |
76 | </csc> | 76 | </csc> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index ac4d564..cce2fef 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build | |||
@@ -11,26 +11,26 @@ | |||
11 | <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MainMemory.cs" /> | 14 | <include name="ClassInstance.cs" /> |
15 | <include name="ClassRecord.cs" /> | ||
15 | <include name="Heap.cs" /> | 16 | <include name="Heap.cs" /> |
16 | <include name="StackFrame.cs" /> | 17 | <include name="Interpreter.cs" /> |
17 | <include name="InterpreterLogic.cs" /> | 18 | <include name="InterpreterLogic.cs" /> |
18 | <include name="OpenSimJVM.cs" /> | ||
19 | <include name="InterpreterMethods.cs" /> | 19 | <include name="InterpreterMethods.cs" /> |
20 | <include name="ClassInstance.cs" /> | ||
21 | <include name="InterpreterReturn.cs" /> | 20 | <include name="InterpreterReturn.cs" /> |
22 | <include name="Interpreter.cs" /> | 21 | <include name="MainMemory.cs" /> |
23 | <include name="ClassRecord.cs" /> | 22 | <include name="MethodMemory.cs" /> |
24 | <include name="Stack.cs" /> | ||
25 | <include name="Object.cs" /> | 23 | <include name="Object.cs" /> |
24 | <include name="OpenSimJVM.cs" /> | ||
25 | <include name="Stack.cs" /> | ||
26 | <include name="StackFrame.cs" /> | ||
26 | <include name="Thread.cs" /> | 27 | <include name="Thread.cs" /> |
27 | <include name="MethodMemory.cs" /> | ||
28 | <include name="Properties/AssemblyInfo.cs" /> | 28 | <include name="Properties/AssemblyInfo.cs" /> |
29 | <include name="Types/BaseType.cs" /> | ||
30 | <include name="Types/ArrayReference.cs" /> | 29 | <include name="Types/ArrayReference.cs" /> |
30 | <include name="Types/BaseType.cs" /> | ||
31 | <include name="Types/ObjectReference.cs" /> | 31 | <include name="Types/ObjectReference.cs" /> |
32 | <include name="Types/PrimitiveTypes/Char.cs" /> | ||
33 | <include name="Types/PrimitiveTypes/Byte.cs" /> | 32 | <include name="Types/PrimitiveTypes/Byte.cs" /> |
33 | <include name="Types/PrimitiveTypes/Char.cs" /> | ||
34 | <include name="Types/PrimitiveTypes/Float.cs" /> | 34 | <include name="Types/PrimitiveTypes/Float.cs" /> |
35 | <include name="Types/PrimitiveTypes/Int.cs" /> | 35 | <include name="Types/PrimitiveTypes/Int.cs" /> |
36 | </sources> | 36 | </sources> |
@@ -39,9 +39,9 @@ | |||
39 | <include name="${project::get-base-directory()}" /> | 39 | <include name="${project::get-base-directory()}" /> |
40 | <include name="${project::get-base-directory()}/${build.dir}" /> | 40 | <include name="${project::get-base-directory()}/${build.dir}" /> |
41 | </lib> | 41 | </lib> |
42 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
42 | <include name="System.dll" /> | 43 | <include name="System.dll" /> |
43 | <include name="System.Xml.dll" /> | 44 | <include name="System.Xml.dll" /> |
44 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
45 | </references> | 45 | </references> |
46 | </csc> | 46 | </csc> |
47 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/ScriptEngines/" /> | 47 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/ScriptEngines/" /> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build index 1c7306a..bc2d8ec 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build | |||
@@ -18,14 +18,14 @@ | |||
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" /> | ||
22 | <include name="System.Xml.dll" /> | ||
23 | <include name="System.Data.dll" /> | ||
24 | <include name="../../../bin/Kds.Serialization.dll" /> | 21 | <include name="../../../bin/Kds.Serialization.dll" /> |
25 | <include name="../../../bin/libdb_dotNET43.dll" /> | 22 | <include name="../../../bin/libdb_dotNET43.dll" /> |
26 | <include name="../../../bin/libsecondlife.dll" /> | 23 | <include name="../../../bin/libsecondlife.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.dll" /> | 24 | <include name="../../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
26 | <include name="System.dll" /> | ||
27 | <include name="System.Data.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | 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/" /> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 72aac2a..739b98c 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -12,22 +12,22 @@ | |||
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="MapStorage.cs" /> | 16 | <include name="MapStorage.cs" /> |
16 | <include name="UUIDParcelQuery.cs" /> | 17 | <include name="UUIDParcelQuery.cs" /> |
17 | <include name="UUIDPrimQuery.cs" /> | 18 | <include name="UUIDPrimQuery.cs" /> |
18 | <include name="Db4LocalStorage.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" /> | ||
26 | <include name="System.Xml.dll" /> | ||
27 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
28 | <include name="../../../bin/libsecondlife.dll" /> | 26 | <include name="../../../bin/libsecondlife.dll" /> |
29 | <include name="../../../bin/OpenSim.Framework.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.dll" /> |
30 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
29 | <include name="System.dll" /> | ||
30 | <include name="System.Xml.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/" /> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build index 4c8917a..bd4c731 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build | |||
@@ -19,13 +19,13 @@ | |||
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" /> | ||
23 | <include name="System.Xml.dll" /> | ||
24 | <include name="System.Data.dll" /> | ||
25 | <include name="../../../bin/System.Data.SQLite.dll" /> | ||
26 | <include name="../../../bin/libsecondlife.dll" /> | 22 | <include name="../../../bin/libsecondlife.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.dll" /> | 23 | <include name="../../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 24 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
25 | <include name="System.dll" /> | ||
26 | <include name="System.Data.dll" /> | ||
27 | <include name="../../../bin/System.Data.SQLite.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | 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/" /> |
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build index 9c80ac7..6526648 100644 --- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build +++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build | |||
@@ -19,11 +19,11 @@ | |||
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="../../bin/libTerrain-BSD.dll" /> | ||
22 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
23 | <include name="System.Drawing.dll" /> | ||
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Drawing.dll" /> | ||
25 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
26 | <include name="../../bin/libTerrain-BSD.dll" /> | ||
27 | </references> | 27 | </references> |
28 | </csc> | 28 | </csc> |
29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build index 4f8ca8a..784c9ca 100644 --- a/OpenSim/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim/OpenSim.exe.build | |||
@@ -19,18 +19,18 @@ | |||
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" /> | ||
23 | <include name="System.Xml.dll" /> | ||
24 | <include name="../../bin/libsecondlife.dll" /> | ||
25 | <include name="../../bin/Axiom.MathLib.dll" /> | 22 | <include name="../../bin/Axiom.MathLib.dll" /> |
26 | <include name="../../bin/Db4objects.Db4o.dll" /> | 23 | <include name="../../bin/Db4objects.Db4o.dll" /> |
27 | <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" /> | 24 | <include name="../../bin/libsecondlife.dll" /> |
28 | <include name="../../bin/OpenSim.Framework.dll" /> | 25 | <include name="../../bin/OpenSim.Framework.dll" /> |
29 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 26 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
27 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> | ||
30 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> | 28 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
31 | <include name="../../bin/OpenSim.Servers.dll" /> | ||
32 | <include name="../../bin/OpenSim.RegionServer.dll" /> | 29 | <include name="../../bin/OpenSim.RegionServer.dll" /> |
33 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> | 30 | <include name="../../bin/OpenSim.Servers.dll" /> |
31 | <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" /> | ||
32 | <include name="System.dll" /> | ||
33 | <include name="System.Xml.dll" /> | ||
34 | <include name="../../bin/XMLRPC.dll" /> | 34 | <include name="../../bin/XMLRPC.dll" /> |
35 | </references> | 35 | </references> |
36 | </csc> | 36 | </csc> |