diff options
author | Tedd Hansen | 2008-01-05 15:48:02 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-05 15:48:02 +0000 |
commit | 966f639ad6c83828d8e60ef9103ad61c360f9c3b (patch) | |
tree | 020ff9c0666d8e8980c920afd77e34660fc121f3 /prebuild.xml | |
parent | Added errorhandler+tip that grid server might not be running on grid registra... (diff) | |
download | opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.zip opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.gz opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.bz2 opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.xz |
Changes to ScriptServer to (hopefully) make it compile on both .Net and Mono.
Some debug info for startup added to find bugs. ++
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/prebuild.xml b/prebuild.xml index b65466c..ad726bd 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1140,6 +1140,8 @@ | |||
1140 | <Reference name="System" localCopy="false"/> | 1140 | <Reference name="System" localCopy="false"/> |
1141 | <Reference name="System.Data" localCopy="false"/> | 1141 | <Reference name="System.Data" localCopy="false"/> |
1142 | <Reference name="System.Xml" localCopy="false"/> | 1142 | <Reference name="System.Xml" localCopy="false"/> |
1143 | <Reference name="libsecondlife.dll"/> | ||
1144 | <Reference name="OpenSim.Framework"/> | ||
1143 | <Files> | 1145 | <Files> |
1144 | <Match pattern="*.cs" recurse="true"/> | 1146 | <Match pattern="*.cs" recurse="true"/> |
1145 | </Files> | 1147 | </Files> |
@@ -1195,7 +1197,7 @@ | |||
1195 | </Configuration> | 1197 | </Configuration> |
1196 | 1198 | ||
1197 | <ReferencePath>../../../bin/</ReferencePath> | 1199 | <ReferencePath>../../../bin/</ReferencePath> |
1198 | <ReferencePath>../../../bin/ScriptEngines/</ReferencePath> | 1200 | <ReferencePath>../../../bin/ScriptEngines/</ReferencePath> |
1199 | <Reference name="System" localCopy="false"/> | 1201 | <Reference name="System" localCopy="false"/> |
1200 | <Reference name="System.Data" localCopy="false"/> | 1202 | <Reference name="System.Data" localCopy="false"/> |
1201 | <Reference name="System.Runtime.Remoting" localCopy="false"/> | 1203 | <Reference name="System.Runtime.Remoting" localCopy="false"/> |
@@ -1206,13 +1208,6 @@ | |||
1206 | <Reference name="OpenSim.Framework.Servers"/> | 1208 | <Reference name="OpenSim.Framework.Servers"/> |
1207 | <Reference name="OpenSim.Framework.Data"/> | 1209 | <Reference name="OpenSim.Framework.Data"/> |
1208 | <Reference name="OpenSim.Region.Environment"/> | 1210 | <Reference name="OpenSim.Region.Environment"/> |
1209 | |||
1210 | <!-- Explicit path since without it, the generated .build file does not correctly reference | ||
1211 | the DotNetEngine assembly in bin/ScriptEngines (instead looking in simply bin/) | ||
1212 | despite the bin/ScriptEngines reference path. Hardcoding is not a permanent solution and | ||
1213 | may cause some warnings in Visual Studio --> | ||
1214 | <Reference name="../../../bin/ScriptEngines/OpenSim.Region.ScriptEngine.DotNetEngine"/> | ||
1215 | |||
1216 | <Reference name="OpenSim.Region.ScriptEngine.Common"/> | 1211 | <Reference name="OpenSim.Region.ScriptEngine.Common"/> |
1217 | <Reference name="libsecondlife.dll"/> | 1212 | <Reference name="libsecondlife.dll"/> |
1218 | <Reference name="Axiom.MathLib.dll" localCopy="false"/> | 1213 | <Reference name="Axiom.MathLib.dll" localCopy="false"/> |
@@ -1223,6 +1218,7 @@ | |||
1223 | </Files> | 1218 | </Files> |
1224 | </Project> | 1219 | </Project> |
1225 | 1220 | ||
1221 | |||
1226 | <Project name="OpenSim.Region.ScriptEngine.RemoteServer" path="OpenSim/Region/ScriptEngine/RemoteServer" type="Library"> | 1222 | <Project name="OpenSim.Region.ScriptEngine.RemoteServer" path="OpenSim/Region/ScriptEngine/RemoteServer" type="Library"> |
1227 | <Configuration name="Debug"> | 1223 | <Configuration name="Debug"> |
1228 | <Options> | 1224 | <Options> |
@@ -1243,21 +1239,13 @@ | |||
1243 | <Reference name="System.Runtime.Remoting" localCopy="false"/> | 1239 | <Reference name="System.Runtime.Remoting" localCopy="false"/> |
1244 | <Reference name="OpenSim.Region.Environment" /> | 1240 | <Reference name="OpenSim.Region.Environment" /> |
1245 | <Reference name="libsecondlife.dll"/> | 1241 | <Reference name="libsecondlife.dll"/> |
1246 | <Reference name="RAIL.dll"/> | ||
1247 | <Reference name="OpenSim.Framework"/> | 1242 | <Reference name="OpenSim.Framework"/> |
1248 | <Reference name="OpenSim.Framework.Console"/> | 1243 | <Reference name="OpenSim.Framework.Console"/> |
1249 | <Reference name="OpenSim.Region.ScriptEngine.Common"/> | 1244 | <Reference name="OpenSim.Region.ScriptEngine.Common"/> |
1250 | <Reference name="OpenSim.Region.Terrain.BasicTerrain"/> | 1245 | <Reference name="OpenSim.Region.ScriptEngine.DotNetEngine"/> |
1251 | <Reference name="OpenSim.Grid.ScriptServer"/> | ||
1252 | |||
1253 | <!-- Explicit path since without it, the generated .build file does not correctly reference | ||
1254 | the DotNetEngine assembly in bin/ScriptEngines (instead looking in simply bin/) | ||
1255 | despite the bin/ScriptEngines reference path. Hardcoding is not a permanent solution and | ||
1256 | may cause some warnings in Visual Studio --> | ||
1257 | <Reference name="../../../../bin/ScriptEngines/OpenSim.Region.ScriptEngine.DotNetEngine"/> | ||
1258 | |||
1259 | <Reference name="Axiom.MathLib.dll" localCopy="false"/> | ||
1260 | <Reference name="Nini.dll" /> | 1246 | <Reference name="Nini.dll" /> |
1247 | <!-- Reference name="OpenSim.Grid.ScriptServer"/ --> | ||
1248 | |||
1261 | <Files> | 1249 | <Files> |
1262 | <Match pattern="*.cs" recurse="true"/> | 1250 | <Match pattern="*.cs" recurse="true"/> |
1263 | </Files> | 1251 | </Files> |