diff options
author | BlueWall | 2012-10-09 06:44:14 -0400 |
---|---|---|
committer | BlueWall | 2012-10-09 06:44:14 -0400 |
commit | 252af020b05f386f88174cdd28191e0efbeba626 (patch) | |
tree | f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /prebuild.xml | |
parent | Added parts to manage repositories and plugin management (diff) | |
parent | Fix build break (diff) | |
download | opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2 opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/ServerMain.cs
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 209 |
1 files changed, 105 insertions, 104 deletions
diff --git a/prebuild.xml b/prebuild.xml index fe8dcef..ca27e2c 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1382,110 +1382,6 @@ | |||
1382 | </Files> | 1382 | </Files> |
1383 | </Project> | 1383 | </Project> |
1384 | 1384 | ||
1385 | <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> | ||
1386 | <Configuration name="Debug"> | ||
1387 | <Options> | ||
1388 | <OutputPath>../../../bin/</OutputPath> | ||
1389 | <AllowUnsafe>true</AllowUnsafe> | ||
1390 | </Options> | ||
1391 | </Configuration> | ||
1392 | <Configuration name="Release"> | ||
1393 | <Options> | ||
1394 | <OutputPath>../../../bin/</OutputPath> | ||
1395 | <AllowUnsafe>true</AllowUnsafe> | ||
1396 | </Options> | ||
1397 | </Configuration> | ||
1398 | |||
1399 | <ReferencePath>../../../bin/</ReferencePath> | ||
1400 | <Reference name="System"/> | ||
1401 | <Reference name="System.Core"/> | ||
1402 | <Reference name="System.Xml"/> | ||
1403 | <Reference name="System.Xml.Linq"/> | ||
1404 | <Reference name="System.Drawing"/> | ||
1405 | <Reference name="System.Web"/> | ||
1406 | <Reference name="NDesk.Options" path="../../../bin/"/> | ||
1407 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1408 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1409 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1410 | <Reference name="CSJ2K" path="../../../bin/"/> | ||
1411 | <Reference name="Warp3D" path="../../../bin/"/> | ||
1412 | <Reference name="OpenSim.Capabilities"/> | ||
1413 | <Reference name="OpenSim.Data"/> | ||
1414 | <Reference name="OpenSim.Framework"/> | ||
1415 | <Reference name="OpenSim.Framework.Communications"/> | ||
1416 | <Reference name="OpenSim.Framework.Console"/> | ||
1417 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1418 | <Reference name="OpenSim.Framework.Serialization"/> | ||
1419 | <Reference name="OpenSim.Framework.Servers"/> | ||
1420 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1421 | <Reference name="OpenSim.Region.Framework"/> | ||
1422 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
1423 | <Reference name="OpenSim.Server.Base"/> | ||
1424 | <Reference name="OpenSim.Server.Handlers"/> | ||
1425 | <Reference name="OpenSim.Services.Connectors"/> | ||
1426 | <Reference name="OpenSim.Services.Base"/> | ||
1427 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1428 | <Reference name="Ionic.Zip" path="../../../bin/"/> | ||
1429 | |||
1430 | <Reference name="GlynnTucker.Cache" path="../../../bin/"/> | ||
1431 | |||
1432 | <!-- For scripting in funny languages by default --> | ||
1433 | <Reference name="XMLRPC" path="../../../bin/"/> | ||
1434 | <Reference name="OpenSim.Framework.Communications"/> | ||
1435 | <Reference name="Nini" path="../../../bin/"/> | ||
1436 | <Reference name="log4net" path="../../../bin/"/> | ||
1437 | <Reference name="DotNetOpenMail" path="../../../bin/"/> | ||
1438 | |||
1439 | <!-- To allow regions to have mono addins --> | ||
1440 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1441 | |||
1442 | <Files> | ||
1443 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1444 | <Match pattern="*.cs" recurse="true"> | ||
1445 | <Exclude name="Tests" pattern="Tests"/> | ||
1446 | </Match> | ||
1447 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1448 | </Files> | ||
1449 | </Project> | ||
1450 | |||
1451 | <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library"> | ||
1452 | <Configuration name="Debug"> | ||
1453 | <Options> | ||
1454 | <OutputPath>../../../bin/</OutputPath> | ||
1455 | </Options> | ||
1456 | </Configuration> | ||
1457 | <Configuration name="Release"> | ||
1458 | <Options> | ||
1459 | <OutputPath>../../../bin/</OutputPath> | ||
1460 | </Options> | ||
1461 | </Configuration> | ||
1462 | |||
1463 | <ReferencePath>../../../bin/</ReferencePath> | ||
1464 | <Reference name="System"/> | ||
1465 | <Reference name="System.Xml"/> | ||
1466 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1467 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1468 | <Reference name="OpenSim.Framework"/> | ||
1469 | <Reference name="OpenSim.Framework.Communications"/> | ||
1470 | <Reference name="OpenSim.Region.Framework"/> | ||
1471 | <Reference name="OpenSim.Server.Base"/> | ||
1472 | <Reference name="OpenSim.Server.Handlers"/> | ||
1473 | <Reference name="OpenSim.Framework.Console"/> | ||
1474 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
1475 | <Reference name="OpenSim.Framework.Communications"/> | ||
1476 | <Reference name="OpenSim.Region.CoreModules"/> | ||
1477 | <Reference name="Nini" path="../../../bin/"/> | ||
1478 | <Reference name="log4net" path="../../../bin/"/> | ||
1479 | |||
1480 | <!-- To allow regions to have mono addins --> | ||
1481 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1482 | |||
1483 | <Files> | ||
1484 | <Match pattern="*.cs" recurse="true"/> | ||
1485 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1486 | </Files> | ||
1487 | </Project> | ||
1488 | |||
1489 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> | 1385 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> |
1490 | <Configuration name="Debug"> | 1386 | <Configuration name="Debug"> |
1491 | <Options> | 1387 | <Options> |
@@ -1606,6 +1502,111 @@ | |||
1606 | </Files> | 1502 | </Files> |
1607 | </Project> | 1503 | </Project> |
1608 | 1504 | ||
1505 | <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> | ||
1506 | <Configuration name="Debug"> | ||
1507 | <Options> | ||
1508 | <OutputPath>../../../bin/</OutputPath> | ||
1509 | <AllowUnsafe>true</AllowUnsafe> | ||
1510 | </Options> | ||
1511 | </Configuration> | ||
1512 | <Configuration name="Release"> | ||
1513 | <Options> | ||
1514 | <OutputPath>../../../bin/</OutputPath> | ||
1515 | <AllowUnsafe>true</AllowUnsafe> | ||
1516 | </Options> | ||
1517 | </Configuration> | ||
1518 | |||
1519 | <ReferencePath>../../../bin/</ReferencePath> | ||
1520 | <Reference name="System"/> | ||
1521 | <Reference name="System.Core"/> | ||
1522 | <Reference name="System.Xml"/> | ||
1523 | <Reference name="System.Xml.Linq"/> | ||
1524 | <Reference name="System.Drawing"/> | ||
1525 | <Reference name="System.Web"/> | ||
1526 | <Reference name="NDesk.Options" path="../../../bin/"/> | ||
1527 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1528 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1529 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1530 | <Reference name="CSJ2K" path="../../../bin/"/> | ||
1531 | <Reference name="Warp3D" path="../../../bin/"/> | ||
1532 | <Reference name="OpenSim.Capabilities"/> | ||
1533 | <Reference name="OpenSim.Data"/> | ||
1534 | <Reference name="OpenSim.Framework"/> | ||
1535 | <Reference name="OpenSim.Framework.Communications"/> | ||
1536 | <Reference name="OpenSim.Framework.Console"/> | ||
1537 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1538 | <Reference name="OpenSim.Framework.Serialization"/> | ||
1539 | <Reference name="OpenSim.Framework.Servers"/> | ||
1540 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1541 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | ||
1542 | <Reference name="OpenSim.Region.Framework"/> | ||
1543 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
1544 | <Reference name="OpenSim.Server.Base"/> | ||
1545 | <Reference name="OpenSim.Server.Handlers"/> | ||
1546 | <Reference name="OpenSim.Services.Connectors"/> | ||
1547 | <Reference name="OpenSim.Services.Base"/> | ||
1548 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1549 | <Reference name="Ionic.Zip" path="../../../bin/"/> | ||
1550 | |||
1551 | <Reference name="GlynnTucker.Cache" path="../../../bin/"/> | ||
1552 | |||
1553 | <!-- For scripting in funny languages by default --> | ||
1554 | <Reference name="XMLRPC" path="../../../bin/"/> | ||
1555 | <Reference name="OpenSim.Framework.Communications"/> | ||
1556 | <Reference name="Nini" path="../../../bin/"/> | ||
1557 | <Reference name="log4net" path="../../../bin/"/> | ||
1558 | <Reference name="DotNetOpenMail" path="../../../bin/"/> | ||
1559 | |||
1560 | <!-- To allow regions to have mono addins --> | ||
1561 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1562 | |||
1563 | <Files> | ||
1564 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1565 | <Match pattern="*.cs" recurse="true"> | ||
1566 | <Exclude name="Tests" pattern="Tests"/> | ||
1567 | </Match> | ||
1568 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1569 | </Files> | ||
1570 | </Project> | ||
1571 | |||
1572 | <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library"> | ||
1573 | <Configuration name="Debug"> | ||
1574 | <Options> | ||
1575 | <OutputPath>../../../bin/</OutputPath> | ||
1576 | </Options> | ||
1577 | </Configuration> | ||
1578 | <Configuration name="Release"> | ||
1579 | <Options> | ||
1580 | <OutputPath>../../../bin/</OutputPath> | ||
1581 | </Options> | ||
1582 | </Configuration> | ||
1583 | |||
1584 | <ReferencePath>../../../bin/</ReferencePath> | ||
1585 | <Reference name="System"/> | ||
1586 | <Reference name="System.Xml"/> | ||
1587 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1588 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1589 | <Reference name="OpenSim.Framework"/> | ||
1590 | <Reference name="OpenSim.Framework.Communications"/> | ||
1591 | <Reference name="OpenSim.Region.Framework"/> | ||
1592 | <Reference name="OpenSim.Server.Base"/> | ||
1593 | <Reference name="OpenSim.Server.Handlers"/> | ||
1594 | <Reference name="OpenSim.Framework.Console"/> | ||
1595 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
1596 | <Reference name="OpenSim.Framework.Communications"/> | ||
1597 | <Reference name="OpenSim.Region.CoreModules"/> | ||
1598 | <Reference name="Nini" path="../../../bin/"/> | ||
1599 | <Reference name="log4net" path="../../../bin/"/> | ||
1600 | |||
1601 | <!-- To allow regions to have mono addins --> | ||
1602 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1603 | |||
1604 | <Files> | ||
1605 | <Match pattern="*.cs" recurse="true"/> | ||
1606 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1607 | </Files> | ||
1608 | </Project> | ||
1609 | |||
1609 | <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> | 1610 | <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> |
1610 | <Configuration name="Debug"> | 1611 | <Configuration name="Debug"> |
1611 | <Options> | 1612 | <Options> |