diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
commit | a7917b428a6bc3c9e33da64879b9e473516540a3 (patch) | |
tree | 2c38d9c33c4977a3d0356912915082a8bd568a23 /prebuild.xml | |
parent | Patch from jhurliman to HttpServer (diff) | |
parent | Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using... (diff) | |
download | opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.zip opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.gz opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.bz2 opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | prebuild.xml | 125 |
1 files changed, 3 insertions, 122 deletions
diff --git a/prebuild.xml b/prebuild.xml index 5e44169..0cf88c3 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -911,6 +911,7 @@ | |||
911 | <Reference name="OpenMetaverse.dll"/> | 911 | <Reference name="OpenMetaverse.dll"/> |
912 | <Reference name="XMLRPC.dll"/> | 912 | <Reference name="XMLRPC.dll"/> |
913 | <Reference name="log4net.dll"/> | 913 | <Reference name="log4net.dll"/> |
914 | <Reference name="Nini.dll"/> | ||
914 | 915 | ||
915 | <Files> | 916 | <Files> |
916 | <Match pattern="*.cs" recurse="true"/> | 917 | <Match pattern="*.cs" recurse="true"/> |
@@ -986,128 +987,6 @@ | |||
986 | </Files> | 987 | </Files> |
987 | </Project> | 988 | </Project> |
988 | 989 | ||
989 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.AssetInventoryServer" path="OpenSim/Grid/AssetInventoryServer" type="Exe"> | ||
990 | <Configuration name="Debug"> | ||
991 | <Options> | ||
992 | <OutputPath>../../../bin/</OutputPath> | ||
993 | </Options> | ||
994 | </Configuration> | ||
995 | <Configuration name="Release"> | ||
996 | <Options> | ||
997 | <OutputPath>../../../bin/</OutputPath> | ||
998 | </Options> | ||
999 | </Configuration> | ||
1000 | |||
1001 | <ReferencePath>../../../bin/</ReferencePath> | ||
1002 | <Reference name="System"/> | ||
1003 | <Reference name="System.Xml"/> | ||
1004 | <Reference name="OpenMetaverseTypes"/> | ||
1005 | <Reference name="OpenMetaverse.StructuredData"/> | ||
1006 | <Reference name="OpenSim.Framework"/> | ||
1007 | <Reference name="OpenSim.Framework.Servers"/> | ||
1008 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1009 | <Reference name="OpenSim.Framework.Console"/> | ||
1010 | <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> | ||
1011 | <Reference name="Nini.dll" /> | ||
1012 | <Reference name="log4net"/> | ||
1013 | |||
1014 | <Files> | ||
1015 | <Match pattern="*.cs" recurse="false"/> | ||
1016 | </Files> | ||
1017 | </Project> | ||
1018 | |||
1019 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.AssetInventoryServer.Plugins" path="OpenSim/Grid/AssetInventoryServer/Plugins" type="Library"> | ||
1020 | <Configuration name="Debug"> | ||
1021 | <Options> | ||
1022 | <OutputPath>../../../../bin/</OutputPath> | ||
1023 | </Options> | ||
1024 | </Configuration> | ||
1025 | <Configuration name="Release"> | ||
1026 | <Options> | ||
1027 | <OutputPath>../../../../bin/</OutputPath> | ||
1028 | </Options> | ||
1029 | </Configuration> | ||
1030 | |||
1031 | <ReferencePath>../../../../bin/</ReferencePath> | ||
1032 | <Reference name="System"/> | ||
1033 | <Reference name="System.Xml"/> | ||
1034 | <Reference name="System.Web"/> | ||
1035 | <Reference name="OpenMetaverseTypes"/> | ||
1036 | <Reference name="OpenMetaverse.StructuredData"/> | ||
1037 | <Reference name="OpenSim.Framework"/> | ||
1038 | <Reference name="OpenSim.Framework.Serialization"/> | ||
1039 | <Reference name="OpenSim.Framework.Servers"/> | ||
1040 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1041 | <Reference name="OpenSim.Grid.AssetInventoryServer" /> | ||
1042 | <Reference name="log4net"/> | ||
1043 | |||
1044 | <Files> | ||
1045 | <Match pattern="*.cs" recurse="false" /> | ||
1046 | <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" /> | ||
1047 | </Files> | ||
1048 | </Project> | ||
1049 | |||
1050 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.AssetInventoryServer.Plugins.Simple" path="OpenSim/Grid/AssetInventoryServer/Plugins/Simple" type="Library"> | ||
1051 | <Configuration name="Debug"> | ||
1052 | <Options> | ||
1053 | <OutputPath>../../../../../bin/</OutputPath> | ||
1054 | </Options> | ||
1055 | </Configuration> | ||
1056 | <Configuration name="Release"> | ||
1057 | <Options> | ||
1058 | <OutputPath>../../../../../bin/</OutputPath> | ||
1059 | </Options> | ||
1060 | </Configuration> | ||
1061 | |||
1062 | <ReferencePath>../../../../../bin/</ReferencePath> | ||
1063 | <Reference name="System"/> | ||
1064 | <Reference name="System.Xml" /> | ||
1065 | <Reference name="OpenMetaverse"/> | ||
1066 | <Reference name="OpenMetaverseTypes"/> | ||
1067 | <Reference name="OpenSim.Framework" /> | ||
1068 | <Reference name="OpenSim.Framework.Servers"/> | ||
1069 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1070 | <Reference name="OpenSim.Grid.AssetInventoryServer" /> | ||
1071 | <Reference name="log4net"/> | ||
1072 | |||
1073 | <Files> | ||
1074 | <Match pattern="*.cs" recurse="false" /> | ||
1075 | <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" /> | ||
1076 | </Files> | ||
1077 | </Project> | ||
1078 | |||
1079 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim" path="OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim" type="Library"> | ||
1080 | <Configuration name="Debug"> | ||
1081 | <Options> | ||
1082 | <OutputPath>../../../../../bin/</OutputPath> | ||
1083 | </Options> | ||
1084 | </Configuration> | ||
1085 | <Configuration name="Release"> | ||
1086 | <Options> | ||
1087 | <OutputPath>../../../../../bin/</OutputPath> | ||
1088 | </Options> | ||
1089 | </Configuration> | ||
1090 | |||
1091 | <ReferencePath>../../../../../bin/</ReferencePath> | ||
1092 | <Reference name="System"/> | ||
1093 | <Reference name="System.Xml" /> | ||
1094 | <Reference name="System.Data" /> | ||
1095 | <Reference name="OpenMetaverseTypes"/> | ||
1096 | <Reference name="OpenSim.Data" /> | ||
1097 | <Reference name="OpenSim.Framework" /> | ||
1098 | <Reference name="OpenSim.Framework.Communications" /> | ||
1099 | <Reference name="OpenSim.Grid.AssetInventoryServer" /> | ||
1100 | <Reference name="OpenSim.Framework.Servers"/> | ||
1101 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1102 | <Reference name="log4net"/> | ||
1103 | <Reference name="Nini.dll" /> | ||
1104 | |||
1105 | <Files> | ||
1106 | <Match pattern="*.cs" recurse="false" /> | ||
1107 | <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" /> | ||
1108 | </Files> | ||
1109 | </Project> | ||
1110 | |||
1111 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library"> | 990 | <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library"> |
1112 | <Configuration name="Debug"> | 991 | <Configuration name="Debug"> |
1113 | <Options> | 992 | <Options> |
@@ -1178,6 +1057,7 @@ | |||
1178 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 1057 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
1179 | <Reference name="XMLRPC.dll"/> | 1058 | <Reference name="XMLRPC.dll"/> |
1180 | <Reference name="log4net.dll"/> | 1059 | <Reference name="log4net.dll"/> |
1060 | <Reference name="Nini.dll"/> | ||
1181 | <Reference name="DotNetOpenId.dll"/> | 1061 | <Reference name="DotNetOpenId.dll"/> |
1182 | 1062 | ||
1183 | <Files> | 1063 | <Files> |
@@ -1279,6 +1159,7 @@ | |||
1279 | <Reference name="OpenMetaverse.dll"/> | 1159 | <Reference name="OpenMetaverse.dll"/> |
1280 | <Reference name="XMLRPC.dll"/> | 1160 | <Reference name="XMLRPC.dll"/> |
1281 | <Reference name="log4net.dll"/> | 1161 | <Reference name="log4net.dll"/> |
1162 | <Reference name="Nini.dll"/> | ||
1282 | 1163 | ||
1283 | <Files> | 1164 | <Files> |
1284 | <Match pattern="*.cs" recurse="true"/> | 1165 | <Match pattern="*.cs" recurse="true"/> |