diff options
author | Melanie | 2009-10-05 10:17:23 +0100 |
---|---|---|
committer | Melanie | 2009-10-05 10:17:23 +0100 |
commit | 0744292b479446eb1ebec828afafacc0189709ca (patch) | |
tree | 3c43b5f425aff61d3625b75b7aef35ce5062ae56 /prebuild.xml | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Make the asset connector async Get overload return false if the asset (diff) | |
download | opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.zip opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.gz opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.bz2 opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 125 |
1 files changed, 64 insertions, 61 deletions
diff --git a/prebuild.xml b/prebuild.xml index 22ff3d7..f863ab6 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -957,7 +957,7 @@ | |||
957 | </Project> | 957 | </Project> |
958 | 958 | ||
959 | 959 | ||
960 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library"> | 960 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library"> |
961 | <Configuration name="Debug"> | 961 | <Configuration name="Debug"> |
962 | <Options> | 962 | <Options> |
963 | <OutputPath>../../../bin/</OutputPath> | 963 | <OutputPath>../../../bin/</OutputPath> |
@@ -971,18 +971,14 @@ | |||
971 | 971 | ||
972 | <ReferencePath>../../../bin/</ReferencePath> | 972 | <ReferencePath>../../../bin/</ReferencePath> |
973 | <Reference name="System"/> | 973 | <Reference name="System"/> |
974 | <Reference name="System.Data"/> | ||
975 | <Reference name="System.Xml"/> | 974 | <Reference name="System.Xml"/> |
975 | <Reference name="System.Web"/> | ||
976 | <Reference name="OpenMetaverseTypes.dll"/> | ||
977 | <Reference name="OpenMetaverse.dll"/> | ||
976 | <Reference name="OpenSim.Framework"/> | 978 | <Reference name="OpenSim.Framework"/> |
977 | <Reference name="OpenSim.Framework.Console"/> | 979 | <Reference name="OpenSim.Framework.Console"/> |
978 | <Reference name="OpenSim.Framework.Communications"/> | ||
979 | <Reference name="OpenSim.Data"/> | ||
980 | <Reference name="OpenSim.Framework.Servers"/> | ||
981 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 980 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
982 | <Reference name="OpenSim.Grid.Framework"/> | 981 | <Reference name="Nini.dll" /> |
983 | <Reference name="OpenMetaverseTypes.dll"/> | ||
984 | <Reference name="OpenMetaverse.dll"/> | ||
985 | <Reference name="XMLRPC.dll"/> | ||
986 | <Reference name="log4net.dll"/> | 982 | <Reference name="log4net.dll"/> |
987 | 983 | ||
988 | <Files> | 984 | <Files> |
@@ -990,8 +986,7 @@ | |||
990 | </Files> | 986 | </Files> |
991 | </Project> | 987 | </Project> |
992 | 988 | ||
993 | 989 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library"> | |
994 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe"> | ||
995 | <Configuration name="Debug"> | 990 | <Configuration name="Debug"> |
996 | <Options> | 991 | <Options> |
997 | <OutputPath>../../../bin/</OutputPath> | 992 | <OutputPath>../../../bin/</OutputPath> |
@@ -1005,28 +1000,20 @@ | |||
1005 | 1000 | ||
1006 | <ReferencePath>../../../bin/</ReferencePath> | 1001 | <ReferencePath>../../../bin/</ReferencePath> |
1007 | <Reference name="System"/> | 1002 | <Reference name="System"/> |
1008 | <Reference name="System.Data"/> | ||
1009 | <Reference name="System.Xml"/> | ||
1010 | <Reference name="OpenSim.Framework"/> | ||
1011 | <Reference name="OpenSim.Framework.Console"/> | ||
1012 | <Reference name="OpenSim.Framework.Communications"/> | ||
1013 | <Reference name="OpenSim.Data"/> | ||
1014 | <Reference name="OpenSim.Framework.Servers"/> | ||
1015 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1016 | <Reference name="OpenSim.Grid.Framework"/> | ||
1017 | <Reference name="OpenSim.Grid.MessagingServer.Modules"/> | ||
1018 | <Reference name="OpenMetaverseTypes.dll"/> | 1003 | <Reference name="OpenMetaverseTypes.dll"/> |
1019 | <Reference name="OpenMetaverse.dll"/> | 1004 | <Reference name="OpenMetaverse.dll"/> |
1020 | <Reference name="XMLRPC.dll"/> | 1005 | <Reference name="OpenSim.Framework"/> |
1006 | <Reference name="OpenSim.Framework.Console"/> | ||
1007 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1008 | <Reference name="Nini.dll" /> | ||
1021 | <Reference name="log4net.dll"/> | 1009 | <Reference name="log4net.dll"/> |
1022 | <Reference name="Nini.dll"/> | ||
1023 | 1010 | ||
1024 | <Files> | 1011 | <Files> |
1025 | <Match pattern="*.cs" recurse="true"/> | 1012 | <Match pattern="*.cs" recurse="true"/> |
1026 | </Files> | 1013 | </Files> |
1027 | </Project> | 1014 | </Project> |
1028 | 1015 | ||
1029 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library"> | 1016 | <Project frameworkVersion="v3_5" name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library"> |
1030 | <Configuration name="Debug"> | 1017 | <Configuration name="Debug"> |
1031 | <Options> | 1018 | <Options> |
1032 | <OutputPath>../../../bin/</OutputPath> | 1019 | <OutputPath>../../../bin/</OutputPath> |
@@ -1040,13 +1027,14 @@ | |||
1040 | 1027 | ||
1041 | <ReferencePath>../../../bin/</ReferencePath> | 1028 | <ReferencePath>../../../bin/</ReferencePath> |
1042 | <Reference name="System"/> | 1029 | <Reference name="System"/> |
1043 | <Reference name="System.Xml"/> | ||
1044 | <Reference name="System.Web"/> | ||
1045 | <Reference name="OpenMetaverseTypes.dll"/> | 1030 | <Reference name="OpenMetaverseTypes.dll"/> |
1046 | <Reference name="OpenMetaverse.dll"/> | 1031 | <Reference name="OpenMetaverse.dll"/> |
1047 | <Reference name="OpenSim.Framework"/> | 1032 | <Reference name="OpenSim.Framework"/> |
1048 | <Reference name="OpenSim.Framework.Console"/> | 1033 | <Reference name="OpenSim.Framework.Console"/> |
1049 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1034 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1035 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1036 | <Reference name="OpenSim.Services.Base"/> | ||
1037 | <Reference name="OpenSim.Data"/> | ||
1050 | <Reference name="Nini.dll" /> | 1038 | <Reference name="Nini.dll" /> |
1051 | <Reference name="log4net.dll"/> | 1039 | <Reference name="log4net.dll"/> |
1052 | 1040 | ||
@@ -1055,7 +1043,7 @@ | |||
1055 | </Files> | 1043 | </Files> |
1056 | </Project> | 1044 | </Project> |
1057 | 1045 | ||
1058 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library"> | 1046 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library"> |
1059 | <Configuration name="Debug"> | 1047 | <Configuration name="Debug"> |
1060 | <Options> | 1048 | <Options> |
1061 | <OutputPath>../../../bin/</OutputPath> | 1049 | <OutputPath>../../../bin/</OutputPath> |
@@ -1069,20 +1057,28 @@ | |||
1069 | 1057 | ||
1070 | <ReferencePath>../../../bin/</ReferencePath> | 1058 | <ReferencePath>../../../bin/</ReferencePath> |
1071 | <Reference name="System"/> | 1059 | <Reference name="System"/> |
1060 | <Reference name="System.Xml"/> | ||
1061 | <Reference name="System.Drawing"/> | ||
1072 | <Reference name="OpenMetaverseTypes.dll"/> | 1062 | <Reference name="OpenMetaverseTypes.dll"/> |
1073 | <Reference name="OpenMetaverse.dll"/> | 1063 | <Reference name="OpenMetaverse.dll"/> |
1064 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1065 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1074 | <Reference name="OpenSim.Framework"/> | 1066 | <Reference name="OpenSim.Framework"/> |
1067 | <Reference name="OpenSim.Framework.Communications"/> | ||
1075 | <Reference name="OpenSim.Framework.Console"/> | 1068 | <Reference name="OpenSim.Framework.Console"/> |
1076 | <Reference name="OpenSim.Services.Interfaces"/> | 1069 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1070 | <Reference name="OpenSim.Server.Base"/> | ||
1077 | <Reference name="Nini.dll" /> | 1071 | <Reference name="Nini.dll" /> |
1078 | <Reference name="log4net.dll"/> | 1072 | <Reference name="log4net.dll"/> |
1073 | <Reference name="XMLRPC.dll" /> | ||
1079 | 1074 | ||
1080 | <Files> | 1075 | <Files> |
1081 | <Match pattern="*.cs" recurse="true"/> | 1076 | <Match pattern="*.cs" recurse="true"/> |
1082 | </Files> | 1077 | </Files> |
1083 | </Project> | 1078 | </Project> |
1084 | 1079 | ||
1085 | <Project frameworkVersion="v3_5" name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library"> | 1080 | |
1081 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library"> | ||
1086 | <Configuration name="Debug"> | 1082 | <Configuration name="Debug"> |
1087 | <Options> | 1083 | <Options> |
1088 | <OutputPath>../../../bin/</OutputPath> | 1084 | <OutputPath>../../../bin/</OutputPath> |
@@ -1096,23 +1092,36 @@ | |||
1096 | 1092 | ||
1097 | <ReferencePath>../../../bin/</ReferencePath> | 1093 | <ReferencePath>../../../bin/</ReferencePath> |
1098 | <Reference name="System"/> | 1094 | <Reference name="System"/> |
1099 | <Reference name="OpenMetaverseTypes.dll"/> | 1095 | <Reference name="System.Data"/> |
1100 | <Reference name="OpenMetaverse.dll"/> | 1096 | <Reference name="System.Xml"/> |
1097 | <Reference name="System.Web"/> | ||
1101 | <Reference name="OpenSim.Framework"/> | 1098 | <Reference name="OpenSim.Framework"/> |
1102 | <Reference name="OpenSim.Framework.Console"/> | 1099 | <Reference name="OpenSim.Framework.Console"/> |
1100 | <Reference name="OpenSim.Framework.Communications"/> | ||
1101 | <Reference name="OpenSim.Data"/> | ||
1102 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1103 | <Reference name="OpenSim.Framework.Servers"/> | ||
1103 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1104 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1105 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1104 | <Reference name="OpenSim.Services.Interfaces"/> | 1106 | <Reference name="OpenSim.Services.Interfaces"/> |
1105 | <Reference name="OpenSim.Services.Base"/> | 1107 | <Reference name="OpenSim.Services.Connectors"/> |
1106 | <Reference name="OpenSim.Data"/> | 1108 | <Reference name="OpenSim.Grid.Framework"/> |
1107 | <Reference name="Nini.dll" /> | 1109 | <Reference name="OpenSim.Grid.Communications.OGS1"/> |
1110 | <Reference name="OpenMetaverse.dll"/> | ||
1111 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1112 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1113 | <Reference name="XMLRPC.dll"/> | ||
1108 | <Reference name="log4net.dll"/> | 1114 | <Reference name="log4net.dll"/> |
1115 | <Reference name="DotNetOpenId.dll"/> | ||
1116 | <Reference name="Nini.dll"/> | ||
1109 | 1117 | ||
1110 | <Files> | 1118 | <Files> |
1111 | <Match pattern="*.cs" recurse="true"/> | 1119 | <Match pattern="*.cs" recurse="true"/> |
1112 | </Files> | 1120 | </Files> |
1113 | </Project> | 1121 | </Project> |
1114 | 1122 | ||
1115 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library"> | 1123 | |
1124 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe"> | ||
1116 | <Configuration name="Debug"> | 1125 | <Configuration name="Debug"> |
1117 | <Options> | 1126 | <Options> |
1118 | <OutputPath>../../../bin/</OutputPath> | 1127 | <OutputPath>../../../bin/</OutputPath> |
@@ -1126,28 +1135,33 @@ | |||
1126 | 1135 | ||
1127 | <ReferencePath>../../../bin/</ReferencePath> | 1136 | <ReferencePath>../../../bin/</ReferencePath> |
1128 | <Reference name="System"/> | 1137 | <Reference name="System"/> |
1138 | <Reference name="System.Data"/> | ||
1129 | <Reference name="System.Xml"/> | 1139 | <Reference name="System.Xml"/> |
1130 | <Reference name="System.Drawing"/> | 1140 | <Reference name="System.Web"/> |
1131 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1132 | <Reference name="OpenMetaverse.dll"/> | ||
1133 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1134 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1135 | <Reference name="OpenSim.Framework"/> | 1141 | <Reference name="OpenSim.Framework"/> |
1136 | <Reference name="OpenSim.Framework.Communications"/> | ||
1137 | <Reference name="OpenSim.Framework.Console"/> | 1142 | <Reference name="OpenSim.Framework.Console"/> |
1143 | <Reference name="OpenSim.Framework.Communications"/> | ||
1144 | <Reference name="OpenSim.Data"/> | ||
1145 | <Reference name="OpenSim.Framework.Servers"/> | ||
1138 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1146 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1139 | <Reference name="OpenSim.Server.Base"/> | 1147 | <Reference name="OpenSim.Framework.Statistics"/> |
1140 | <Reference name="Nini.dll" /> | 1148 | <Reference name="OpenSim.Grid.Communications.OGS1"/> |
1149 | <Reference name="OpenSim.Grid.Framework"/> | ||
1150 | <Reference name="OpenSim.Grid.UserServer.Modules"/> | ||
1151 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1152 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1153 | <Reference name="OpenMetaverse.dll"/> | ||
1154 | <Reference name="XMLRPC.dll"/> | ||
1141 | <Reference name="log4net.dll"/> | 1155 | <Reference name="log4net.dll"/> |
1142 | <Reference name="XMLRPC.dll" /> | 1156 | <Reference name="Nini.dll"/> |
1157 | <Reference name="DotNetOpenId.dll"/> | ||
1143 | 1158 | ||
1144 | <Files> | 1159 | <Files> |
1145 | <Match pattern="*.cs" recurse="true"/> | 1160 | <Match pattern="*.cs" recurse="true"/> |
1146 | </Files> | 1161 | </Files> |
1147 | </Project> | 1162 | </Project> |
1148 | 1163 | ||
1149 | 1164 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library"> | |
1150 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library"> | ||
1151 | <Configuration name="Debug"> | 1165 | <Configuration name="Debug"> |
1152 | <Options> | 1166 | <Options> |
1153 | <OutputPath>../../../bin/</OutputPath> | 1167 | <OutputPath>../../../bin/</OutputPath> |
@@ -1163,25 +1177,19 @@ | |||
1163 | <Reference name="System"/> | 1177 | <Reference name="System"/> |
1164 | <Reference name="System.Data"/> | 1178 | <Reference name="System.Data"/> |
1165 | <Reference name="System.Xml"/> | 1179 | <Reference name="System.Xml"/> |
1166 | <Reference name="System.Web"/> | ||
1167 | <Reference name="OpenSim.Framework"/> | 1180 | <Reference name="OpenSim.Framework"/> |
1168 | <Reference name="OpenSim.Framework.Console"/> | 1181 | <Reference name="OpenSim.Framework.Console"/> |
1169 | <Reference name="OpenSim.Framework.Communications"/> | 1182 | <Reference name="OpenSim.Framework.Communications"/> |
1170 | <Reference name="OpenSim.Data"/> | 1183 | <Reference name="OpenSim.Data"/> |
1171 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1172 | <Reference name="OpenSim.Framework.Servers"/> | 1184 | <Reference name="OpenSim.Framework.Servers"/> |
1173 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1185 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1174 | <Reference name="OpenSim.Framework.Statistics"/> | 1186 | <Reference name="OpenSim.Grid.Framework"/> |
1175 | <Reference name="OpenSim.Services.Interfaces"/> | 1187 | <Reference name="OpenSim.Services.Interfaces"/> |
1176 | <Reference name="OpenSim.Services.Connectors"/> | 1188 | <Reference name="OpenSim.Services.Connectors"/> |
1177 | <Reference name="OpenSim.Grid.Framework"/> | ||
1178 | <Reference name="OpenSim.Grid.Communications.OGS1"/> | ||
1179 | <Reference name="OpenMetaverse.dll"/> | ||
1180 | <Reference name="OpenMetaverseTypes.dll"/> | 1189 | <Reference name="OpenMetaverseTypes.dll"/> |
1181 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 1190 | <Reference name="OpenMetaverse.dll"/> |
1182 | <Reference name="XMLRPC.dll"/> | 1191 | <Reference name="XMLRPC.dll"/> |
1183 | <Reference name="log4net.dll"/> | 1192 | <Reference name="log4net.dll"/> |
1184 | <Reference name="DotNetOpenId.dll"/> | ||
1185 | <Reference name="Nini.dll"/> | 1193 | <Reference name="Nini.dll"/> |
1186 | 1194 | ||
1187 | <Files> | 1195 | <Files> |
@@ -1190,7 +1198,7 @@ | |||
1190 | </Project> | 1198 | </Project> |
1191 | 1199 | ||
1192 | 1200 | ||
1193 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe"> | 1201 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe"> |
1194 | <Configuration name="Debug"> | 1202 | <Configuration name="Debug"> |
1195 | <Options> | 1203 | <Options> |
1196 | <OutputPath>../../../bin/</OutputPath> | 1204 | <OutputPath>../../../bin/</OutputPath> |
@@ -1206,24 +1214,19 @@ | |||
1206 | <Reference name="System"/> | 1214 | <Reference name="System"/> |
1207 | <Reference name="System.Data"/> | 1215 | <Reference name="System.Data"/> |
1208 | <Reference name="System.Xml"/> | 1216 | <Reference name="System.Xml"/> |
1209 | <Reference name="System.Web"/> | ||
1210 | <Reference name="OpenSim.Framework"/> | 1217 | <Reference name="OpenSim.Framework"/> |
1211 | <Reference name="OpenSim.Framework.Console"/> | 1218 | <Reference name="OpenSim.Framework.Console"/> |
1212 | <Reference name="OpenSim.Framework.Communications"/> | 1219 | <Reference name="OpenSim.Framework.Communications"/> |
1213 | <Reference name="OpenSim.Data"/> | 1220 | <Reference name="OpenSim.Data"/> |
1214 | <Reference name="OpenSim.Framework.Servers"/> | 1221 | <Reference name="OpenSim.Framework.Servers"/> |
1215 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1222 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1216 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1217 | <Reference name="OpenSim.Grid.Communications.OGS1"/> | ||
1218 | <Reference name="OpenSim.Grid.Framework"/> | 1223 | <Reference name="OpenSim.Grid.Framework"/> |
1219 | <Reference name="OpenSim.Grid.UserServer.Modules"/> | 1224 | <Reference name="OpenSim.Grid.MessagingServer.Modules"/> |
1220 | <Reference name="OpenMetaverseTypes.dll"/> | 1225 | <Reference name="OpenMetaverseTypes.dll"/> |
1221 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1222 | <Reference name="OpenMetaverse.dll"/> | 1226 | <Reference name="OpenMetaverse.dll"/> |
1223 | <Reference name="XMLRPC.dll"/> | 1227 | <Reference name="XMLRPC.dll"/> |
1224 | <Reference name="log4net.dll"/> | 1228 | <Reference name="log4net.dll"/> |
1225 | <Reference name="Nini.dll"/> | 1229 | <Reference name="Nini.dll"/> |
1226 | <Reference name="DotNetOpenId.dll"/> | ||
1227 | 1230 | ||
1228 | <Files> | 1231 | <Files> |
1229 | <Match pattern="*.cs" recurse="true"/> | 1232 | <Match pattern="*.cs" recurse="true"/> |