aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorBlueWall2012-11-25 17:03:14 -0500
committerBlueWall2012-11-25 17:03:14 -0500
commitc754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
treedfa1c2020d5500d510519d5b2b3236600692f277 /prebuild.xml
parentMerge branch 'master' into connector_plugin (diff)
parentCombine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
downloadopensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz
Merge branch 'master' into connector_plugin
Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml108
1 files changed, 103 insertions, 5 deletions
diff --git a/prebuild.xml b/prebuild.xml
index e7b4c6a..fffeab1 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -446,6 +446,7 @@
446 <Reference name="XMLRPC" path="../../../bin/"/> 446 <Reference name="XMLRPC" path="../../../bin/"/>
447 <Reference name="log4net" path="../../../bin/"/> 447 <Reference name="log4net" path="../../../bin/"/>
448 <Reference name="HttpServer_OpenSim" path="../../../bin/"/> 448 <Reference name="HttpServer_OpenSim" path="../../../bin/"/>
449 <Reference name="Nini" path="../../../bin/"/>
449 450
450 <Files> 451 <Files>
451 <Match pattern="*.cs" recurse="false"> 452 <Match pattern="*.cs" recurse="false">
@@ -1128,7 +1129,9 @@
1128 <Reference name="log4net" path="../../../bin/"/> 1129 <Reference name="log4net" path="../../../bin/"/>
1129 1130
1130 <Files> 1131 <Files>
1131 <Match pattern="*.cs" recurse="true"/> 1132 <Match pattern="*.cs" recurse="true">
1133 <Exclude name="Tests" pattern="Tests"/>
1134 </Match>
1132 </Files> 1135 </Files>
1133 </Project> 1136 </Project>
1134 1137
@@ -1371,6 +1374,7 @@
1371 <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/> 1374 <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/>
1372 <Reference name="OpenSim.Framework"/> 1375 <Reference name="OpenSim.Framework"/>
1373 <Reference name="OpenSim.Framework.Console"/> 1376 <Reference name="OpenSim.Framework.Console"/>
1377 <Reference name="OpenSim.Framework.Servers"/>
1374 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1378 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1375 <Reference name="OpenSim.Server.Base"/> 1379 <Reference name="OpenSim.Server.Base"/>
1376 <Reference name="Nini" path="../../bin/"/> 1380 <Reference name="Nini" path="../../bin/"/>
@@ -1679,6 +1683,7 @@
1679 1683
1680 <ReferencePath>../../../bin/</ReferencePath> 1684 <ReferencePath>../../../bin/</ReferencePath>
1681 <Reference name="System"/> 1685 <Reference name="System"/>
1686 <Reference name="System.Core"/>
1682 <Reference name="System.Xml"/> 1687 <Reference name="System.Xml"/>
1683 <Reference name="OpenSim.Data"/> 1688 <Reference name="OpenSim.Data"/>
1684 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 1689 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
@@ -2141,10 +2146,11 @@
2141 2146
2142 <ReferencePath>../../../bin/</ReferencePath> 2147 <ReferencePath>../../../bin/</ReferencePath>
2143 <Reference name="System"/> 2148 <Reference name="System"/>
2144 <Reference name="System.Xml"/> 2149 <Reference name="System.Core"/>
2145 <Reference name="System.Data"/> 2150 <Reference name="System.Data"/>
2146 <Reference name="OpenSim.Data"/>
2147 <Reference name="System.Drawing"/> 2151 <Reference name="System.Drawing"/>
2152 <Reference name="System.Xml"/>
2153 <Reference name="OpenSim.Data"/>
2148 <Reference name="OpenSim.Framework"/> 2154 <Reference name="OpenSim.Framework"/>
2149 <Reference name="OpenSim.Framework.Console"/> 2155 <Reference name="OpenSim.Framework.Console"/>
2150 <Reference name="OpenSim.Region.Framework"/> 2156 <Reference name="OpenSim.Region.Framework"/>
@@ -2685,12 +2691,13 @@
2685 <Reference name="nunit.framework" path="../../../bin/"/> 2691 <Reference name="nunit.framework" path="../../../bin/"/>
2686 <Reference name="OpenMetaverse" path="../../../bin/"/> 2692 <Reference name="OpenMetaverse" path="../../../bin/"/>
2687 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 2693 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2694 <Reference name="OpenSim.Data"/>
2695 <Reference name="OpenSim.Data.Null"/>
2688 <Reference name="OpenSim.Framework"/> 2696 <Reference name="OpenSim.Framework"/>
2689 <Reference name="OpenSim.Framework.Communications"/> 2697 <Reference name="OpenSim.Framework.Communications"/>
2690 <Reference name="OpenSim.Framework.Console"/> 2698 <Reference name="OpenSim.Framework.Console"/>
2691 <Reference name="OpenSim.Framework.Servers"/> 2699 <Reference name="OpenSim.Framework.Servers"/>
2692 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2700 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2693 <Reference name="OpenSim.Data"/>
2694 <Reference name="OpenSim.Services.Interfaces"/> 2701 <Reference name="OpenSim.Services.Interfaces"/>
2695 <Reference name="OpenSim.Server.Base"/> 2702 <Reference name="OpenSim.Server.Base"/>
2696 <Reference name="OpenSim.Region.Framework"/> 2703 <Reference name="OpenSim.Region.Framework"/>
@@ -2716,15 +2723,58 @@
2716 </Configuration> 2723 </Configuration>
2717 2724
2718 <ReferencePath>../../bin/</ReferencePath> 2725 <ReferencePath>../../bin/</ReferencePath>
2719 <Reference name="OpenSim.Framework"/>
2720 <Reference name="Nini" path="../../bin/"/> 2726 <Reference name="Nini" path="../../bin/"/>
2721 <Reference name="nunit.framework" path="../../bin/"/> 2727 <Reference name="nunit.framework" path="../../bin/"/>
2722 <Reference name="OpenSim"/> 2728 <Reference name="OpenSim"/>
2729 <Reference name="OpenSim.Framework"/>
2730 <Reference name="OpenSim.Tests.Common"/>
2723 <Files> 2731 <Files>
2724 <Match pattern="*.cs" recurse="false"/> 2732 <Match pattern="*.cs" recurse="false"/>
2725 </Files> 2733 </Files>
2726 </Project> 2734 </Project>
2727 2735
2736 <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library">
2737 <Configuration name="Debug">
2738 <Options>
2739 <OutputPath>../../../../bin/</OutputPath>
2740 </Options>
2741 </Configuration>
2742 <Configuration name="Release">
2743 <Options>
2744 <OutputPath>../../../../bin/</OutputPath>
2745 </Options>
2746 </Configuration>
2747
2748 <ReferencePath>../../../../bin/</ReferencePath>
2749 <Reference name="System"/>
2750 <Reference name="System.Core"/>
2751 <Reference name="System.Drawing"/>
2752 <Reference name="System.Xml"/>
2753 <Reference name="System.Web"/>
2754 <Reference name="nunit.framework" path="../../../../bin/"/>
2755 <Reference name="OpenMetaverse" path="../../../../bin/"/>
2756 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
2757 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
2758 <Reference name="OpenSim.Capabilities"/>
2759 <Reference name="OpenSim.Capabilities.Handlers"/>
2760 <Reference name="OpenSim.Framework"/>
2761 <Reference name="OpenSim.Framework.Console"/>
2762 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2763 <Reference name="OpenSim.Region.Framework"/>
2764 <Reference name="OpenSim.Server.Base"/>
2765 <Reference name="OpenSim.Server.Handlers"/>
2766 <Reference name="OpenSim.Services.Base"/>
2767 <Reference name="OpenSim.Services.Interfaces"/>
2768 <Reference name="OpenSim.Tests.Common"/>
2769 <Reference name="Nini" path="../../../../bin/"/>
2770 <Reference name="log4net" path="../../../../bin/"/>
2771
2772 <Files>
2773 <Match pattern="*.cs" recurse="true">
2774 </Match>
2775 </Files>
2776 </Project>
2777
2728 2778
2729 <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library"> 2779 <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
2730 <Configuration name="Debug"> 2780 <Configuration name="Debug">
@@ -2940,6 +2990,7 @@
2940 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2990 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2941 <Reference name="OpenSim.Region.Framework"/> 2991 <Reference name="OpenSim.Region.Framework"/>
2942 <Reference name="OpenSim.Region.CoreModules"/> 2992 <Reference name="OpenSim.Region.CoreModules"/>
2993 <Reference name="OpenSim.Region.OptionalModules"/>
2943 <Reference name="OpenSim.Region.Physics.Manager"/> 2994 <Reference name="OpenSim.Region.Physics.Manager"/>
2944 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 2995 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
2945 <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> 2996 <Reference name="OpenSim.Region.ScriptEngine.XEngine"/>
@@ -3250,6 +3301,7 @@
3250 <Reference name="OpenSim.Framework.Console"/> 3301 <Reference name="OpenSim.Framework.Console"/>
3251 <Reference name="OpenSim.Region.Physics.Manager"/> 3302 <Reference name="OpenSim.Region.Physics.Manager"/>
3252 <Reference name="OpenSim.Region.Physics.OdePlugin" path="../../../../../bin/Physics/"/> 3303 <Reference name="OpenSim.Region.Physics.OdePlugin" path="../../../../../bin/Physics/"/>
3304 <Reference name="OpenSim.Tests.Common"/>
3253 <Reference name="Ode.NET" path="../../../../../bin/"/> 3305 <Reference name="Ode.NET" path="../../../../../bin/"/>
3254 <Reference name="nunit.framework" path="../../../../../bin/"/> 3306 <Reference name="nunit.framework" path="../../../../../bin/"/>
3255 <Reference name="log4net" path="../../../../../bin/"/> 3307 <Reference name="log4net" path="../../../../../bin/"/>
@@ -3259,6 +3311,52 @@
3259 </Files> 3311 </Files>
3260 </Project> 3312 </Project>
3261 3313
3314 <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library">
3315 <Configuration name="Debug">
3316 <Options>
3317 <OutputPath>../../../bin/</OutputPath>
3318 </Options>
3319 </Configuration>
3320 <Configuration name="Release">
3321 <Options>
3322 <OutputPath>../../../bin/</OutputPath>
3323 </Options>
3324 </Configuration>
3325
3326 <ReferencePath>../../../bin/</ReferencePath>
3327 <Reference name="System"/>
3328 <Reference name="System.Xml"/>
3329 <Reference name="System.Web"/>
3330 <Reference name="log4net" path="../../../bin/"/>
3331 <Reference name="Nini" path="../../../bin/"/>
3332 <Reference name="nunit.framework" path="../../../bin/"/>
3333 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
3334 <Reference name="OpenMetaverse" path="../../../bin/"/>
3335 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
3336 <Reference name="XMLRPC" path="../../../bin/"/>
3337 <Reference name="OpenSim.Framework"/>
3338 <Reference name="OpenSim.Framework.Console"/>
3339 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3340 <Reference name="OpenSim.Server.Base"/>
3341 <Reference name="OpenSim.Server.Handlers"/>
3342 <Reference name="OpenSim.Services.AssetService"/>
3343 <Reference name="OpenSim.Services.Base"/>
3344 <Reference name="OpenSim.Services.Interfaces"/>
3345 <Reference name="OpenSim.Services.UserAccountService"/>
3346 <Reference name="OpenSim.Tests.Common"/>
3347
3348 <!--
3349 TODO: this is kind of lame, we basically build a duplicate
3350 assembly but with tests added in, just so that we don't
3351 need to hard code in a bunch of Test directories here. If
3352 pattern="Tests/*.cs" worked, we wouldn't need this.
3353 -->
3354 <Files>
3355 <!-- SADLY the way this works means you need to keep adding these paths -->
3356 <Match path="Asset/Tests" pattern="*.cs" recurse="true"/>
3357 </Files>
3358 </Project>
3359
3262 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library"> 3360 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library">
3263 <Configuration name="Debug"> 3361 <Configuration name="Debug">
3264 <Options> 3362 <Options>
generated by cgit v1.1 at 2024-12-13 17:24:23 +0000