aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-12 02:58:14 +0100
committerJustin Clark-Casey (justincc)2011-07-12 02:58:14 +0100
commit7442f064f50311cced8d4131b7a2108e59a490ab (patch)
tree242404acf54bf483812bebfdc7e0f3f7d0cf7592
parentWhen a mesh object is added to a scene, delay adding the physics actor until ... (diff)
downloadopensim-SC_OLD-7442f064f50311cced8d4131b7a2108e59a490ab.zip
opensim-SC_OLD-7442f064f50311cced8d4131b7a2108e59a490ab.tar.gz
opensim-SC_OLD-7442f064f50311cced8d4131b7a2108e59a490ab.tar.bz2
opensim-SC_OLD-7442f064f50311cced8d4131b7a2108e59a490ab.tar.xz
Make OdePlugin tests build from their own directory rather than from the main OdePlugin directory
I suspect the former arrangement was confusing nant since file changes didn't appear to be rebuilding properly Ode tests don't currently execute because Ode.NET can't pick up the native libode dll However, this appears to also have been the case before, and these tests weren't being included in the "nant test" suite anyway. Will need to fix some time.
-rw-r--r--prebuild.xml19
1 files changed, 10 insertions, 9 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 09450eb..2ccf614 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3166,29 +3166,30 @@
3166 TODO: this is kind of lame, we basically build a duplicate 3166 TODO: this is kind of lame, we basically build a duplicate
3167 assembly but with tests added in, just because we can't resolve cross-bin-dir-refs. 3167 assembly but with tests added in, just because we can't resolve cross-bin-dir-refs.
3168 --> 3168 -->
3169 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin" type="Library"> 3169 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library">
3170 <Configuration name="Debug"> 3170 <Configuration name="Debug">
3171 <Options> 3171 <Options>
3172 <OutputPath>../../../../bin/</OutputPath> 3172 <OutputPath>../../../../../bin/</OutputPath>
3173 </Options> 3173 </Options>
3174 </Configuration> 3174 </Configuration>
3175 <Configuration name="Release"> 3175 <Configuration name="Release">
3176 <Options> 3176 <Options>
3177 <OutputPath>../../../../bin/</OutputPath> 3177 <OutputPath>../../../../../bin/</OutputPath>
3178 </Options> 3178 </Options>
3179 </Configuration> 3179 </Configuration>
3180 3180
3181 <ReferencePath>../../../../bin/</ReferencePath> 3181 <ReferencePath>../../../../../bin/</ReferencePath>
3182 <Reference name="System"/> 3182 <Reference name="System"/>
3183 <Reference name="System.Core"/> 3183 <Reference name="System.Core"/>
3184 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> 3184 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
3185 <Reference name="Nini" path="../../../../bin/"/> 3185 <Reference name="Nini" path="../../../../../bin/"/>
3186 <Reference name="OpenSim.Framework"/> 3186 <Reference name="OpenSim.Framework"/>
3187 <Reference name="OpenSim.Framework.Console"/> 3187 <Reference name="OpenSim.Framework.Console"/>
3188 <Reference name="OpenSim.Region.Physics.Manager"/> 3188 <Reference name="OpenSim.Region.Physics.Manager"/>
3189 <Reference name="Ode.NET" path="../../../../bin/"/> 3189 <Reference name="OpenSim.Region.Physics.OdePlugin"/>
3190 <Reference name="nunit.framework" path="../../../../bin/"/> 3190 <Reference name="Ode.NET" path="../../../../../bin/"/>
3191 <Reference name="log4net" path="../../../../bin/"/> 3191 <Reference name="nunit.framework" path="../../../../../bin/"/>
3192 <Reference name="log4net" path="../../../../../bin/"/>
3192 3193
3193 <Files> 3194 <Files>
3194 <Match pattern="*.cs" recurse="true"/> 3195 <Match pattern="*.cs" recurse="true"/>