diff options
author | Melanie | 2009-10-22 07:12:10 +0100 |
---|---|---|
committer | Melanie | 2009-10-22 07:12:10 +0100 |
commit | c4969d47d9bbc22b37054451cd31451ca8d8c78a (patch) | |
tree | 788e3b034254bcf068ca950ee97a78b6aa07b386 /prebuild.xml | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Remove the "mel_t" from version string (diff) | |
download | opensim-SC-c4969d47d9bbc22b37054451cd31451ca8d8c78a.zip opensim-SC-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.gz opensim-SC-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.bz2 opensim-SC-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 124 |
1 files changed, 23 insertions, 101 deletions
diff --git a/prebuild.xml b/prebuild.xml index 1a491a7..81f907d 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -117,6 +117,28 @@ | |||
117 | </Files> | 117 | </Files> |
118 | </Project> | 118 | </Project> |
119 | 119 | ||
120 | <Project frameworkVersion="v3_5" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library"> | ||
121 | <Configuration name="Debug"> | ||
122 | <Options> | ||
123 | <OutputPath>../../bin/</OutputPath> | ||
124 | </Options> | ||
125 | </Configuration> | ||
126 | <Configuration name="Release"> | ||
127 | <Options> | ||
128 | <OutputPath>../../bin/</OutputPath> | ||
129 | </Options> | ||
130 | </Configuration> | ||
131 | |||
132 | <ReferencePath>../../bin/</ReferencePath> | ||
133 | <Reference name="System"/> | ||
134 | <Reference name="System.Xml"/> | ||
135 | <Reference name="System.Data"/> | ||
136 | <Reference name="System.Web"/> | ||
137 | <Files> | ||
138 | <Match pattern="*.cs" recurse="false"/> | ||
139 | </Files> | ||
140 | </Project> | ||
141 | |||
120 | <Project frameworkVersion="v3_5" name="OpenSim.Framework" path="OpenSim/Framework" type="Library"> | 142 | <Project frameworkVersion="v3_5" name="OpenSim.Framework" path="OpenSim/Framework" type="Library"> |
121 | <Configuration name="Debug"> | 143 | <Configuration name="Debug"> |
122 | <Options> | 144 | <Options> |
@@ -145,6 +167,7 @@ | |||
145 | <Reference name="Nini.dll" /> | 167 | <Reference name="Nini.dll" /> |
146 | <Reference name="log4net.dll"/> | 168 | <Reference name="log4net.dll"/> |
147 | <Reference name="Mono.Addins.dll" /> | 169 | <Reference name="Mono.Addins.dll" /> |
170 | <Reference name="SmartThreadPool" /> | ||
148 | <Files> | 171 | <Files> |
149 | <Match pattern="*.cs" recurse="false"/> | 172 | <Match pattern="*.cs" recurse="false"/> |
150 | <Match path="Client" pattern="*.cs" recurse="true"/> | 173 | <Match path="Client" pattern="*.cs" recurse="true"/> |
@@ -2387,68 +2410,6 @@ | |||
2387 | </Files> | 2410 | </Files> |
2388 | </Project> | 2411 | </Project> |
2389 | 2412 | ||
2390 | <Project frameworkVersion="v3_5" name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library"> | ||
2391 | <Configuration name="Debug"> | ||
2392 | <Options> | ||
2393 | <OutputPath>../../../bin/</OutputPath> | ||
2394 | </Options> | ||
2395 | </Configuration> | ||
2396 | <Configuration name="Release"> | ||
2397 | <Options> | ||
2398 | <OutputPath>../../../bin/</OutputPath> | ||
2399 | </Options> | ||
2400 | </Configuration> | ||
2401 | |||
2402 | <ReferencePath>../../../bin/</ReferencePath> | ||
2403 | <Reference name="System"/> | ||
2404 | <Reference name="System.Xml"/> | ||
2405 | <Reference name="System.Data"/> | ||
2406 | <Reference name="System.Drawing"/> | ||
2407 | <Reference name="OpenSim.Data"/> | ||
2408 | <Reference name="OpenSim.Framework"/> | ||
2409 | <Reference name="OpenSim.Framework.Console"/> | ||
2410 | <Reference name="OpenSim.Region.Framework"/> | ||
2411 | <Reference name="OpenMetaverseTypes.dll"/> | ||
2412 | <Reference name="OpenMetaverse.dll"/> | ||
2413 | <Reference name="NHibernate.dll"/> | ||
2414 | <Reference name="log4net.dll"/> | ||
2415 | |||
2416 | <Files> | ||
2417 | <Match pattern="*.cs" recurse="true" > | ||
2418 | <Exclude name="Tests" pattern="Tests" /> | ||
2419 | </Match> | ||
2420 | <Match path="Resources" pattern="*.xml" buildAction="EmbeddedResource"/> | ||
2421 | <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> | ||
2422 | <!-- add more as you go --> | ||
2423 | <Match path="Resources/SQLiteDialect" pattern="*.sql" buildAction="EmbeddedResource"/> | ||
2424 | <Match path="Resources/MySQLDialect" pattern="*.sql" buildAction="EmbeddedResource"/> | ||
2425 | <Match path="Resources/MsSql2005Dialect" pattern="*.sql" buildAction="EmbeddedResource"/> | ||
2426 | <Match path="Resources/PostgreSQLDialect" pattern="*.sql" buildAction="EmbeddedResource"/> | ||
2427 | </Files> | ||
2428 | </Project> | ||
2429 | |||
2430 | <Project frameworkVersion="v3_5" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library"> | ||
2431 | <Configuration name="Debug"> | ||
2432 | <Options> | ||
2433 | <OutputPath>../../bin/</OutputPath> | ||
2434 | </Options> | ||
2435 | </Configuration> | ||
2436 | <Configuration name="Release"> | ||
2437 | <Options> | ||
2438 | <OutputPath>../../bin/</OutputPath> | ||
2439 | </Options> | ||
2440 | </Configuration> | ||
2441 | |||
2442 | <ReferencePath>../../bin/</ReferencePath> | ||
2443 | <Reference name="System"/> | ||
2444 | <Reference name="System.Xml"/> | ||
2445 | <Reference name="System.Data"/> | ||
2446 | <Reference name="System.Web"/> | ||
2447 | <Files> | ||
2448 | <Match pattern="*.cs" recurse="false"/> | ||
2449 | </Files> | ||
2450 | </Project> | ||
2451 | |||
2452 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> | 2413 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> |
2453 | <Configuration name="Debug"> | 2414 | <Configuration name="Debug"> |
2454 | <Options> | 2415 | <Options> |
@@ -3368,45 +3329,6 @@ | |||
3368 | </Files> | 3329 | </Files> |
3369 | </Project> | 3330 | </Project> |
3370 | 3331 | ||
3371 | <Project frameworkVersion="v3_5" name="OpenSim.Data.NHibernate.Tests" path="OpenSim/Data/NHibernate/Tests" type="Library"> | ||
3372 | <Configuration name="Debug"> | ||
3373 | <Options> | ||
3374 | <OutputPath>../../../../bin/</OutputPath> | ||
3375 | </Options> | ||
3376 | </Configuration> | ||
3377 | <Configuration name="Release"> | ||
3378 | <Options> | ||
3379 | <OutputPath>../../../../bin/</OutputPath> | ||
3380 | </Options> | ||
3381 | </Configuration> | ||
3382 | |||
3383 | <ReferencePath>../../../../bin/</ReferencePath> | ||
3384 | <Reference name="System"/> | ||
3385 | <Reference name="System.Xml"/> | ||
3386 | <Reference name="System.Data"/> | ||
3387 | <Reference name="System.Drawing"/> | ||
3388 | <Reference name="OpenSim.Framework"/> | ||
3389 | <Reference name="OpenSim.Data"/> | ||
3390 | <Reference name="OpenSim.Data.NHibernate"/> | ||
3391 | <Reference name="OpenSim.Data.Tests"/> | ||
3392 | <Reference name="OpenSim.Tests.Common"/> | ||
3393 | <Reference name="OpenSim.Framework.Console"/> | ||
3394 | <Reference name="OpenSim.Region.Framework"/> | ||
3395 | <Reference name="OpenMetaverseTypes.dll"/> | ||
3396 | <Reference name="OpenMetaverse.dll"/> | ||
3397 | <Reference name="MySql.Data.dll"/> | ||
3398 | <Reference name="Npgsql.dll"/> | ||
3399 | <Reference name="System.Data.SQLite.dll" /> | ||
3400 | <Reference name="log4net.dll"/> | ||
3401 | <Reference name="nunit.framework.dll" /> | ||
3402 | <Reference name="NHibernate.dll"/> | ||
3403 | <Reference name="Mono.Addins.dll" /> | ||
3404 | |||
3405 | <Files> | ||
3406 | <Match pattern="*.cs" recurse="true"/> | ||
3407 | </Files> | ||
3408 | </Project> | ||
3409 | |||
3410 | <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite.Tests" path="OpenSim/Data/SQLite/Tests" type="Library"> | 3332 | <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite.Tests" path="OpenSim/Data/SQLite/Tests" type="Library"> |
3411 | <Configuration name="Debug"> | 3333 | <Configuration name="Debug"> |
3412 | <Options> | 3334 | <Options> |