aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorlbsa712007-06-13 19:58:57 +0000
committerlbsa712007-06-13 19:58:57 +0000
commit69b3a8a9b84a0fb1918f728e27a92ab52128ae3c (patch)
tree4b34856cad308a93f23a8b593d1174b104c92b59 /Common
parent* Applying danx0r's ODE patch (diff)
downloadopensim-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 '')
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build40
-rw-r--r--Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build2
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.dll.build12
-rw-r--r--Common/XmlRpcCS/XMLRPC.dll.build22
4 files changed, 38 insertions, 38 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 7577fd1..4d95c7d 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -12,50 +12,50 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
15 <include name="Util.cs" />
16 <include name="Remoting.cs" />
17 <include name="UserProfileManagerBase.cs" />
18 <include name="LoginService.cs" />
19 <include name="UserProfileManager.cs" />
20 <include name="HeightMapGenHills.cs" />
21 <include name="BlockingQueue.cs" /> 15 <include name="BlockingQueue.cs" />
22 <include name="UserProfile.cs" /> 16 <include name="HeightMapGenHills.cs" />
23 <include name="SimProfileBase.cs" /> 17 <include name="LoginService.cs" />
18 <include name="Remoting.cs" />
24 <include name="SimProfile.cs" /> 19 <include name="SimProfile.cs" />
25 <include name="Interfaces/IGenericConfig.cs" /> 20 <include name="SimProfileBase.cs" />
26 <include name="Interfaces/LocalGridBase.cs" /> 21 <include name="UserProfile.cs" />
27 <include name="Interfaces/RemoteGridBase.cs" /> 22 <include name="UserProfileManager.cs" />
28 <include name="Interfaces/IUserConfig.cs" /> 23 <include name="UserProfileManagerBase.cs" />
29 <include name="Interfaces/IConfig.cs" /> 24 <include name="Util.cs" />
30 <include name="Interfaces/IUserServer.cs" />
31 <include name="Interfaces/IAssetServer.cs" /> 25 <include name="Interfaces/IAssetServer.cs" />
32 <include name="Interfaces/IClientAPI.cs" /> 26 <include name="Interfaces/IClientAPI.cs" />
33 <include name="Interfaces/IScriptEngine.cs" /> 27 <include name="Interfaces/IConfig.cs" />
28 <include name="Interfaces/IGenericConfig.cs" />
34 <include name="Interfaces/IGridConfig.cs" /> 29 <include name="Interfaces/IGridConfig.cs" />
35 <include name="Interfaces/IGridServer.cs" /> 30 <include name="Interfaces/IGridServer.cs" />
36 <include name="Interfaces/IScriptAPI.cs" />
37 <include name="Interfaces/ILocalStorage.cs" /> 31 <include name="Interfaces/ILocalStorage.cs" />
32 <include name="Interfaces/IScriptAPI.cs" />
33 <include name="Interfaces/IScriptEngine.cs" />
34 <include name="Interfaces/IUserConfig.cs" />
35 <include name="Interfaces/IUserServer.cs" />
36 <include name="Interfaces/LocalGridBase.cs" />
37 <include name="Interfaces/RemoteGridBase.cs" />
38 <include name="Properties/AssemblyInfo.cs" /> 38 <include name="Properties/AssemblyInfo.cs" />
39 <include name="Types/EstateSettings.cs" /> 39 <include name="Types/AgentCircuitData.cs" />
40 <include name="Types/AssetBase.cs" /> 40 <include name="Types/AssetBase.cs" />
41 <include name="Types/AssetLandmark.cs" /> 41 <include name="Types/AssetLandmark.cs" />
42 <include name="Types/AssetStorage.cs" /> 42 <include name="Types/AssetStorage.cs" />
43 <include name="Types/EstateSettings.cs" />
43 <include name="Types/Login.cs" /> 44 <include name="Types/Login.cs" />
44 <include name="Types/NeighbourInfo.cs" /> 45 <include name="Types/NeighbourInfo.cs" />
45 <include name="Types/OSVector3.cs" /> 46 <include name="Types/OSVector3.cs" />
46 <include name="Types/ParcelData.cs" /> 47 <include name="Types/ParcelData.cs" />
47 <include name="Types/PrimData.cs" /> 48 <include name="Types/PrimData.cs" />
48 <include name="Types/AgentCircuitData.cs" />
49 </sources> 49 </sources>
50 <references basedir="${project::get-base-directory()}"> 50 <references basedir="${project::get-base-directory()}">
51 <lib> 51 <lib>
52 <include name="${project::get-base-directory()}" /> 52 <include name="${project::get-base-directory()}" />
53 <include name="${project::get-base-directory()}/${build.dir}" /> 53 <include name="${project::get-base-directory()}/${build.dir}" />
54 </lib> 54 </lib>
55 <include name="../../bin/Db4objects.Db4o.dll" />
56 <include name="../../bin/libsecondlife.dll" />
55 <include name="System.dll" /> 57 <include name="System.dll" />
56 <include name="System.Xml.dll" /> 58 <include name="System.Xml.dll" />
57 <include name="../../bin/libsecondlife.dll" />
58 <include name="../../bin/Db4objects.Db4o.dll" />
59 <include name="../../bin/XMLRPC.dll" /> 59 <include name="../../bin/XMLRPC.dll" />
60 </references> 60 </references>
61 </csc> 61 </csc>
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
index 926e72c..075ea7f 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.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="../../../bin/OpenSim.Framework.dll" />
22 <include name="System.dll" /> 23 <include name="System.dll" />
23 <include name="System.Xml.dll" /> 24 <include name="System.Xml.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/" />
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index a2af584..25bcd65 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,26 +11,26 @@
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="LoginServer.cs" />
15 <include name="BaseHttpServer.cs" /> 14 <include name="BaseHttpServer.cs" />
16 <include name="BaseServer.cs" /> 15 <include name="BaseServer.cs" />
16 <include name="CheckSumServer.cs" />
17 <include name="IRestHandler.cs" /> 17 <include name="IRestHandler.cs" />
18 <include name="LocalUserProfileManager.cs" /> 18 <include name="LocalUserProfileManager.cs" />
19 <include name="XmlRpcMethod.cs" />
20 <include name="LoginResponse.cs" /> 19 <include name="LoginResponse.cs" />
21 <include name="CheckSumServer.cs" /> 20 <include name="LoginServer.cs" />
22 <include name="UDPServerBase.cs" /> 21 <include name="UDPServerBase.cs" />
22 <include name="XmlRpcMethod.cs" />
23 </sources> 23 </sources>
24 <references basedir="${project::get-base-directory()}"> 24 <references basedir="${project::get-base-directory()}">
25 <lib> 25 <lib>
26 <include name="${project::get-base-directory()}" /> 26 <include name="${project::get-base-directory()}" />
27 <include name="${project::get-base-directory()}/${build.dir}" /> 27 <include name="${project::get-base-directory()}/${build.dir}" />
28 </lib> 28 </lib>
29 <include name="System.dll" /> 29 <include name="../../bin/libsecondlife.dll" />
30 <include name="System.Xml.dll" />
31 <include name="../../bin/OpenSim.Framework.dll" /> 30 <include name="../../bin/OpenSim.Framework.dll" />
32 <include name="../../bin/OpenSim.Framework.Console.dll" /> 31 <include name="../../bin/OpenSim.Framework.Console.dll" />
33 <include name="../../bin/libsecondlife.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>
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index 8d5efd1..2eabfcd 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
11 <resources prefix="XMLRPC" dynamicprefix="true" > 11 <resources prefix="XMLRPC" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Logger.cs" />
15 <include name="SimpleHttpRequest.cs" />
14 <include name="XmlRpcBoxcarRequest.cs" /> 16 <include name="XmlRpcBoxcarRequest.cs" />
17 <include name="XmlRpcClientProxy.cs" />
18 <include name="XmlRpcDeserializer.cs" />
19 <include name="XmlRpcErrorCodes.cs" />
20 <include name="XmlRpcException.cs" />
21 <include name="XmlRpcExposedAttribute.cs" />
15 <include name="XmlRpcRequest.cs" /> 22 <include name="XmlRpcRequest.cs" />
16 <include name="XmlRpcResponseSerializer.cs" />
17 <include name="Logger.cs" />
18 <include name="XmlRpcRequestDeserializer.cs" /> 23 <include name="XmlRpcRequestDeserializer.cs" />
19 <include name="XmlRpcExposedAttribute.cs" /> 24 <include name="XmlRpcRequestSerializer.cs" />
25 <include name="XmlRpcResponder.cs" />
20 <include name="XmlRpcResponse.cs" /> 26 <include name="XmlRpcResponse.cs" />
21 <include name="XmlRpcException.cs" />
22 <include name="XmlRpcResponseDeserializer.cs" /> 27 <include name="XmlRpcResponseDeserializer.cs" />
23 <include name="XmlRpcResponder.cs" /> 28 <include name="XmlRpcResponseSerializer.cs" />
24 <include name="XmlRpcServer.cs" />
25 <include name="XmlRpcErrorCodes.cs" />
26 <include name="XmlRpcSerializer.cs" /> 29 <include name="XmlRpcSerializer.cs" />
30 <include name="XmlRpcServer.cs" />
27 <include name="XmlRpcSystemObject.cs" /> 31 <include name="XmlRpcSystemObject.cs" />
28 <include name="SimpleHttpRequest.cs" />
29 <include name="XmlRpcClientProxy.cs" />
30 <include name="XmlRpcRequestSerializer.cs" />
31 <include name="XmlRpcDeserializer.cs" />
32 <include name="XmlRpcXmlTokens.cs" /> 32 <include name="XmlRpcXmlTokens.cs" />
33 </sources> 33 </sources>
34 <references basedir="${project::get-base-directory()}"> 34 <references basedir="${project::get-base-directory()}">
generated by cgit v1.1 at 2024-12-16 19:29:56 +0000