diff options
author | UbitUmarov | 2017-12-12 22:19:31 +0000 |
---|---|---|
committer | UbitUmarov | 2017-12-12 22:19:31 +0000 |
commit | ab0f866087f1565863ac516820761cb48386f96e (patch) | |
tree | e15b415a9feee5f042f4ca7f8d9eb05f536fddad /prebuild.xml | |
parent | Merge branch 'master' into httptests (diff) | |
parent | commit what i did so far for core mutes module, befere i lose it (diff) | |
download | opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.zip opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.gz opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.bz2 opensim-SC-ab0f866087f1565863ac516820761cb48386f96e.tar.xz |
Merge branch 'master' into httptests
# Conflicts:
# prebuild.xml
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 268 |
1 files changed, 149 insertions, 119 deletions
diff --git a/prebuild.xml b/prebuild.xml index 2d65db4..1f67063 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -99,6 +99,8 @@ | |||
99 | <Reference name="System.Data"/> | 99 | <Reference name="System.Data"/> |
100 | <Reference name="System.Drawing"/> | 100 | <Reference name="System.Drawing"/> |
101 | <Reference name="System.Web"/> | 101 | <Reference name="System.Web"/> |
102 | <Reference name="System.Security"/> | ||
103 | <Reference name="System.Security.Cryptography"/> | ||
102 | <Reference name="OpenMetaverseTypes" path="../../bin/"/> | 104 | <Reference name="OpenMetaverseTypes" path="../../bin/"/> |
103 | <Reference name="OpenMetaverse" path="../../bin/"/> | 105 | <Reference name="OpenMetaverse" path="../../bin/"/> |
104 | <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/> | 106 | <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/> |
@@ -1099,6 +1101,33 @@ | |||
1099 | </Files> | 1101 | </Files> |
1100 | </Project> | 1102 | </Project> |
1101 | 1103 | ||
1104 | <Project frameworkVersion="v4_5" name="OpenSim.Services.MuteListService" path="OpenSim/Services/MuteListService" type="Library"> | ||
1105 | <Configuration name="Debug"> | ||
1106 | <Options> | ||
1107 | <OutputPath>../../../bin/</OutputPath> | ||
1108 | </Options> | ||
1109 | </Configuration> | ||
1110 | <Configuration name="Release"> | ||
1111 | <Options> | ||
1112 | <OutputPath>../../../bin/</OutputPath> | ||
1113 | </Options> | ||
1114 | </Configuration> | ||
1115 | |||
1116 | <ReferencePath>../../../bin/</ReferencePath> | ||
1117 | <Reference name="System"/> | ||
1118 | <Reference name="OpenSim.Framework"/> | ||
1119 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1120 | <Reference name="OpenSim.Services.Base"/> | ||
1121 | <Reference name="OpenSim.Data"/> | ||
1122 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1123 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1124 | <Reference name="Nini" path="../../../bin/"/> | ||
1125 | <Reference name="log4net" path="../../../bin/"/> | ||
1126 | |||
1127 | <Files> | ||
1128 | <Match pattern="*.cs" recurse="true"/> | ||
1129 | </Files> | ||
1130 | </Project> | ||
1102 | <Project frameworkVersion="v4_5" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library"> | 1131 | <Project frameworkVersion="v4_5" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library"> |
1103 | <Configuration name="Debug"> | 1132 | <Configuration name="Debug"> |
1104 | <Options> | 1133 | <Options> |
@@ -1381,6 +1410,122 @@ | |||
1381 | </Files> | 1410 | </Files> |
1382 | </Project> | 1411 | </Project> |
1383 | 1412 | ||
1413 | |||
1414 | <!-- Data Base Modules --> | ||
1415 | <Project frameworkVersion="v4_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> | ||
1416 | <Configuration name="Debug"> | ||
1417 | <Options> | ||
1418 | <OutputPath>../../../bin/</OutputPath> | ||
1419 | </Options> | ||
1420 | </Configuration> | ||
1421 | <Configuration name="Release"> | ||
1422 | <Options> | ||
1423 | <OutputPath>../../../bin/</OutputPath> | ||
1424 | </Options> | ||
1425 | </Configuration> | ||
1426 | |||
1427 | <ReferencePath>../../../bin/</ReferencePath> | ||
1428 | <Reference name="System"/> | ||
1429 | <Reference name="System.Core"/> | ||
1430 | <Reference name="System.Data"/> | ||
1431 | <Reference name="System.Drawing"/> | ||
1432 | <Reference name="System.Xml"/> | ||
1433 | <Reference name="OpenSim.Framework"/> | ||
1434 | <Reference name="OpenSim.Data"/> | ||
1435 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1436 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1437 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1438 | <Reference name="MySql.Data" path="../../../bin/"/> | ||
1439 | <Reference name="OpenSim.Framework.Console"/> | ||
1440 | <Reference name="OpenSim.Region.Framework"/> | ||
1441 | <Reference name="log4net" path="../../../bin/"/> | ||
1442 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1443 | |||
1444 | <Files> | ||
1445 | <Match pattern="*.cs" recurse="true"> | ||
1446 | <Exclude name="Tests" pattern="Tests"/> | ||
1447 | </Match> | ||
1448 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.sql"/> | ||
1449 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/> | ||
1450 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1451 | </Files> | ||
1452 | </Project> | ||
1453 | |||
1454 | <Project frameworkVersion="v4_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library"> | ||
1455 | <Configuration name="Debug"> | ||
1456 | <Options> | ||
1457 | <OutputPath>../../../bin/</OutputPath> | ||
1458 | </Options> | ||
1459 | </Configuration> | ||
1460 | <Configuration name="Release"> | ||
1461 | <Options> | ||
1462 | <OutputPath>../../../bin/</OutputPath> | ||
1463 | </Options> | ||
1464 | </Configuration> | ||
1465 | |||
1466 | <ReferencePath>../../../bin/</ReferencePath> | ||
1467 | <Reference name="System"/> | ||
1468 | <Reference name="System.Core"/> | ||
1469 | <Reference name="System.Xml"/> | ||
1470 | <Reference name="System.Data"/> | ||
1471 | <Reference name="System.Drawing"/> | ||
1472 | <Reference name="OpenSim.Framework"/> | ||
1473 | <Reference name="OpenSim.Data"/> | ||
1474 | <Reference name="OpenSim.Region.Framework"/> | ||
1475 | <Reference name="OpenSim.Framework.Console"/> | ||
1476 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1477 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1478 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1479 | <Reference name="log4net" path="../../../bin/"/> | ||
1480 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1481 | <Reference name="Npgsql" path="../../../bin/"/> | ||
1482 | |||
1483 | <Files> | ||
1484 | <Match pattern="*.cs" recurse="true"/> | ||
1485 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/> | ||
1486 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1487 | </Files> | ||
1488 | </Project> | ||
1489 | |||
1490 | <Project frameworkVersion="v4_0" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library"> | ||
1491 | <Configuration name="Debug"> | ||
1492 | <Options> | ||
1493 | <OutputPath>../../../bin/</OutputPath> | ||
1494 | </Options> | ||
1495 | </Configuration> | ||
1496 | <Configuration name="Release"> | ||
1497 | <Options> | ||
1498 | <OutputPath>../../../bin/</OutputPath> | ||
1499 | </Options> | ||
1500 | </Configuration> | ||
1501 | |||
1502 | <ReferencePath>../../../bin/</ReferencePath> | ||
1503 | <Reference name="System"/> | ||
1504 | <Reference name="System.Core"/> | ||
1505 | <Reference name="System.Data"/> | ||
1506 | <Reference name="System.Drawing"/> | ||
1507 | <Reference name="System.Xml"/> | ||
1508 | <Reference name="OpenSim.Data"/> | ||
1509 | <Reference name="OpenSim.Framework"/> | ||
1510 | <Reference name="OpenSim.Framework.Console"/> | ||
1511 | <Reference name="OpenSim.Region.Framework"/> | ||
1512 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1513 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1514 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1515 | <Reference name="Mono.Data.Sqlite"/> | ||
1516 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1517 | <Reference name="log4net" path="../../../bin/"/> | ||
1518 | |||
1519 | <Files> | ||
1520 | <Match pattern="*.cs" recurse="true"> | ||
1521 | <Exclude name="Tests" pattern="Tests"/> | ||
1522 | </Match> | ||
1523 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.sql"/> | ||
1524 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/> | ||
1525 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1526 | </Files> | ||
1527 | </Project> | ||
1528 | |||
1384 | 1529 | ||
1385 | <Project frameworkVersion="v4_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> | 1530 | <Project frameworkVersion="v4_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> |
1386 | <Configuration name="Debug"> | 1531 | <Configuration name="Debug"> |
@@ -1403,6 +1548,7 @@ | |||
1403 | <Reference name="System.Xml.Linq"/> | 1548 | <Reference name="System.Xml.Linq"/> |
1404 | <Reference name="System.Drawing"/> | 1549 | <Reference name="System.Drawing"/> |
1405 | <Reference name="System.Web"/> | 1550 | <Reference name="System.Web"/> |
1551 | <Reference name="System.Data"/> | ||
1406 | <Reference name="Microsoft.CSharp" /> | 1552 | <Reference name="Microsoft.CSharp" /> |
1407 | <Reference name="NDesk.Options" path="../../../bin/"/> | 1553 | <Reference name="NDesk.Options" path="../../../bin/"/> |
1408 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 1554 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
@@ -1411,7 +1557,6 @@ | |||
1411 | <Reference name="CSJ2K" path="../../../bin/"/> | 1557 | <Reference name="CSJ2K" path="../../../bin/"/> |
1412 | <Reference name="Warp3D" path="../../../bin/"/> | 1558 | <Reference name="Warp3D" path="../../../bin/"/> |
1413 | <Reference name="OpenSim.Capabilities"/> | 1559 | <Reference name="OpenSim.Capabilities"/> |
1414 | <Reference name="OpenSim.Data"/> | ||
1415 | <Reference name="OpenSim.Framework"/> | 1560 | <Reference name="OpenSim.Framework"/> |
1416 | <Reference name="OpenSim.Framework.Console"/> | 1561 | <Reference name="OpenSim.Framework.Console"/> |
1417 | <Reference name="OpenSim.Framework.Monitoring"/> | 1562 | <Reference name="OpenSim.Framework.Monitoring"/> |
@@ -1426,7 +1571,10 @@ | |||
1426 | <Reference name="OpenSim.Services.Connectors"/> | 1571 | <Reference name="OpenSim.Services.Connectors"/> |
1427 | <Reference name="OpenSim.Services.Base"/> | 1572 | <Reference name="OpenSim.Services.Base"/> |
1428 | <Reference name="OpenSim.Services.Interfaces"/> | 1573 | <Reference name="OpenSim.Services.Interfaces"/> |
1574 | <Reference name="OpenSim.Data"/> | ||
1575 | <Reference name="OpenSim.Data.MySQL"/> | ||
1429 | <Reference name="Ionic.Zip" path="../../../bin/"/> | 1576 | <Reference name="Ionic.Zip" path="../../../bin/"/> |
1577 | <Reference name="MySql.Data" path="../../../bin/"/> | ||
1430 | 1578 | ||
1431 | <Reference name="GlynnTucker.Cache" path="../../../bin/"/> | 1579 | <Reference name="GlynnTucker.Cache" path="../../../bin/"/> |
1432 | 1580 | ||
@@ -1935,124 +2083,6 @@ | |||
1935 | 2083 | ||
1936 | <!-- Scene Server API Example Apps --> | 2084 | <!-- Scene Server API Example Apps --> |
1937 | 2085 | ||
1938 | <!-- Data Base Modules --> | ||
1939 | <Project frameworkVersion="v4_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> | ||
1940 | <Configuration name="Debug"> | ||
1941 | <Options> | ||
1942 | <OutputPath>../../../bin/</OutputPath> | ||
1943 | </Options> | ||
1944 | </Configuration> | ||
1945 | <Configuration name="Release"> | ||
1946 | <Options> | ||
1947 | <OutputPath>../../../bin/</OutputPath> | ||
1948 | </Options> | ||
1949 | </Configuration> | ||
1950 | |||
1951 | <ReferencePath>../../../bin/</ReferencePath> | ||
1952 | <Reference name="System"/> | ||
1953 | <Reference name="System.Core"/> | ||
1954 | <Reference name="System.Data"/> | ||
1955 | <Reference name="System.Drawing"/> | ||
1956 | <Reference name="System.Xml"/> | ||
1957 | <Reference name="OpenSim.Framework"/> | ||
1958 | <Reference name="OpenSim.Data"/> | ||
1959 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1960 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1961 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1962 | <Reference name="MySql.Data" path="../../../bin/"/> | ||
1963 | <Reference name="OpenSim.Framework.Console"/> | ||
1964 | <Reference name="OpenSim.Region.Framework"/> | ||
1965 | <Reference name="log4net" path="../../../bin/"/> | ||
1966 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1967 | |||
1968 | <Files> | ||
1969 | <Match pattern="*.cs" recurse="true"> | ||
1970 | <Exclude name="obj" pattern="obj"/> | ||
1971 | <Exclude name="Tests" pattern="Tests"/> | ||
1972 | </Match> | ||
1973 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.sql"/> | ||
1974 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/> | ||
1975 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1976 | </Files> | ||
1977 | </Project> | ||
1978 | |||
1979 | <Project frameworkVersion="v4_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library"> | ||
1980 | <Configuration name="Debug"> | ||
1981 | <Options> | ||
1982 | <OutputPath>../../../bin/</OutputPath> | ||
1983 | </Options> | ||
1984 | </Configuration> | ||
1985 | <Configuration name="Release"> | ||
1986 | <Options> | ||
1987 | <OutputPath>../../../bin/</OutputPath> | ||
1988 | </Options> | ||
1989 | </Configuration> | ||
1990 | |||
1991 | <ReferencePath>../../../bin/</ReferencePath> | ||
1992 | <Reference name="System"/> | ||
1993 | <Reference name="System.Core"/> | ||
1994 | <Reference name="System.Xml"/> | ||
1995 | <Reference name="System.Data"/> | ||
1996 | <Reference name="System.Drawing"/> | ||
1997 | <Reference name="OpenSim.Framework"/> | ||
1998 | <Reference name="OpenSim.Data"/> | ||
1999 | <Reference name="OpenSim.Region.Framework"/> | ||
2000 | <Reference name="OpenSim.Framework.Console"/> | ||
2001 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
2002 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
2003 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
2004 | <Reference name="log4net" path="../../../bin/"/> | ||
2005 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
2006 | <Reference name="Npgsql" path="../../../bin/"/> | ||
2007 | |||
2008 | <Files> | ||
2009 | <Match pattern="*.cs" recurse="true"/> | ||
2010 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/> | ||
2011 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
2012 | </Files> | ||
2013 | </Project> | ||
2014 | |||
2015 | <Project frameworkVersion="v4_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library"> | ||
2016 | <Configuration name="Debug"> | ||
2017 | <Options> | ||
2018 | <OutputPath>../../../bin/</OutputPath> | ||
2019 | </Options> | ||
2020 | </Configuration> | ||
2021 | <Configuration name="Release"> | ||
2022 | <Options> | ||
2023 | <OutputPath>../../../bin/</OutputPath> | ||
2024 | </Options> | ||
2025 | </Configuration> | ||
2026 | |||
2027 | <ReferencePath>../../../bin/</ReferencePath> | ||
2028 | <Reference name="System"/> | ||
2029 | <Reference name="System.Core"/> | ||
2030 | <Reference name="System.Data"/> | ||
2031 | <Reference name="System.Drawing"/> | ||
2032 | <Reference name="System.Xml"/> | ||
2033 | <Reference name="OpenSim.Data"/> | ||
2034 | <Reference name="OpenSim.Framework"/> | ||
2035 | <Reference name="OpenSim.Framework.Console"/> | ||
2036 | <Reference name="OpenSim.Region.Framework"/> | ||
2037 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
2038 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
2039 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
2040 | <Reference name="Mono.Data.Sqlite"/> | ||
2041 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
2042 | <Reference name="log4net" path="../../../bin/"/> | ||
2043 | |||
2044 | <Files> | ||
2045 | <Match pattern="*.cs" recurse="true"> | ||
2046 | <Exclude name="obj" pattern="obj"/> | ||
2047 | <Exclude name="Tests" pattern="Tests"/> | ||
2048 | </Match> | ||
2049 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.sql"/> | ||
2050 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/> | ||
2051 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
2052 | </Files> | ||
2053 | </Project> | ||
2054 | |||
2055 | |||
2056 | <Project frameworkVersion="v4_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> | 2086 | <Project frameworkVersion="v4_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> |
2057 | <Configuration name="Debug"> | 2087 | <Configuration name="Debug"> |
2058 | <Options> | 2088 | <Options> |