From 69b3a8a9b84a0fb1918f728e27a92ab52128ae3c Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Wed, 13 Jun 2007 19:58:57 +0000
Subject: * First attempt at fixing differing build files on different .net
 flavours. * And, as always, some bin ignores

---
 .../OpenSim.Framework/OpenSim.Framework.dll.build  | 40 +++++++++++-----------
 .../Xml/OpenSim.GenericConfig.Xml.dll.build        |  2 +-
 Common/OpenSim.Servers/OpenSim.Servers.dll.build   | 12 +++----
 Common/XmlRpcCS/XMLRPC.dll.build                   | 22 ++++++------
 4 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'Common')

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 @@
             </resources>
             <sources failonempty="true">
                 <include name="AgentInventory.cs" />
-                <include name="Util.cs" />
-                <include name="Remoting.cs" />
-                <include name="UserProfileManagerBase.cs" />
-                <include name="LoginService.cs" />
-                <include name="UserProfileManager.cs" />
-                <include name="HeightMapGenHills.cs" />
                 <include name="BlockingQueue.cs" />
-                <include name="UserProfile.cs" />
-                <include name="SimProfileBase.cs" />
+                <include name="HeightMapGenHills.cs" />
+                <include name="LoginService.cs" />
+                <include name="Remoting.cs" />
                 <include name="SimProfile.cs" />
-                <include name="Interfaces/IGenericConfig.cs" />
-                <include name="Interfaces/LocalGridBase.cs" />
-                <include name="Interfaces/RemoteGridBase.cs" />
-                <include name="Interfaces/IUserConfig.cs" />
-                <include name="Interfaces/IConfig.cs" />
-                <include name="Interfaces/IUserServer.cs" />
+                <include name="SimProfileBase.cs" />
+                <include name="UserProfile.cs" />
+                <include name="UserProfileManager.cs" />
+                <include name="UserProfileManagerBase.cs" />
+                <include name="Util.cs" />
                 <include name="Interfaces/IAssetServer.cs" />
                 <include name="Interfaces/IClientAPI.cs" />
-                <include name="Interfaces/IScriptEngine.cs" />
+                <include name="Interfaces/IConfig.cs" />
+                <include name="Interfaces/IGenericConfig.cs" />
                 <include name="Interfaces/IGridConfig.cs" />
                 <include name="Interfaces/IGridServer.cs" />
-                <include name="Interfaces/IScriptAPI.cs" />
                 <include name="Interfaces/ILocalStorage.cs" />
+                <include name="Interfaces/IScriptAPI.cs" />
+                <include name="Interfaces/IScriptEngine.cs" />
+                <include name="Interfaces/IUserConfig.cs" />
+                <include name="Interfaces/IUserServer.cs" />
+                <include name="Interfaces/LocalGridBase.cs" />
+                <include name="Interfaces/RemoteGridBase.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/EstateSettings.cs" />
+                <include name="Types/AgentCircuitData.cs" />
                 <include name="Types/AssetBase.cs" />
                 <include name="Types/AssetLandmark.cs" />
                 <include name="Types/AssetStorage.cs" />
+                <include name="Types/EstateSettings.cs" />
                 <include name="Types/Login.cs" />
                 <include name="Types/NeighbourInfo.cs" />
                 <include name="Types/OSVector3.cs" />
                 <include name="Types/ParcelData.cs" />
                 <include name="Types/PrimData.cs" />
-                <include name="Types/AgentCircuitData.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
                     <include name="${project::get-base-directory()}" />
                     <include name="${project::get-base-directory()}/${build.dir}" />
                 </lib>
+                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../bin/libsecondlife.dll" />
                 <include name="System.dll" />
                 <include name="System.Xml.dll" />
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
                 <include name="../../bin/XMLRPC.dll" />
             </references>
         </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 @@
                     <include name="${project::get-base-directory()}" />
                     <include name="${project::get-base-directory()}/${build.dir}" />
                 </lib>
+                <include name="../../../bin/OpenSim.Framework.dll" />
                 <include name="System.dll" />
                 <include name="System.Xml.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
             </references>
         </csc>
         <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 @@
             <resources prefix="OpenSim.Servers" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="LoginServer.cs" />
                 <include name="BaseHttpServer.cs" />
                 <include name="BaseServer.cs" />
+                <include name="CheckSumServer.cs" />
                 <include name="IRestHandler.cs" />
                 <include name="LocalUserProfileManager.cs" />
-                <include name="XmlRpcMethod.cs" />
                 <include name="LoginResponse.cs" />
-                <include name="CheckSumServer.cs" />
+                <include name="LoginServer.cs" />
                 <include name="UDPServerBase.cs" />
+                <include name="XmlRpcMethod.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
                     <include name="${project::get-base-directory()}" />
                     <include name="${project::get-base-directory()}/${build.dir}" />
                 </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="../../bin/libsecondlife.dll" />
                 <include name="../../bin/OpenSim.Framework.dll" />
                 <include name="../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
                 <include name="../../bin/XMLRPC.dll" />
             </references>
         </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 @@
             <resources prefix="XMLRPC" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="Logger.cs" />
+                <include name="SimpleHttpRequest.cs" />
                 <include name="XmlRpcBoxcarRequest.cs" />
+                <include name="XmlRpcClientProxy.cs" />
+                <include name="XmlRpcDeserializer.cs" />
+                <include name="XmlRpcErrorCodes.cs" />
+                <include name="XmlRpcException.cs" />
+                <include name="XmlRpcExposedAttribute.cs" />
                 <include name="XmlRpcRequest.cs" />
-                <include name="XmlRpcResponseSerializer.cs" />
-                <include name="Logger.cs" />
                 <include name="XmlRpcRequestDeserializer.cs" />
-                <include name="XmlRpcExposedAttribute.cs" />
+                <include name="XmlRpcRequestSerializer.cs" />
+                <include name="XmlRpcResponder.cs" />
                 <include name="XmlRpcResponse.cs" />
-                <include name="XmlRpcException.cs" />
                 <include name="XmlRpcResponseDeserializer.cs" />
-                <include name="XmlRpcResponder.cs" />
-                <include name="XmlRpcServer.cs" />
-                <include name="XmlRpcErrorCodes.cs" />
+                <include name="XmlRpcResponseSerializer.cs" />
                 <include name="XmlRpcSerializer.cs" />
+                <include name="XmlRpcServer.cs" />
                 <include name="XmlRpcSystemObject.cs" />
-                <include name="SimpleHttpRequest.cs" />
-                <include name="XmlRpcClientProxy.cs" />
-                <include name="XmlRpcRequestSerializer.cs" />
-                <include name="XmlRpcDeserializer.cs" />
                 <include name="XmlRpcXmlTokens.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
-- 
cgit v1.1