aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-05-05 13:45:39 +0000
committergareth2007-05-05 13:45:39 +0000
commit543cda0398aaeed84f29870f27e14ccd93b65236 (patch)
treed0e800a970aabf79905199bf089706615d0e474a
parentPrebuild needs some lovin too. (diff)
downloadopensim-SC_OLD-543cda0398aaeed84f29870f27e14ccd93b65236.zip
opensim-SC_OLD-543cda0398aaeed84f29870f27e14ccd93b65236.tar.gz
opensim-SC_OLD-543cda0398aaeed84f29870f27e14ccd93b65236.tar.bz2
opensim-SC_OLD-543cda0398aaeed84f29870f27e14ccd93b65236.tar.xz
Cleaned up Adam's mess
Diffstat
-rw-r--r--OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build3
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build1
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build1
-rw-r--r--OpenSim.build6
-rw-r--r--prebuild.xml4
5 files changed, 11 insertions, 4 deletions
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 6bef534..774dab5 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > 11 <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="GridManager.cs" />
14 <include name="Main.cs" /> 15 <include name="Main.cs" />
15 <include name="SimProfiles.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
@@ -26,6 +26,7 @@
26 <include name="../bin/OpenSim.Framework.dll" /> 26 <include name="../bin/OpenSim.Framework.dll" />
27 <include name="../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../bin/OpenSim.Framework.Console.dll" />
28 <include name="../bin/OpenSim.Servers.dll" /> 28 <include name="../bin/OpenSim.Servers.dll" />
29 <include name="../bin/OpenGrid.Framework.Data.dll" />
29 <include name="../bin/libsecondlife.dll" /> 30 <include name="../bin/libsecondlife.dll" />
30 <include name="../bin/Db4objects.Db4o.dll" /> 31 <include name="../bin/Db4objects.Db4o.dll" />
31 <include name="../bin/XMLRPC.dll" /> 32 <include name="../bin/XMLRPC.dll" />
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 69ea10a..aa405fb 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -22,6 +22,7 @@
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" />
25 <include name="Interfaces/IAssetServer.cs" /> 26 <include name="Interfaces/IAssetServer.cs" />
26 <include name="Interfaces/IConfig.cs" /> 27 <include name="Interfaces/IConfig.cs" />
27 <include name="Interfaces/IGenericConfig.cs" /> 28 <include name="Interfaces/IGenericConfig.cs" />
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 871d639..d41d664 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -19,7 +19,6 @@
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" />
23 <include name="Assets/AssetCache.cs" /> 22 <include name="Assets/AssetCache.cs" />
24 <include name="Assets/InventoryCache.cs" /> 23 <include name="Assets/InventoryCache.cs" />
25 <include name="CAPS/AdminWebFront.cs" /> 24 <include name="CAPS/AdminWebFront.cs" />
diff --git a/OpenSim.build b/OpenSim.build
index 182776b..67b2120 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -49,7 +49,9 @@
49 <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> 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" /> 50 <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />
51 <nant buildfile="OpenSim.Framework/OpenSim.Framework.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" />
52 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.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" />
53 <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" /> 55 <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" />
54 <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" /> 56 <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
55 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> 57 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
@@ -81,6 +83,8 @@
81 <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" /> 83 <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
82 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> 84 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
83 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> 85 <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" />
87 <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" />
84 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 88 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
85 <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> 89 <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" />
86 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 90 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
@@ -108,7 +112,9 @@
108 <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> 112 <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
109 <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" /> 113 <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />
110 <nant buildfile="OpenSim.Framework/OpenSim.Framework.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" />
111 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.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" />
112 <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" /> 118 <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" />
113 <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" /> 119 <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
114 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> 120 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
diff --git a/prebuild.xml b/prebuild.xml
index c97c96c..7d1ca59 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -250,7 +250,7 @@
250 250
251 251
252 <!-- OpenGrid Data Services --> 252 <!-- OpenGrid Data Services -->
253 <Project name="OpenGrid.Framework.Data" path="OpenGrid.FrameWork.Data" type="Library"> 253 <Project name="OpenGrid.Framework.Data" path="OpenGrid.Framework.Data" type="Library">
254 <Configuration name="Debug"> 254 <Configuration name="Debug">
255 <Options> 255 <Options>
256 <OutputPath>../bin/</OutputPath> 256 <OutputPath>../bin/</OutputPath>
@@ -272,7 +272,7 @@
272 </Files> 272 </Files>
273 </Project> 273 </Project>
274 274
275 <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.FrameWork.Data.MySQL" type="Library"> 275 <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.Framework.Data.MySQL" type="Library">
276 <Configuration name="Debug"> 276 <Configuration name="Debug">
277 <Options> 277 <Options>
278 <OutputPath>../bin/</OutputPath> 278 <OutputPath>../bin/</OutputPath>
generated by cgit v1.1 at 2024-12-28 11:18:50 +0000