diff options
author | justincc | 2010-12-15 00:35:36 +0000 |
---|---|---|
committer | justincc | 2010-12-15 00:35:36 +0000 |
commit | b643661938881af6fc782d39e52040ed6d16f03f (patch) | |
tree | 162e0667718b2f68e5f4e90cd10f30e6fa374cbb /prebuild.xml | |
parent | replace ode.dll with one built without asserts turned on (diff) | |
parent | fix mistake in last change of local.include (diff) | |
download | opensim-SC_OLD-b643661938881af6fc782d39e52040ed6d16f03f.zip opensim-SC_OLD-b643661938881af6fc782d39e52040ed6d16f03f.tar.gz opensim-SC_OLD-b643661938881af6fc782d39e52040ed6d16f03f.tar.bz2 opensim-SC_OLD-b643661938881af6fc782d39e52040ed6d16f03f.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | prebuild.xml | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 9f2ef43..e408ccd 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2733,6 +2733,7 @@ | |||
2733 | <Reference name="System.Xml"/> | 2733 | <Reference name="System.Xml"/> |
2734 | <Reference name="System.Data"/> | 2734 | <Reference name="System.Data"/> |
2735 | <Reference name="log4net" path="../../../bin/"/> | 2735 | <Reference name="log4net" path="../../../bin/"/> |
2736 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
2736 | <Reference name="Nini" path="../../../bin/"/> | 2737 | <Reference name="Nini" path="../../../bin/"/> |
2737 | <Reference name="nunit.framework" path="../../../bin/"/> | 2738 | <Reference name="nunit.framework" path="../../../bin/"/> |
2738 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 2739 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
@@ -2747,6 +2748,7 @@ | |||
2747 | <Reference name="OpenSim.Server.Base"/> | 2748 | <Reference name="OpenSim.Server.Base"/> |
2748 | <Reference name="OpenSim.Region.Framework"/> | 2749 | <Reference name="OpenSim.Region.Framework"/> |
2749 | <Reference name="OpenSim.Region.CoreModules"/> | 2750 | <Reference name="OpenSim.Region.CoreModules"/> |
2751 | <Reference name="OpenSim.Region.OptionalModules"/> | ||
2750 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2752 | <Reference name="OpenSim.Region.Physics.Manager"/> |
2751 | 2753 | ||
2752 | <Files> | 2754 | <Files> |
@@ -2974,6 +2976,62 @@ | |||
2974 | </Files> | 2976 | </Files> |
2975 | </Project> | 2977 | </Project> |
2976 | 2978 | ||
2979 | <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules.Tests" path="OpenSim/Region/OptionalModules" type="Library"> | ||
2980 | <Configuration name="Debug"> | ||
2981 | <Options> | ||
2982 | <OutputPath>../../../bin/</OutputPath> | ||
2983 | </Options> | ||
2984 | </Configuration> | ||
2985 | <Configuration name="Release"> | ||
2986 | <Options> | ||
2987 | <OutputPath>../../../bin/</OutputPath> | ||
2988 | </Options> | ||
2989 | </Configuration> | ||
2990 | |||
2991 | <ReferencePath>../../../bin/</ReferencePath> | ||
2992 | <Reference name="System"/> | ||
2993 | <Reference name="System.Core"/> | ||
2994 | <Reference name="System.Xml"/> | ||
2995 | <Reference name="System.Drawing"/> | ||
2996 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
2997 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
2998 | <Reference name="OpenSim.Data"/> | ||
2999 | <Reference name="OpenSim.Framework"/> | ||
3000 | <Reference name="OpenSim.Framework.Serialization"/> | ||
3001 | <Reference name="OpenSim.Framework.Communications"/> | ||
3002 | <Reference name="OpenSim.Framework.Console"/> | ||
3003 | <Reference name="OpenSim.Framework.Servers"/> | ||
3004 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
3005 | <Reference name="OpenSim.Framework.Statistics"/> | ||
3006 | <Reference name="OpenSim.Region.Framework"/> | ||
3007 | <Reference name="OpenSim.Region.CoreModules"/> | ||
3008 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
3009 | <Reference name="OpenSim.Services.Interfaces"/> | ||
3010 | |||
3011 | <!-- Unit tests --> | ||
3012 | <Reference name="OpenSim.Tests.Common"/> | ||
3013 | <Reference name="Nini" path="../../../bin/"/> | ||
3014 | <Reference name="nunit.framework" path="../../../bin/"/> | ||
3015 | |||
3016 | <!-- For scripting in funny languages by default --> | ||
3017 | <Reference name="XMLRPC" path="../../../bin/"/> | ||
3018 | <Reference name="OpenSim.Framework.Communications"/> | ||
3019 | <Reference name="Nini" path="../../../bin/"/> | ||
3020 | <Reference name="log4net" path="../../../bin/"/> | ||
3021 | <Reference name="DotNetOpenMail" path="../../../bin/"/> | ||
3022 | |||
3023 | <!-- | ||
3024 | TODO: this is kind of lame, we basically build a duplicate | ||
3025 | assembly but with tests added in, just so that we don't | ||
3026 | need to hard code in a bunch of Test directories here. If | ||
3027 | pattern="Tests/*.cs" worked, we wouldn't need this. | ||
3028 | --> | ||
3029 | <Files> | ||
3030 | <!-- SADLY the way this works means you need to keep adding these paths --> | ||
3031 | <Match path="Avatar/XmlRpcGroups/Tests" pattern="*.cs" recurse="true"/> | ||
3032 | </Files> | ||
3033 | </Project> | ||
3034 | |||
2977 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library"> | 3035 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library"> |
2978 | <Configuration name="Debug"> | 3036 | <Configuration name="Debug"> |
2979 | <Options> | 3037 | <Options> |
@@ -3002,6 +3060,7 @@ | |||
3002 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3060 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3003 | <Reference name="OpenSim.Region.Framework"/> | 3061 | <Reference name="OpenSim.Region.Framework"/> |
3004 | <Reference name="OpenSim.Region.CoreModules"/> | 3062 | <Reference name="OpenSim.Region.CoreModules"/> |
3063 | <Reference name="OpenSim.Region.OptionalModules"/> | ||
3005 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3064 | <Reference name="OpenSim.Region.Physics.Manager"/> |
3006 | <Reference name="OpenSim.Services.Interfaces"/> | 3065 | <Reference name="OpenSim.Services.Interfaces"/> |
3007 | 3066 | ||