aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-25 20:24:21 +0100
committerJustin Clark-Casey (justincc)2011-10-25 20:24:21 +0100
commit8a0a78cbccce796addacab7ed1609279b802a9b3 (patch)
tree31ddb6da7bca6eeb61cb7747532dcf77828cfbe3 /prebuild.xml
parentDrop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() (diff)
downloadopensim-SC-8a0a78cbccce796addacab7ed1609279b802a9b3.zip
opensim-SC-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.gz
opensim-SC-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.bz2
opensim-SC-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.xz
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
Diffstat (limited to '')
-rw-r--r--prebuild.xml126
1 files changed, 65 insertions, 61 deletions
diff --git a/prebuild.xml b/prebuild.xml
index a1d56bc..b9201f7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -55,122 +55,124 @@
55 </Project> 55 </Project>
56--> 56-->
57 57
58 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library"> 58 <Project frameworkVersion="v3_5" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library">
59 <Configuration name="Debug"> 59 <Configuration name="Debug">
60 <Options> 60 <Options>
61 <OutputPath>../../../../bin/</OutputPath> 61 <OutputPath>../../bin/</OutputPath>
62 </Options> 62 </Options>
63 </Configuration> 63 </Configuration>
64 <Configuration name="Release"> 64 <Configuration name="Release">
65 <Options> 65 <Options>
66 <OutputPath>../../../../bin/</OutputPath> 66 <OutputPath>../../bin/</OutputPath>
67 </Options> 67 </Options>
68 </Configuration> 68 </Configuration>
69 69
70 <ReferencePath>../../../../bin/</ReferencePath> 70 <ReferencePath>../../bin/</ReferencePath>
71 <Reference name="System"/> 71 <Reference name="System"/>
72 <Reference name="System.Xml"/> 72 <Reference name="System.Xml"/>
73 <Reference name="System.Data"/>
73 <Reference name="System.Web"/> 74 <Reference name="System.Web"/>
74 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
75 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
76 <Reference name="XMLRPC" path="../../../../bin/"/>
77 <Reference name="log4net" path="../../../../bin/"/>
78 <Reference name="HttpServer_OpenSim" path="../../../../bin/"/>
79
80 <Files> 75 <Files>
81 <Match pattern="*.cs" recurse="true"> 76 <Match pattern="*.cs" recurse="false"/>
82 <Exclude pattern="Tests"/>
83
84 <!-- on temporary suspension -->
85 <Exclude pattern="OSHttpHandler\.cs"/>
86 <Exclude pattern="OSHttpHttpHandler\.cs"/>
87 <Exclude pattern="OSHttpRequestPump\.cs"/>
88 <Exclude pattern="OSHttpRequestQueue\.cs"/>
89 <Exclude pattern="OSHttpServer.*\.cs"/>
90 <Exclude pattern="OSHttpXmlRpcHandler.*\.cs"/>
91 </Match>
92 </Files> 77 </Files>
93 </Project> 78 </Project>
94 79
95 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library"> 80 <Project frameworkVersion="v3_5" name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
96 <Configuration name="Debug"> 81 <Configuration name="Debug">
97 <Options> 82 <Options>
98 <OutputPath>../../../bin/</OutputPath> 83 <OutputPath>../../bin/</OutputPath>
99 </Options> 84 </Options>
100 </Configuration> 85 </Configuration>
101 <Configuration name="Release"> 86 <Configuration name="Release">
102 <Options> 87 <Options>
103 <OutputPath>../../../bin/</OutputPath> 88 <OutputPath>../../bin/</OutputPath>
104 </Options> 89 </Options>
105 </Configuration> 90 </Configuration>
106 91
107 <ReferencePath>../../../bin/</ReferencePath> 92 <ReferencePath>../../bin/</ReferencePath>
108 <Reference name="System"/> 93 <Reference name="System"/>
94 <Reference name="System.Core"/>
109 <Reference name="System.Xml"/> 95 <Reference name="System.Xml"/>
96 <Reference name="System.Data"/>
97 <Reference name="System.Drawing"/>
110 <Reference name="System.Web"/> 98 <Reference name="System.Web"/>
111 <Reference name="log4net" path="../../../bin/"/> 99 <Reference name="OpenMetaverseTypes" path="../../bin/"/>
112 <Reference name="Nini" path="../../../bin/"/> 100 <Reference name="OpenMetaverse" path="../../bin/"/>
113 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 101 <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/>
114 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 102 <Reference name="XMLRPC" path="../../bin/"/>
103 <!-- <Reference name="OpenSim.Framework.Console"/> -->
104 <!-- <Reference name="OpenSim.Framework.Servers.HttpServer"/> -->
105 <Reference name="Nini" path="../../bin/"/>
106 <Reference name="log4net" path="../../bin/"/>
107 <Reference name="Mono.Addins" path="../../bin/"/>
108 <Reference name="SmartThreadPool"/>
115 <Files> 109 <Files>
116 <Match pattern="*.cs" recurse="true"/> 110 <Match pattern="*.cs" recurse="false"/>
111 <Match path="Client" pattern="*.cs" recurse="true"/>
117 </Files> 112 </Files>
118 </Project> 113 </Project>
119 114
120 <Project frameworkVersion="v3_5" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library"> 115 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
121 <Configuration name="Debug"> 116 <Configuration name="Debug">
122 <Options> 117 <Options>
123 <OutputPath>../../bin/</OutputPath> 118 <OutputPath>../../../../bin/</OutputPath>
124 </Options> 119 </Options>
125 </Configuration> 120 </Configuration>
126 <Configuration name="Release"> 121 <Configuration name="Release">
127 <Options> 122 <Options>
128 <OutputPath>../../bin/</OutputPath> 123 <OutputPath>../../../../bin/</OutputPath>
129 </Options> 124 </Options>
130 </Configuration> 125 </Configuration>
131 126
132 <ReferencePath>../../bin/</ReferencePath> 127 <ReferencePath>../../../../bin/</ReferencePath>
133 <Reference name="System"/> 128 <Reference name="System"/>
134 <Reference name="System.Xml"/> 129 <Reference name="System.Xml"/>
135 <Reference name="System.Data"/>
136 <Reference name="System.Web"/> 130 <Reference name="System.Web"/>
131 <Reference name="OpenSim.Framework"/>
132 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
133 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
134 <Reference name="XMLRPC" path="../../../../bin/"/>
135 <Reference name="log4net" path="../../../../bin/"/>
136 <Reference name="HttpServer_OpenSim" path="../../../../bin/"/>
137
137 <Files> 138 <Files>
138 <Match pattern="*.cs" recurse="false"/> 139 <Match pattern="*.cs" recurse="true">
140 <Exclude pattern="Tests"/>
141
142 <!-- on temporary suspension -->
143 <Exclude pattern="OSHttpHandler\.cs"/>
144 <Exclude pattern="OSHttpHttpHandler\.cs"/>
145 <Exclude pattern="OSHttpRequestPump\.cs"/>
146 <Exclude pattern="OSHttpRequestQueue\.cs"/>
147 <Exclude pattern="OSHttpServer.*\.cs"/>
148 <Exclude pattern="OSHttpXmlRpcHandler.*\.cs"/>
149 </Match>
139 </Files> 150 </Files>
140 </Project> 151 </Project>
141 152
142 <Project frameworkVersion="v3_5" name="OpenSim.Framework" path="OpenSim/Framework" type="Library"> 153 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
143 <Configuration name="Debug"> 154 <Configuration name="Debug">
144 <Options> 155 <Options>
145 <OutputPath>../../bin/</OutputPath> 156 <OutputPath>../../../bin/</OutputPath>
146 </Options> 157 </Options>
147 </Configuration> 158 </Configuration>
148 <Configuration name="Release"> 159 <Configuration name="Release">
149 <Options> 160 <Options>
150 <OutputPath>../../bin/</OutputPath> 161 <OutputPath>../../../bin/</OutputPath>
151 </Options> 162 </Options>
152 </Configuration> 163 </Configuration>
153 164
154 <ReferencePath>../../bin/</ReferencePath> 165 <ReferencePath>../../../bin/</ReferencePath>
155 <Reference name="System"/> 166 <Reference name="System"/>
156 <Reference name="System.Core"/>
157 <Reference name="System.Xml"/> 167 <Reference name="System.Xml"/>
158 <Reference name="System.Data"/>
159 <Reference name="System.Drawing"/>
160 <Reference name="System.Web"/> 168 <Reference name="System.Web"/>
161 <Reference name="OpenMetaverseTypes" path="../../bin/"/> 169 <Reference name="log4net" path="../../../bin/"/>
162 <Reference name="OpenMetaverse" path="../../bin/"/> 170 <Reference name="Nini" path="../../../bin/"/>
163 <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/> 171 <Reference name="OpenSim.Framework"/>
164 <Reference name="XMLRPC" path="../../bin/"/>
165 <Reference name="OpenSim.Framework.Console"/>
166 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 172 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
167 <Reference name="Nini" path="../../bin/"/> 173 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
168 <Reference name="log4net" path="../../bin/"/>
169 <Reference name="Mono.Addins" path="../../bin/"/>
170 <Reference name="SmartThreadPool"/>
171 <Files> 174 <Files>
172 <Match pattern="*.cs" recurse="false"/> 175 <Match pattern="*.cs" recurse="true"/>
173 <Match path="Client" pattern="*.cs" recurse="true"/>
174 </Files> 176 </Files>
175 </Project> 177 </Project>
176 178
@@ -810,6 +812,7 @@
810 <Reference name="OpenMetaverse" path="../../../bin/"/> 812 <Reference name="OpenMetaverse" path="../../../bin/"/>
811 <Reference name="OpenSim.Framework"/> 813 <Reference name="OpenSim.Framework"/>
812 <Reference name="OpenSim.Framework.Console"/> 814 <Reference name="OpenSim.Framework.Console"/>
815 <Reference name="OpenSim.Framework.Servers"/>
813 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 816 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
814 <Reference name="Nini" path="../../../bin/"/> 817 <Reference name="Nini" path="../../../bin/"/>
815 <Reference name="log4net" path="../../../bin/"/> 818 <Reference name="log4net" path="../../../bin/"/>
@@ -1474,21 +1477,21 @@
1474 <Reference name="CSJ2K" path="../../../bin/"/> 1477 <Reference name="CSJ2K" path="../../../bin/"/>
1475 <Reference name="Warp3D" path="../../../bin/" localCopy="true"/> 1478 <Reference name="Warp3D" path="../../../bin/" localCopy="true"/>
1476 <Reference name="OpenSim.Capabilities"/> 1479 <Reference name="OpenSim.Capabilities"/>
1480 <Reference name="OpenSim.Data"/>
1477 <Reference name="OpenSim.Framework"/> 1481 <Reference name="OpenSim.Framework"/>
1478 <Reference name="OpenSim.Framework.Communications"/> 1482 <Reference name="OpenSim.Framework.Communications"/>
1479 <Reference name="OpenSim.Data"/> 1483 <Reference name="OpenSim.Framework.Console"/>
1484 <Reference name="OpenSim.Framework.Serialization"/>
1485 <Reference name="OpenSim.Framework.Servers"/>
1486 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1487 <Reference name="OpenSim.Framework.Statistics"/>
1480 <Reference name="OpenSim.Region.Framework"/> 1488 <Reference name="OpenSim.Region.Framework"/>
1489 <Reference name="OpenSim.Region.Physics.Manager"/>
1481 <Reference name="OpenSim.Server.Base"/> 1490 <Reference name="OpenSim.Server.Base"/>
1482 <Reference name="OpenSim.Server.Handlers"/> 1491 <Reference name="OpenSim.Server.Handlers"/>
1483 <Reference name="OpenSim.Services.Connectors"/> 1492 <Reference name="OpenSim.Services.Connectors"/>
1484 <Reference name="OpenSim.Services.Base"/> 1493 <Reference name="OpenSim.Services.Base"/>
1485 <Reference name="OpenSim.Services.Interfaces"/> 1494 <Reference name="OpenSim.Services.Interfaces"/>
1486 <Reference name="OpenSim.Framework.Serialization"/>
1487 <Reference name="OpenSim.Framework.Console"/>
1488 <Reference name="OpenSim.Framework.Servers"/>
1489 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1490 <Reference name="OpenSim.Framework.Statistics"/>
1491 <Reference name="OpenSim.Region.Physics.Manager"/>
1492 1495
1493 <Reference name="GlynnTucker.Cache" path="../../../bin/"/> 1496 <Reference name="GlynnTucker.Cache" path="../../../bin/"/>
1494 1497
@@ -3090,6 +3093,7 @@
3090 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> 3093 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
3091 <Reference name="OpenSim.Framework"/> 3094 <Reference name="OpenSim.Framework"/>
3092 <Reference name="OpenSim.Framework.Communications"/> 3095 <Reference name="OpenSim.Framework.Communications"/>
3096 <Reference name="OpenSim.Framework.Servers"/>
3093 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3097 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3094 <Reference name="OpenSim.Framework.Statistics"/> 3098 <Reference name="OpenSim.Framework.Statistics"/>
3095 <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> 3099 <Reference name="OpenSim.Region.ClientStack.LindenCaps"/>
generated by cgit v1.1 at 2024-12-13 21:13:17 +0000