diff options
| author | Melanie | 2013-01-16 15:47:55 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 15:47:55 +0000 |
| commit | 818254916cb562422b3a3301b9f35fafd64ee3fe (patch) | |
| tree | e8655f6472b305d43a2f23059c375c90e7004a2b /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-818254916cb562422b3a3301b9f35fafd64ee3fe.zip opensim-SC_OLD-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.gz opensim-SC_OLD-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.bz2 opensim-SC_OLD-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.xz | |
JustinCC's core re-merge
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index fa7f9e9..f1964f3 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2541,7 +2541,9 @@ | |||
| 2541 | <Reference name="log4net" path="../../../../../bin/"/> | 2541 | <Reference name="log4net" path="../../../../../bin/"/> |
| 2542 | 2542 | ||
| 2543 | <Files> | 2543 | <Files> |
| 2544 | <Match pattern="*.cs" recurse="true"/> | 2544 | <Match pattern="*.cs" recurse="true"> |
| 2545 | <Exclude name="Tests" pattern="Tests"/> | ||
| 2546 | </Match> | ||
| 2545 | </Files> | 2547 | </Files> |
| 2546 | </Project> | 2548 | </Project> |
| 2547 | 2549 | ||
| @@ -3409,6 +3411,7 @@ | |||
| 3409 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 3411 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
| 3410 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> | 3412 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> |
| 3411 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> | 3413 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> |
| 3414 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Instance"/> | ||
| 3412 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | 3415 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> |
| 3413 | <Reference name="OpenSim.Services.Interfaces"/> | 3416 | <Reference name="OpenSim.Services.Interfaces"/> |
| 3414 | <Reference name="OpenSim.Tests.Common"/> | 3417 | <Reference name="OpenSim.Tests.Common"/> |
| @@ -3432,6 +3435,7 @@ | |||
| 3432 | <!-- SADLY the way this works means you need to keep adding these paths --> | 3435 | <!-- SADLY the way this works means you need to keep adding these paths --> |
| 3433 | <Match path="Shared/Tests" pattern="*.cs" recurse="true"/> | 3436 | <Match path="Shared/Tests" pattern="*.cs" recurse="true"/> |
| 3434 | <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true"/> | 3437 | <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true"/> |
| 3438 | <Match path="Shared/Instance/Tests" pattern="*.cs" recurse="true"/> | ||
| 3435 | <Match path="XEngine/Tests" pattern="*.cs" recurse="true"/> | 3439 | <Match path="XEngine/Tests" pattern="*.cs" recurse="true"/> |
| 3436 | </Files> | 3440 | </Files> |
| 3437 | </Project> | 3441 | </Project> |