diff options
author | Melanie | 2009-10-02 08:23:38 +0100 |
---|---|---|
committer | Melanie | 2009-10-02 08:23:38 +0100 |
commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
tree | a2d60604317739fa530502c40ffc71bab2a5c494 /prebuild.xml | |
parent | Restore the missing image handling to the image manager. The missing (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz |
Merge branch 'master' into diva-textures
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 218 |
1 files changed, 160 insertions, 58 deletions
diff --git a/prebuild.xml b/prebuild.xml index 70f5cfd..22ff3d7 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -170,7 +170,9 @@ | |||
170 | <Reference name="OpenSim.Framework"/> | 170 | <Reference name="OpenSim.Framework"/> |
171 | 171 | ||
172 | <Files> | 172 | <Files> |
173 | <Match pattern="*.cs" recurse="true"/> | 173 | <Match pattern="*.cs" recurse="true"> |
174 | <Exclude name="Tests" pattern="Tests"/> | ||
175 | </Match> | ||
174 | </Files> | 176 | </Files> |
175 | </Project> | 177 | </Project> |
176 | 178 | ||
@@ -371,7 +373,6 @@ | |||
371 | <Reference name="System"/> | 373 | <Reference name="System"/> |
372 | <Reference name="System.Xml"/> | 374 | <Reference name="System.Xml"/> |
373 | <Reference name="OpenSim.Data"/> | 375 | <Reference name="OpenSim.Data"/> |
374 | <Reference name="OpenSim.Server.Base"/> | ||
375 | <Reference name="OpenSim.Framework"/> | 376 | <Reference name="OpenSim.Framework"/> |
376 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 377 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
377 | <Reference name="OpenSim.Framework.Console"/> | 378 | <Reference name="OpenSim.Framework.Console"/> |
@@ -956,7 +957,7 @@ | |||
956 | </Project> | 957 | </Project> |
957 | 958 | ||
958 | 959 | ||
959 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library"> | 960 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library"> |
960 | <Configuration name="Debug"> | 961 | <Configuration name="Debug"> |
961 | <Options> | 962 | <Options> |
962 | <OutputPath>../../../bin/</OutputPath> | 963 | <OutputPath>../../../bin/</OutputPath> |
@@ -972,23 +973,17 @@ | |||
972 | <Reference name="System"/> | 973 | <Reference name="System"/> |
973 | <Reference name="System.Data"/> | 974 | <Reference name="System.Data"/> |
974 | <Reference name="System.Xml"/> | 975 | <Reference name="System.Xml"/> |
975 | <Reference name="System.Web"/> | ||
976 | <Reference name="OpenSim.Framework"/> | 976 | <Reference name="OpenSim.Framework"/> |
977 | <Reference name="OpenSim.Framework.Console"/> | 977 | <Reference name="OpenSim.Framework.Console"/> |
978 | <Reference name="OpenSim.Framework.Communications"/> | 978 | <Reference name="OpenSim.Framework.Communications"/> |
979 | <Reference name="OpenSim.Data"/> | 979 | <Reference name="OpenSim.Data"/> |
980 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
981 | <Reference name="OpenSim.Framework.Servers"/> | 980 | <Reference name="OpenSim.Framework.Servers"/> |
982 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 981 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
983 | <Reference name="OpenSim.Framework.Statistics"/> | ||
984 | <Reference name="OpenSim.Grid.Framework"/> | 982 | <Reference name="OpenSim.Grid.Framework"/> |
985 | <Reference name="OpenSim.Grid.Communications.OGS1"/> | ||
986 | <Reference name="OpenMetaverse.dll"/> | ||
987 | <Reference name="OpenMetaverseTypes.dll"/> | 983 | <Reference name="OpenMetaverseTypes.dll"/> |
988 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 984 | <Reference name="OpenMetaverse.dll"/> |
989 | <Reference name="XMLRPC.dll"/> | 985 | <Reference name="XMLRPC.dll"/> |
990 | <Reference name="log4net.dll"/> | 986 | <Reference name="log4net.dll"/> |
991 | <Reference name="DotNetOpenId.dll"/> | ||
992 | 987 | ||
993 | <Files> | 988 | <Files> |
994 | <Match pattern="*.cs" recurse="true"/> | 989 | <Match pattern="*.cs" recurse="true"/> |
@@ -996,7 +991,7 @@ | |||
996 | </Project> | 991 | </Project> |
997 | 992 | ||
998 | 993 | ||
999 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe"> | 994 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe"> |
1000 | <Configuration name="Debug"> | 995 | <Configuration name="Debug"> |
1001 | <Options> | 996 | <Options> |
1002 | <OutputPath>../../../bin/</OutputPath> | 997 | <OutputPath>../../../bin/</OutputPath> |
@@ -1012,31 +1007,26 @@ | |||
1012 | <Reference name="System"/> | 1007 | <Reference name="System"/> |
1013 | <Reference name="System.Data"/> | 1008 | <Reference name="System.Data"/> |
1014 | <Reference name="System.Xml"/> | 1009 | <Reference name="System.Xml"/> |
1015 | <Reference name="System.Web"/> | ||
1016 | <Reference name="OpenSim.Framework"/> | 1010 | <Reference name="OpenSim.Framework"/> |
1017 | <Reference name="OpenSim.Framework.Console"/> | 1011 | <Reference name="OpenSim.Framework.Console"/> |
1018 | <Reference name="OpenSim.Framework.Communications"/> | 1012 | <Reference name="OpenSim.Framework.Communications"/> |
1019 | <Reference name="OpenSim.Data"/> | 1013 | <Reference name="OpenSim.Data"/> |
1020 | <Reference name="OpenSim.Framework.Servers"/> | 1014 | <Reference name="OpenSim.Framework.Servers"/> |
1021 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1015 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1022 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1023 | <Reference name="OpenSim.Grid.Communications.OGS1"/> | ||
1024 | <Reference name="OpenSim.Grid.Framework"/> | 1016 | <Reference name="OpenSim.Grid.Framework"/> |
1025 | <Reference name="OpenSim.Grid.UserServer.Modules"/> | 1017 | <Reference name="OpenSim.Grid.MessagingServer.Modules"/> |
1026 | <Reference name="OpenMetaverseTypes.dll"/> | 1018 | <Reference name="OpenMetaverseTypes.dll"/> |
1027 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1028 | <Reference name="OpenMetaverse.dll"/> | 1019 | <Reference name="OpenMetaverse.dll"/> |
1029 | <Reference name="XMLRPC.dll"/> | 1020 | <Reference name="XMLRPC.dll"/> |
1030 | <Reference name="log4net.dll"/> | 1021 | <Reference name="log4net.dll"/> |
1031 | <Reference name="Nini.dll"/> | 1022 | <Reference name="Nini.dll"/> |
1032 | <Reference name="DotNetOpenId.dll"/> | ||
1033 | 1023 | ||
1034 | <Files> | 1024 | <Files> |
1035 | <Match pattern="*.cs" recurse="true"/> | 1025 | <Match pattern="*.cs" recurse="true"/> |
1036 | </Files> | 1026 | </Files> |
1037 | </Project> | 1027 | </Project> |
1038 | 1028 | ||
1039 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library"> | 1029 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library"> |
1040 | <Configuration name="Debug"> | 1030 | <Configuration name="Debug"> |
1041 | <Options> | 1031 | <Options> |
1042 | <OutputPath>../../../bin/</OutputPath> | 1032 | <OutputPath>../../../bin/</OutputPath> |
@@ -1050,18 +1040,14 @@ | |||
1050 | 1040 | ||
1051 | <ReferencePath>../../../bin/</ReferencePath> | 1041 | <ReferencePath>../../../bin/</ReferencePath> |
1052 | <Reference name="System"/> | 1042 | <Reference name="System"/> |
1053 | <Reference name="System.Data"/> | ||
1054 | <Reference name="System.Xml"/> | 1043 | <Reference name="System.Xml"/> |
1044 | <Reference name="System.Web"/> | ||
1045 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1046 | <Reference name="OpenMetaverse.dll"/> | ||
1055 | <Reference name="OpenSim.Framework"/> | 1047 | <Reference name="OpenSim.Framework"/> |
1056 | <Reference name="OpenSim.Framework.Console"/> | 1048 | <Reference name="OpenSim.Framework.Console"/> |
1057 | <Reference name="OpenSim.Framework.Communications"/> | ||
1058 | <Reference name="OpenSim.Data"/> | ||
1059 | <Reference name="OpenSim.Framework.Servers"/> | ||
1060 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1049 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1061 | <Reference name="OpenSim.Grid.Framework"/> | 1050 | <Reference name="Nini.dll" /> |
1062 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1063 | <Reference name="OpenMetaverse.dll"/> | ||
1064 | <Reference name="XMLRPC.dll"/> | ||
1065 | <Reference name="log4net.dll"/> | 1051 | <Reference name="log4net.dll"/> |
1066 | 1052 | ||
1067 | <Files> | 1053 | <Files> |
@@ -1069,8 +1055,7 @@ | |||
1069 | </Files> | 1055 | </Files> |
1070 | </Project> | 1056 | </Project> |
1071 | 1057 | ||
1072 | 1058 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library"> | |
1073 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe"> | ||
1074 | <Configuration name="Debug"> | 1059 | <Configuration name="Debug"> |
1075 | <Options> | 1060 | <Options> |
1076 | <OutputPath>../../../bin/</OutputPath> | 1061 | <OutputPath>../../../bin/</OutputPath> |
@@ -1084,28 +1069,20 @@ | |||
1084 | 1069 | ||
1085 | <ReferencePath>../../../bin/</ReferencePath> | 1070 | <ReferencePath>../../../bin/</ReferencePath> |
1086 | <Reference name="System"/> | 1071 | <Reference name="System"/> |
1087 | <Reference name="System.Data"/> | ||
1088 | <Reference name="System.Xml"/> | ||
1089 | <Reference name="OpenSim.Framework"/> | ||
1090 | <Reference name="OpenSim.Framework.Console"/> | ||
1091 | <Reference name="OpenSim.Framework.Communications"/> | ||
1092 | <Reference name="OpenSim.Data"/> | ||
1093 | <Reference name="OpenSim.Framework.Servers"/> | ||
1094 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1095 | <Reference name="OpenSim.Grid.Framework"/> | ||
1096 | <Reference name="OpenSim.Grid.MessagingServer.Modules"/> | ||
1097 | <Reference name="OpenMetaverseTypes.dll"/> | 1072 | <Reference name="OpenMetaverseTypes.dll"/> |
1098 | <Reference name="OpenMetaverse.dll"/> | 1073 | <Reference name="OpenMetaverse.dll"/> |
1099 | <Reference name="XMLRPC.dll"/> | 1074 | <Reference name="OpenSim.Framework"/> |
1075 | <Reference name="OpenSim.Framework.Console"/> | ||
1076 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1077 | <Reference name="Nini.dll" /> | ||
1100 | <Reference name="log4net.dll"/> | 1078 | <Reference name="log4net.dll"/> |
1101 | <Reference name="Nini.dll"/> | ||
1102 | 1079 | ||
1103 | <Files> | 1080 | <Files> |
1104 | <Match pattern="*.cs" recurse="true"/> | 1081 | <Match pattern="*.cs" recurse="true"/> |
1105 | </Files> | 1082 | </Files> |
1106 | </Project> | 1083 | </Project> |
1107 | 1084 | ||
1108 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library"> | 1085 | <Project frameworkVersion="v3_5" name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library"> |
1109 | <Configuration name="Debug"> | 1086 | <Configuration name="Debug"> |
1110 | <Options> | 1087 | <Options> |
1111 | <OutputPath>../../../bin/</OutputPath> | 1088 | <OutputPath>../../../bin/</OutputPath> |
@@ -1123,7 +1100,10 @@ | |||
1123 | <Reference name="OpenMetaverse.dll"/> | 1100 | <Reference name="OpenMetaverse.dll"/> |
1124 | <Reference name="OpenSim.Framework"/> | 1101 | <Reference name="OpenSim.Framework"/> |
1125 | <Reference name="OpenSim.Framework.Console"/> | 1102 | <Reference name="OpenSim.Framework.Console"/> |
1103 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1126 | <Reference name="OpenSim.Services.Interfaces"/> | 1104 | <Reference name="OpenSim.Services.Interfaces"/> |
1105 | <Reference name="OpenSim.Services.Base"/> | ||
1106 | <Reference name="OpenSim.Data"/> | ||
1127 | <Reference name="Nini.dll" /> | 1107 | <Reference name="Nini.dll" /> |
1128 | <Reference name="log4net.dll"/> | 1108 | <Reference name="log4net.dll"/> |
1129 | 1109 | ||
@@ -1132,7 +1112,7 @@ | |||
1132 | </Files> | 1112 | </Files> |
1133 | </Project> | 1113 | </Project> |
1134 | 1114 | ||
1135 | <Project frameworkVersion="v3_5" name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library"> | 1115 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library"> |
1136 | <Configuration name="Debug"> | 1116 | <Configuration name="Debug"> |
1137 | <Options> | 1117 | <Options> |
1138 | <OutputPath>../../../bin/</OutputPath> | 1118 | <OutputPath>../../../bin/</OutputPath> |
@@ -1146,23 +1126,28 @@ | |||
1146 | 1126 | ||
1147 | <ReferencePath>../../../bin/</ReferencePath> | 1127 | <ReferencePath>../../../bin/</ReferencePath> |
1148 | <Reference name="System"/> | 1128 | <Reference name="System"/> |
1129 | <Reference name="System.Xml"/> | ||
1130 | <Reference name="System.Drawing"/> | ||
1149 | <Reference name="OpenMetaverseTypes.dll"/> | 1131 | <Reference name="OpenMetaverseTypes.dll"/> |
1150 | <Reference name="OpenMetaverse.dll"/> | 1132 | <Reference name="OpenMetaverse.dll"/> |
1133 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1134 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1151 | <Reference name="OpenSim.Framework"/> | 1135 | <Reference name="OpenSim.Framework"/> |
1136 | <Reference name="OpenSim.Framework.Communications"/> | ||
1152 | <Reference name="OpenSim.Framework.Console"/> | 1137 | <Reference name="OpenSim.Framework.Console"/> |
1153 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1138 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1154 | <Reference name="OpenSim.Services.Interfaces"/> | 1139 | <Reference name="OpenSim.Server.Base"/> |
1155 | <Reference name="OpenSim.Services.Base"/> | ||
1156 | <Reference name="OpenSim.Data"/> | ||
1157 | <Reference name="Nini.dll" /> | 1140 | <Reference name="Nini.dll" /> |
1158 | <Reference name="log4net.dll"/> | 1141 | <Reference name="log4net.dll"/> |
1142 | <Reference name="XMLRPC.dll" /> | ||
1159 | 1143 | ||
1160 | <Files> | 1144 | <Files> |
1161 | <Match pattern="*.cs" recurse="true"/> | 1145 | <Match pattern="*.cs" recurse="true"/> |
1162 | </Files> | 1146 | </Files> |
1163 | </Project> | 1147 | </Project> |
1164 | 1148 | ||
1165 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library"> | 1149 | |
1150 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library"> | ||
1166 | <Configuration name="Debug"> | 1151 | <Configuration name="Debug"> |
1167 | <Options> | 1152 | <Options> |
1168 | <OutputPath>../../../bin/</OutputPath> | 1153 | <OutputPath>../../../bin/</OutputPath> |
@@ -1176,25 +1161,75 @@ | |||
1176 | 1161 | ||
1177 | <ReferencePath>../../../bin/</ReferencePath> | 1162 | <ReferencePath>../../../bin/</ReferencePath> |
1178 | <Reference name="System"/> | 1163 | <Reference name="System"/> |
1164 | <Reference name="System.Data"/> | ||
1179 | <Reference name="System.Xml"/> | 1165 | <Reference name="System.Xml"/> |
1180 | <Reference name="OpenMetaverseTypes.dll"/> | 1166 | <Reference name="System.Web"/> |
1167 | <Reference name="OpenSim.Framework"/> | ||
1168 | <Reference name="OpenSim.Framework.Console"/> | ||
1169 | <Reference name="OpenSim.Framework.Communications"/> | ||
1170 | <Reference name="OpenSim.Data"/> | ||
1171 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1172 | <Reference name="OpenSim.Framework.Servers"/> | ||
1173 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1174 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1175 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1176 | <Reference name="OpenSim.Services.Connectors"/> | ||
1177 | <Reference name="OpenSim.Grid.Framework"/> | ||
1178 | <Reference name="OpenSim.Grid.Communications.OGS1"/> | ||
1181 | <Reference name="OpenMetaverse.dll"/> | 1179 | <Reference name="OpenMetaverse.dll"/> |
1180 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1182 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 1181 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
1183 | <Reference name="OpenSim.Services.Interfaces"/> | 1182 | <Reference name="XMLRPC.dll"/> |
1183 | <Reference name="log4net.dll"/> | ||
1184 | <Reference name="DotNetOpenId.dll"/> | ||
1185 | <Reference name="Nini.dll"/> | ||
1186 | |||
1187 | <Files> | ||
1188 | <Match pattern="*.cs" recurse="true"/> | ||
1189 | </Files> | ||
1190 | </Project> | ||
1191 | |||
1192 | |||
1193 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe"> | ||
1194 | <Configuration name="Debug"> | ||
1195 | <Options> | ||
1196 | <OutputPath>../../../bin/</OutputPath> | ||
1197 | </Options> | ||
1198 | </Configuration> | ||
1199 | <Configuration name="Release"> | ||
1200 | <Options> | ||
1201 | <OutputPath>../../../bin/</OutputPath> | ||
1202 | </Options> | ||
1203 | </Configuration> | ||
1204 | |||
1205 | <ReferencePath>../../../bin/</ReferencePath> | ||
1206 | <Reference name="System"/> | ||
1207 | <Reference name="System.Data"/> | ||
1208 | <Reference name="System.Xml"/> | ||
1209 | <Reference name="System.Web"/> | ||
1184 | <Reference name="OpenSim.Framework"/> | 1210 | <Reference name="OpenSim.Framework"/> |
1185 | <Reference name="OpenSim.Framework.Communications"/> | ||
1186 | <Reference name="OpenSim.Framework.Console"/> | 1211 | <Reference name="OpenSim.Framework.Console"/> |
1212 | <Reference name="OpenSim.Framework.Communications"/> | ||
1213 | <Reference name="OpenSim.Data"/> | ||
1214 | <Reference name="OpenSim.Framework.Servers"/> | ||
1187 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1215 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1188 | <Reference name="Nini.dll" /> | 1216 | <Reference name="OpenSim.Framework.Statistics"/> |
1217 | <Reference name="OpenSim.Grid.Communications.OGS1"/> | ||
1218 | <Reference name="OpenSim.Grid.Framework"/> | ||
1219 | <Reference name="OpenSim.Grid.UserServer.Modules"/> | ||
1220 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1221 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1222 | <Reference name="OpenMetaverse.dll"/> | ||
1223 | <Reference name="XMLRPC.dll"/> | ||
1189 | <Reference name="log4net.dll"/> | 1224 | <Reference name="log4net.dll"/> |
1190 | <Reference name="XMLRPC.dll" /> | 1225 | <Reference name="Nini.dll"/> |
1226 | <Reference name="DotNetOpenId.dll"/> | ||
1191 | 1227 | ||
1192 | <Files> | 1228 | <Files> |
1193 | <Match pattern="*.cs" recurse="true"/> | 1229 | <Match pattern="*.cs" recurse="true"/> |
1194 | </Files> | 1230 | </Files> |
1195 | </Project> | 1231 | </Project> |
1196 | 1232 | ||
1197 | |||
1198 | <Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library"> | 1233 | <Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library"> |
1199 | <Configuration name="Debug"> | 1234 | <Configuration name="Debug"> |
1200 | <Options> | 1235 | <Options> |
@@ -1319,7 +1354,7 @@ | |||
1319 | </Files> | 1354 | </Files> |
1320 | </Project> | 1355 | </Project> |
1321 | 1356 | ||
1322 | <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library"> | 1357 | <Project frameworkVersion="v3_5" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library"> |
1323 | <Configuration name="Debug"> | 1358 | <Configuration name="Debug"> |
1324 | <Options> | 1359 | <Options> |
1325 | <OutputPath>../../../bin/</OutputPath> | 1360 | <OutputPath>../../../bin/</OutputPath> |
@@ -1336,7 +1371,6 @@ | |||
1336 | <Reference name="OpenMetaverseTypes.dll"/> | 1371 | <Reference name="OpenMetaverseTypes.dll"/> |
1337 | <Reference name="OpenMetaverse.dll"/> | 1372 | <Reference name="OpenMetaverse.dll"/> |
1338 | <Reference name="OpenSim.Framework"/> | 1373 | <Reference name="OpenSim.Framework"/> |
1339 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1340 | <Reference name="OpenSim.Framework.Console"/> | 1374 | <Reference name="OpenSim.Framework.Console"/> |
1341 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1375 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1342 | <Reference name="OpenSim.Services.Interfaces"/> | 1376 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -1351,7 +1385,7 @@ | |||
1351 | </Files> | 1385 | </Files> |
1352 | </Project> | 1386 | </Project> |
1353 | 1387 | ||
1354 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library"> | 1388 | <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library"> |
1355 | <Configuration name="Debug"> | 1389 | <Configuration name="Debug"> |
1356 | <Options> | 1390 | <Options> |
1357 | <OutputPath>../../../bin/</OutputPath> | 1391 | <OutputPath>../../../bin/</OutputPath> |
@@ -1365,13 +1399,16 @@ | |||
1365 | 1399 | ||
1366 | <ReferencePath>../../../bin/</ReferencePath> | 1400 | <ReferencePath>../../../bin/</ReferencePath> |
1367 | <Reference name="System"/> | 1401 | <Reference name="System"/> |
1368 | <Reference name="System.Xml"/> | ||
1369 | <Reference name="System.Web"/> | ||
1370 | <Reference name="OpenMetaverseTypes.dll"/> | 1402 | <Reference name="OpenMetaverseTypes.dll"/> |
1371 | <Reference name="OpenMetaverse.dll"/> | 1403 | <Reference name="OpenMetaverse.dll"/> |
1372 | <Reference name="OpenSim.Framework"/> | 1404 | <Reference name="OpenSim.Framework"/> |
1405 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1373 | <Reference name="OpenSim.Framework.Console"/> | 1406 | <Reference name="OpenSim.Framework.Console"/> |
1374 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1407 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1408 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1409 | <Reference name="OpenSim.Services.Base"/> | ||
1410 | <Reference name="OpenSim.Services.Connectors"/> | ||
1411 | <Reference name="OpenSim.Data"/> | ||
1375 | <Reference name="Nini.dll" /> | 1412 | <Reference name="Nini.dll" /> |
1376 | <Reference name="log4net.dll"/> | 1413 | <Reference name="log4net.dll"/> |
1377 | 1414 | ||
@@ -1380,6 +1417,7 @@ | |||
1380 | </Files> | 1417 | </Files> |
1381 | </Project> | 1418 | </Project> |
1382 | 1419 | ||
1420 | |||
1383 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> | 1421 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> |
1384 | <Configuration name="Debug"> | 1422 | <Configuration name="Debug"> |
1385 | <Options> | 1423 | <Options> |
@@ -3134,7 +3172,7 @@ | |||
3134 | </Files> | 3172 | </Files> |
3135 | </Project> | 3173 | </Project> |
3136 | 3174 | ||
3137 | <Project name="lslc" path="OpenSim/Tools/Compiler" type="Exe"> | 3175 | <Project name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe"> |
3138 | <Configuration name="Debug"> | 3176 | <Configuration name="Debug"> |
3139 | <Options> | 3177 | <Options> |
3140 | <OutputPath>../../../bin/</OutputPath> | 3178 | <OutputPath>../../../bin/</OutputPath> |
@@ -3189,6 +3227,35 @@ | |||
3189 | </Files> | 3227 | </Files> |
3190 | </Project> | 3228 | </Project> |
3191 | 3229 | ||
3230 | <!-- Test Clients --> | ||
3231 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe"> | ||
3232 | <Configuration name="Debug"> | ||
3233 | <Options> | ||
3234 | <OutputPath>../../../../bin/</OutputPath> | ||
3235 | </Options> | ||
3236 | </Configuration> | ||
3237 | <Configuration name="Release"> | ||
3238 | <Options> | ||
3239 | <OutputPath>../../../../bin/</OutputPath> | ||
3240 | </Options> | ||
3241 | </Configuration> | ||
3242 | |||
3243 | <ReferencePath>../../../../bin/</ReferencePath> | ||
3244 | <Reference name="System"/> | ||
3245 | <Reference name="OpenMetaverseTypes.dll"/> | ||
3246 | <Reference name="OpenMetaverse.dll"/> | ||
3247 | <Reference name="OpenSim.Framework"/> | ||
3248 | <Reference name="OpenSim.Services.Interfaces" /> | ||
3249 | <Reference name="OpenSim.Services.Connectors" /> | ||
3250 | <Reference name="Nini.dll" /> | ||
3251 | <Reference name="log4net.dll"/> | ||
3252 | |||
3253 | <Files> | ||
3254 | <Match pattern="*.cs" recurse="true"/> | ||
3255 | </Files> | ||
3256 | </Project> | ||
3257 | |||
3258 | |||
3192 | <!-- Test assemblies --> | 3259 | <!-- Test assemblies --> |
3193 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> | 3260 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> |
3194 | <Configuration name="Debug"> | 3261 | <Configuration name="Debug"> |
@@ -3406,6 +3473,38 @@ | |||
3406 | </Files> | 3473 | </Files> |
3407 | </Project> | 3474 | </Project> |
3408 | 3475 | ||
3476 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library"> | ||
3477 | <Configuration name="Debug"> | ||
3478 | <Options> | ||
3479 | <OutputPath>../../../../bin/</OutputPath> | ||
3480 | </Options> | ||
3481 | </Configuration> | ||
3482 | <Configuration name="Release"> | ||
3483 | <Options> | ||
3484 | <OutputPath>../../../../bin/</OutputPath> | ||
3485 | </Options> | ||
3486 | </Configuration> | ||
3487 | |||
3488 | <ReferencePath>../../../../bin/</ReferencePath> | ||
3489 | <Reference name="System"/> | ||
3490 | <Reference name="OpenMetaverse.dll"/> | ||
3491 | <Reference name="OpenMetaverseTypes.dll"/> | ||
3492 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
3493 | <Reference name="OpenSim.Data"/> | ||
3494 | <Reference name="OpenSim.Services.Interfaces"/> | ||
3495 | <Reference name="OpenSim.Tests.Common"/> | ||
3496 | <Reference name="OpenSim.Framework"/> | ||
3497 | <Reference name="OpenSim.Framework.Serialization"/> | ||
3498 | <Reference name="OpenSim.Framework.Serialization.External"/> | ||
3499 | <Reference name="log4net.dll"/> | ||
3500 | <Reference name="nunit.framework.dll" /> | ||
3501 | |||
3502 | <Files> | ||
3503 | <Match pattern="*.cs" recurse="true"> | ||
3504 | </Match> | ||
3505 | </Files> | ||
3506 | </Project> | ||
3507 | |||
3409 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library"> | 3508 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library"> |
3410 | <Configuration name="Debug"> | 3509 | <Configuration name="Debug"> |
3411 | <Options> | 3510 | <Options> |
@@ -3531,6 +3630,7 @@ | |||
3531 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true" /> | 3630 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true" /> |
3532 | <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true" /> | 3631 | <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true" /> |
3533 | <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true" /> | 3632 | <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true" /> |
3633 | <Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true" /> | ||
3534 | </Files> | 3634 | </Files> |
3535 | </Project> | 3635 | </Project> |
3536 | 3636 | ||
@@ -3564,6 +3664,7 @@ | |||
3564 | <Reference name="OpenSim.Region.Framework"/> | 3664 | <Reference name="OpenSim.Region.Framework"/> |
3565 | <Reference name="OpenSim.Region.CoreModules"/> | 3665 | <Reference name="OpenSim.Region.CoreModules"/> |
3566 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3666 | <Reference name="OpenSim.Region.Physics.Manager"/> |
3667 | <Reference name="OpenSim.Services.Interfaces"/> | ||
3567 | 3668 | ||
3568 | <!-- Unit tests --> | 3669 | <!-- Unit tests --> |
3569 | <!-- <Reference name="OpenSim.Tests.Common"/> --> | 3670 | <!-- <Reference name="OpenSim.Tests.Common"/> --> |
@@ -3617,6 +3718,7 @@ | |||
3617 | <Reference name="OpenSim.Region.ClientStack"/> | 3718 | <Reference name="OpenSim.Region.ClientStack"/> |
3618 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 3719 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
3619 | <Reference name="OpenSim.Region.Framework"/> | 3720 | <Reference name="OpenSim.Region.Framework"/> |
3721 | <Reference name="OpenSim.Services.Interfaces"/> | ||
3620 | <Reference name="OpenSim.Tests.Common"/> | 3722 | <Reference name="OpenSim.Tests.Common"/> |
3621 | 3723 | ||
3622 | <Files> | 3724 | <Files> |