diff options
author | gareth | 2007-05-07 16:32:30 +0000 |
---|---|---|
committer | gareth | 2007-05-07 16:32:30 +0000 |
commit | 3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1 (patch) | |
tree | 5d6b1009685278b214100a7901bd4feaeed584da /OpenSim | |
parent | Updated to have uniform build number (diff) | |
download | opensim-SC-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.zip opensim-SC-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.gz opensim-SC-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.bz2 opensim-SC-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.xz |
Merged 0.1-prestable back into trunk :(
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Framework.Console/ConsoleBase.cs | 4 | ||||
-rw-r--r-- | OpenSim.Framework/OpenSim.Framework.dll.build | 1 | ||||
-rw-r--r-- | OpenSim.RegionServer/OpenSim.RegionServer.dll.build | 1 | ||||
-rw-r--r-- | OpenSim.RegionServer/OpenSimMain.cs | 137 | ||||
-rw-r--r-- | OpenSim.build | 89 |
5 files changed, 147 insertions, 85 deletions
diff --git a/OpenSim.Framework.Console/ConsoleBase.cs b/OpenSim.Framework.Console/ConsoleBase.cs index 39d2b28..dd8054a 100644 --- a/OpenSim.Framework.Console/ConsoleBase.cs +++ b/OpenSim.Framework.Console/ConsoleBase.cs | |||
@@ -43,6 +43,7 @@ namespace OpenSim.Framework.Console | |||
43 | public void Write(string format, params object[] args) | 43 | public void Write(string format, params object[] args) |
44 | { | 44 | { |
45 | Log.Write(format, args); | 45 | Log.Write(format, args); |
46 | Log.Flush(); | ||
46 | if(!disableOutput) | 47 | if(!disableOutput) |
47 | { | 48 | { |
48 | System.Console.Write(format, args); | 49 | System.Console.Write(format, args); |
@@ -53,7 +54,8 @@ namespace OpenSim.Framework.Console | |||
53 | public void WriteLine(string format, params object[] args) | 54 | public void WriteLine(string format, params object[] args) |
54 | { | 55 | { |
55 | Log.WriteLine(format, args); | 56 | Log.WriteLine(format, args); |
56 | if(!disableOutput) | 57 | Log.Flush(); |
58 | if(!disableOutput) | ||
57 | { | 59 | { |
58 | System.Console.WriteLine(format, args); | 60 | System.Console.WriteLine(format, args); |
59 | } | 61 | } |
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index aa405fb..69ea10a 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -22,7 +22,6 @@ | |||
22 | <include name="UserProfileManager.cs" /> | 22 | <include name="UserProfileManager.cs" /> |
23 | <include name="UserProfileManagerBase.cs" /> | 23 | <include name="UserProfileManagerBase.cs" /> |
24 | <include name="Util.cs" /> | 24 | <include name="Util.cs" /> |
25 | <include name="VersionInfo.cs" /> | ||
26 | <include name="Interfaces/IAssetServer.cs" /> | 25 | <include name="Interfaces/IAssetServer.cs" /> |
27 | <include name="Interfaces/IConfig.cs" /> | 26 | <include name="Interfaces/IConfig.cs" /> |
28 | <include name="Interfaces/IGenericConfig.cs" /> | 27 | <include name="Interfaces/IGenericConfig.cs" /> |
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index d41d664..871d639 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -19,6 +19,7 @@ | |||
19 | <include name="QueItem.cs" /> | 19 | <include name="QueItem.cs" /> |
20 | <include name="RegionInfo.cs" /> | 20 | <include name="RegionInfo.cs" /> |
21 | <include name="SimClient.cs" /> | 21 | <include name="SimClient.cs" /> |
22 | <include name="VersionInfo.cs" /> | ||
22 | <include name="Assets/AssetCache.cs" /> | 23 | <include name="Assets/AssetCache.cs" /> |
23 | <include name="Assets/InventoryCache.cs" /> | 24 | <include name="Assets/InventoryCache.cs" /> |
24 | <include name="CAPS/AdminWebFront.cs" /> | 25 | <include name="CAPS/AdminWebFront.cs" /> |
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index 61441b2..1fd24b7 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs | |||
@@ -150,12 +150,28 @@ namespace OpenSim | |||
150 | m_console.WriteLine("Starting in Grid mode"); | 150 | m_console.WriteLine("Starting in Grid mode"); |
151 | } | 151 | } |
152 | 152 | ||
153 | GridServers.Initialise(); | 153 | try |
154 | { | ||
155 | GridServers.Initialise(); | ||
156 | } | ||
157 | catch (Exception e) | ||
158 | { | ||
159 | m_console.WriteLine(e.Message + "\nSorry, could not setup the grid interface"); | ||
160 | Environment.Exit(1); | ||
161 | } | ||
154 | 162 | ||
155 | startuptime = DateTime.Now; | 163 | startuptime = DateTime.Now; |
156 | 164 | ||
157 | AssetCache = new AssetCache(GridServers.AssetServer); | 165 | try |
158 | InventoryCache = new InventoryCache(); | 166 | { |
167 | AssetCache = new AssetCache(GridServers.AssetServer); | ||
168 | InventoryCache = new InventoryCache(); | ||
169 | } | ||
170 | catch (Exception e) | ||
171 | { | ||
172 | m_console.WriteLine(e.Message + "\nSorry, could not setup local cache"); | ||
173 | Environment.Exit(1); | ||
174 | } | ||
159 | 175 | ||
160 | PacketServer packetServer = new PacketServer(this); | 176 | PacketServer packetServer = new PacketServer(this); |
161 | 177 | ||
@@ -189,9 +205,17 @@ namespace OpenSim | |||
189 | { | 205 | { |
190 | // The grid server has told us who we are | 206 | // The grid server has told us who we are |
191 | // We must obey the grid server. | 207 | // We must obey the grid server. |
192 | regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString()); | 208 | try |
193 | regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString()); | 209 | { |
194 | regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString(); | 210 | regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString()); |
211 | regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString()); | ||
212 | regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString(); | ||
213 | } | ||
214 | catch (Exception e) | ||
215 | { | ||
216 | m_console.WriteLine(e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!"); | ||
217 | Environment.Exit(1); | ||
218 | } | ||
195 | } | 219 | } |
196 | 220 | ||
197 | } | 221 | } |
@@ -234,6 +258,7 @@ namespace OpenSim | |||
234 | if (gridServer.GetName() == "Remote") | 258 | if (gridServer.GetName() == "Remote") |
235 | { | 259 | { |
236 | // should startup the OGS protocol server here | 260 | // should startup the OGS protocol server here |
261 | // Are we actually using this? | ||
237 | OGSServer = new OpenGridProtocolServer(this.regionData.IPListenPort - 500); // Changed so we can have more than one OGSServer per machine. | 262 | OGSServer = new OpenGridProtocolServer(this.regionData.IPListenPort - 500); // Changed so we can have more than one OGSServer per machine. |
238 | 263 | ||
239 | // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server | 264 | // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server |
@@ -347,7 +372,7 @@ namespace OpenSim | |||
347 | // SandBoxMode | 372 | // SandBoxMode |
348 | string attri = ""; | 373 | string attri = ""; |
349 | attri = configData.GetAttribute("SandBox"); | 374 | attri = configData.GetAttribute("SandBox"); |
350 | if (attri == "") | 375 | if ((attri == "") || ((attri != "false") && (attri != "true"))) |
351 | { | 376 | { |
352 | this.m_sandbox = false; | 377 | this.m_sandbox = false; |
353 | configData.SetAttribute("SandBox", "false"); | 378 | configData.SetAttribute("SandBox", "false"); |
@@ -360,7 +385,7 @@ namespace OpenSim | |||
360 | // LoginServer | 385 | // LoginServer |
361 | attri = ""; | 386 | attri = ""; |
362 | attri = configData.GetAttribute("LoginServer"); | 387 | attri = configData.GetAttribute("LoginServer"); |
363 | if (attri == "") | 388 | if ((attri == "") || ((attri != "false") && (attri != "true"))) |
364 | { | 389 | { |
365 | this.m_loginserver = false; | 390 | this.m_loginserver = false; |
366 | configData.SetAttribute("LoginServer", "false"); | 391 | configData.SetAttribute("LoginServer", "false"); |
@@ -373,12 +398,12 @@ namespace OpenSim | |||
373 | // Sandbox User accounts | 398 | // Sandbox User accounts |
374 | attri = ""; | 399 | attri = ""; |
375 | attri = configData.GetAttribute("UserAccount"); | 400 | attri = configData.GetAttribute("UserAccount"); |
376 | if (attri == "") | 401 | if ((attri == "") || ((attri != "false") && (attri != "true"))) |
377 | { | 402 | { |
378 | this.user_accounts = false; | 403 | this.user_accounts = false; |
379 | configData.SetAttribute("UserAccounts", "false"); | 404 | configData.SetAttribute("UserAccounts", "false"); |
380 | } | 405 | } |
381 | else | 406 | else if (attri == "true") |
382 | { | 407 | { |
383 | this.user_accounts = Convert.ToBoolean(attri); | 408 | this.user_accounts = Convert.ToBoolean(attri); |
384 | } | 409 | } |
@@ -386,70 +411,96 @@ namespace OpenSim | |||
386 | // Grid mode hack to use local asset server | 411 | // Grid mode hack to use local asset server |
387 | attri = ""; | 412 | attri = ""; |
388 | attri = configData.GetAttribute("LocalAssets"); | 413 | attri = configData.GetAttribute("LocalAssets"); |
389 | if (attri == "") | 414 | if ((attri == "") || ((attri != "false") && (attri != "true"))) |
390 | { | 415 | { |
391 | this.gridLocalAsset = false; | 416 | this.gridLocalAsset = false; |
392 | configData.SetAttribute("LocalAssets", "false"); | 417 | configData.SetAttribute("LocalAssets", "false"); |
393 | } | 418 | } |
394 | else | 419 | else if (attri == "true") |
395 | { | 420 | { |
396 | this.gridLocalAsset = Convert.ToBoolean(attri); | 421 | this.gridLocalAsset = Convert.ToBoolean(attri); |
397 | } | 422 | } |
398 | 423 | ||
399 | // Grid mode hack to use local asset server | 424 | |
400 | attri = ""; | 425 | attri = ""; |
401 | attri = configData.GetAttribute("PhysicsEngine"); | 426 | attri = configData.GetAttribute("PhysicsEngine"); |
402 | if (attri == "") | 427 | switch (attri) |
403 | { | ||
404 | this.m_physicsEngine = "basicphysics"; | ||
405 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | ||
406 | } | ||
407 | else | ||
408 | { | 428 | { |
409 | this.m_physicsEngine = attri; | 429 | default: |
410 | if ((attri == "RealPhysX") || (attri == "OpenDynamicsEngine")) | 430 | m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating"); |
411 | { | 431 | Environment.Exit(1); |
412 | OpenSim.world.Avatar.PhysicsEngineFlying = true; | 432 | break; |
413 | } | 433 | |
414 | else | 434 | case "": |
415 | { | 435 | this.m_physicsEngine = "basicphysics"; |
436 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | ||
416 | OpenSim.world.Avatar.PhysicsEngineFlying = false; | 437 | OpenSim.world.Avatar.PhysicsEngineFlying = false; |
417 | } | 438 | break; |
439 | |||
440 | case "basicphysics": | ||
441 | this.m_physicsEngine = "basicphysics"; | ||
442 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | ||
443 | OpenSim.world.Avatar.PhysicsEngineFlying = false; | ||
444 | break; | ||
445 | |||
446 | case "RealPhysX": | ||
447 | this.m_physicsEngine = "RealPhysX"; | ||
448 | OpenSim.world.Avatar.PhysicsEngineFlying = true; | ||
449 | break; | ||
450 | |||
451 | case "OpenDynamicsEngine": | ||
452 | this.m_physicsEngine = "OpenDynamicsEngine"; | ||
453 | OpenSim.world.Avatar.PhysicsEngineFlying = true; | ||
454 | break; | ||
418 | } | 455 | } |
456 | |||
419 | configData.Commit(); | 457 | configData.Commit(); |
420 | } | 458 | } |
421 | catch (Exception e) | 459 | catch (Exception e) |
422 | { | 460 | { |
423 | Console.WriteLine(e.Message); | 461 | Console.WriteLine(e.Message); |
462 | Console.WriteLine("\nSorry, a fatal error occurred while trying to initialise the configuration data"); | ||
463 | Console.WriteLine("Can not continue starting up"); | ||
464 | Environment.Exit(1); | ||
424 | } | 465 | } |
425 | } | 466 | } |
426 | 467 | ||
427 | private SimConfig LoadConfigDll(string dllName) | 468 | private SimConfig LoadConfigDll(string dllName) |
428 | { | 469 | { |
429 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | 470 | try |
430 | SimConfig config = null; | ||
431 | |||
432 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
433 | { | 471 | { |
434 | if (pluginType.IsPublic) | 472 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); |
473 | SimConfig config = null; | ||
474 | |||
475 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
435 | { | 476 | { |
436 | if (!pluginType.IsAbstract) | 477 | if (pluginType.IsPublic) |
437 | { | 478 | { |
438 | Type typeInterface = pluginType.GetInterface("ISimConfig", true); | 479 | if (!pluginType.IsAbstract) |
439 | |||
440 | if (typeInterface != null) | ||
441 | { | 480 | { |
442 | ISimConfig plug = (ISimConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 481 | Type typeInterface = pluginType.GetInterface("ISimConfig", true); |
443 | config = plug.GetConfigObject(); | ||
444 | break; | ||
445 | } | ||
446 | 482 | ||
447 | typeInterface = null; | 483 | if (typeInterface != null) |
484 | { | ||
485 | ISimConfig plug = (ISimConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
486 | config = plug.GetConfigObject(); | ||
487 | break; | ||
488 | } | ||
489 | |||
490 | typeInterface = null; | ||
491 | } | ||
448 | } | 492 | } |
449 | } | 493 | } |
494 | pluginAssembly = null; | ||
495 | return config; | ||
496 | } | ||
497 | catch (Exception e) | ||
498 | { | ||
499 | m_console.WriteLine(e.Message + "\nSorry, a fatal error occurred while trying to load the config DLL"); | ||
500 | m_console.WriteLine("Can not continue starting up"); | ||
501 | Environment.Exit(1); | ||
502 | return null; | ||
450 | } | 503 | } |
451 | pluginAssembly = null; | ||
452 | return config; | ||
453 | } | 504 | } |
454 | 505 | ||
455 | private void OnReceivedData(IAsyncResult result) | 506 | private void OnReceivedData(IAsyncResult result) |
diff --git a/OpenSim.build b/OpenSim.build index 67b2120..e9ba612 100644 --- a/OpenSim.build +++ b/OpenSim.build | |||
@@ -46,31 +46,34 @@ | |||
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> | ||
50 | <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" /> | ||
51 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> | ||
52 | <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" /> | ||
53 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> | ||
54 | <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" /> | ||
55 | <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" /> | ||
56 | <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" /> | ||
57 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> | ||
58 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> | ||
59 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> | 49 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> |
60 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> | 50 | <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> |
61 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> | ||
62 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> | ||
63 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> | ||
64 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> | ||
65 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> | ||
66 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> | 51 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> |
52 | <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" /> | ||
53 | <nant buildfile="OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" /> | ||
67 | <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" /> | 54 | <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" /> |
68 | <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> | ||
69 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" /> | ||
70 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> | 55 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> |
71 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> | 56 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> |
72 | <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" /> | ||
73 | <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" /> | 57 | <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" /> |
58 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> | ||
59 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> | ||
60 | <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" /> | ||
61 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" /> | ||
62 | <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" /> | ||
63 | <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" /> | ||
64 | <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" /> | ||
65 | <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" /> | ||
66 | <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> | ||
67 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> | ||
68 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> | ||
69 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> | ||
70 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> | ||
71 | <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" /> | ||
72 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> | ||
73 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> | ||
74 | <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" /> | ||
75 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> | ||
76 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> | ||
74 | </target> | 77 | </target> |
75 | 78 | ||
76 | <target name="build" depends="init" description=""> | 79 | <target name="build" depends="init" description=""> |
@@ -85,6 +88,9 @@ | |||
85 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> | 88 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> |
86 | <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" /> | 89 | <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" /> |
87 | <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" /> | 90 | <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" /> |
91 | <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" /> | ||
92 | <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" /> | ||
93 | <nant buildfile="OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" /> | ||
88 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> | 94 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> |
89 | <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> | 95 | <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> |
90 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> | 96 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> |
@@ -109,31 +115,34 @@ | |||
109 | 115 | ||
110 | <target name="doc" depends="build-release"> | 116 | <target name="doc" depends="build-release"> |
111 | <echo message="Generating all documentation from all builds" /> | 117 | <echo message="Generating all documentation from all builds" /> |
112 | <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> | ||
113 | <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" /> | ||
114 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> | ||
115 | <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" /> | ||
116 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> | ||
117 | <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" /> | ||
118 | <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" /> | ||
119 | <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" /> | ||
120 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> | ||
121 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> | ||
122 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> | 118 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> |
123 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> | 119 | <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> |
124 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> | ||
125 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> | ||
126 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> | ||
127 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> | ||
128 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> | ||
129 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> | 120 | <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> |
121 | <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" /> | ||
122 | <nant buildfile="OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" /> | ||
130 | <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" /> | 123 | <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" /> |
131 | <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> | ||
132 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" /> | ||
133 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> | 124 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> |
134 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> | 125 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> |
135 | <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" /> | ||
136 | <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" /> | 126 | <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" /> |
127 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> | ||
128 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> | ||
129 | <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" /> | ||
130 | <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" /> | ||
131 | <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" /> | ||
132 | <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" /> | ||
133 | <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" /> | ||
134 | <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" /> | ||
135 | <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> | ||
136 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> | ||
137 | <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> | ||
138 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> | ||
139 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> | ||
140 | <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" /> | ||
141 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> | ||
142 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> | ||
143 | <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" /> | ||
144 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> | ||
145 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> | ||
137 | </target> | 146 | </target> |
138 | 147 | ||
139 | </project> | 148 | </project> |