aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-28 17:35:26 -0700
committerDiva Canto2009-09-28 17:35:26 -0700
commit51d9f7ebd4286709e75f6fcceff6fb75a4a83c46 (patch)
tree032929778f7dc07b560c75da262f285476a44450
parentImproved the Local grid connector to fetch data from the DB when it doesn't f... (diff)
parentConvert DOS newlines to Unix newlines. (diff)
downloadopensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.zip
opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.gz
opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.bz2
opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserAccountData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLAuthenticationData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLUserAccountData.cs2
-rw-r--r--OpenSim/Data/Null/NullRegionData.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs29
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs12
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/Mesh.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs50
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs2
-rw-r--r--OpenSim/Tests/Clients/Grid/GridClient.cs29
-rw-r--r--OpenSim/Tools/Compiler/Program.cs36
-rw-r--r--Prebuild/COPYING130
-rw-r--r--Prebuild/NEWS400
-rw-r--r--prebuild.xml80
19 files changed, 418 insertions, 374 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
index 78fc22c..099faea 100644
--- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Data.MSSQL
135 135
136 insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm); 136 insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm);
137 insertBuilder.Append(String.Join("', '", fields)); 137 insertBuilder.Append(String.Join("', '", fields));
138 insertBuilder.Append("') values ( @principalID, @"); 138 insertBuilder.Append("') values (@principalID, @");
139 insertBuilder.Append(String.Join(", @", fields)); 139 insertBuilder.Append(String.Join(", @", fields));
140 insertBuilder.Append(")"); 140 insertBuilder.Append(")");
141 141
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 1520888..e0c0ed6 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Data.MSSQL
152 StringBuilder insertBuilder = new StringBuilder(); 152 StringBuilder insertBuilder = new StringBuilder();
153 insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm); 153 insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm);
154 insertBuilder.Append(String.Join("', '", fields)); 154 insertBuilder.Append(String.Join("', '", fields));
155 insertBuilder.Append("') values ( @principalID, @scopeID, @"); 155 insertBuilder.Append("') values (@principalID, @scopeID, @");
156 insertBuilder.Append(String.Join(", @", fields)); 156 insertBuilder.Append(String.Join(", @", fields));
157 insertBuilder.Append(")"); 157 insertBuilder.Append(")");
158 158
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index afd59bd..e508b52 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Data.MySQL
127 { 127 {
128 string insert = "insert into `" + m_Realm + "` (`UUID`, `" + 128 string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
129 String.Join("`, `", fields) + 129 String.Join("`, `", fields) +
130 "`) values ( ?principalID, ?" + String.Join(", ?", fields) + ")"; 130 "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
131 131
132 cmd.CommandText = insert; 132 cmd.CommandText = insert;
133 133
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index 4a16a70..ed62172 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -773,7 +773,7 @@ namespace OpenSim.Data.MySQL
773 "use_estate_sun, fixed_sun, sun_position, " + 773 "use_estate_sun, fixed_sun, sun_position, " +
774 "covenant, Sandbox, sunvectorx, sunvectory, " + 774 "covenant, Sandbox, sunvectorx, sunvectory, " +
775 "sunvectorz, loaded_creation_datetime, " + 775 "sunvectorz, loaded_creation_datetime, " +
776 "loaded_creation_id) values ( ?RegionUUID, ?BlockTerraform, " + 776 "loaded_creation_id) values (?RegionUUID, ?BlockTerraform, " +
777 "?BlockFly, ?AllowDamage, ?RestrictPushing, " + 777 "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
778 "?AllowLandResell, ?AllowLandJoinDivide, " + 778 "?AllowLandResell, ?AllowLandJoinDivide, " +
779 "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " + 779 "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index 5352727..d48144d 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Data.MySQL
146 { 146 {
147 string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" + 147 string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
148 String.Join("`, `", fields) + 148 String.Join("`, `", fields) +
149 "`) values ( ?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")"; 149 "`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
150 150
151 cmd.CommandText = insert; 151 cmd.CommandText = insert;
152 152
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index 218fcd0..e8263ea 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data.Null
47 { 47 {
48 List<RegionData> ret = new List<RegionData>(); 48 List<RegionData> ret = new List<RegionData>();
49 49
50 foreach(RegionData r in m_regionData.Values) 50 foreach (RegionData r in m_regionData.Values)
51 { 51 {
52 if (regionName.Contains("%")) 52 if (regionName.Contains("%"))
53 { 53 {
@@ -71,7 +71,7 @@ namespace OpenSim.Data.Null
71 { 71 {
72 List<RegionData> ret = new List<RegionData>(); 72 List<RegionData> ret = new List<RegionData>();
73 73
74 foreach(RegionData r in m_regionData.Values) 74 foreach (RegionData r in m_regionData.Values)
75 { 75 {
76 if (r.posX == posX && r.posY == posY) 76 if (r.posX == posX && r.posY == posY)
77 ret.Add(r); 77 ret.Add(r);
@@ -95,7 +95,7 @@ namespace OpenSim.Data.Null
95 { 95 {
96 List<RegionData> ret = new List<RegionData>(); 96 List<RegionData> ret = new List<RegionData>();
97 97
98 foreach(RegionData r in m_regionData.Values) 98 foreach (RegionData r in m_regionData.Values)
99 { 99 {
100 if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY) 100 if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
101 ret.Add(r); 101 ret.Add(r);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
index ea205a2..2b336bb 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
@@ -1,4 +1,31 @@
1using System; 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Reflection; 30using System.Reflection;
4 31
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 51bb114..ec262b0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3517,7 +3517,7 @@ if (m_shape != null) {
3517 } 3517 }
3518 else 3518 else
3519 { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like 3519 { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
3520 // (mumbles, well, at least if you have infinte CPU powers :-) ) 3520 // (mumbles, well, at least if you have infinte CPU powers :-))
3521 PhysicsActor pa = this.PhysActor; 3521 PhysicsActor pa = this.PhysActor;
3522 if (pa != null) 3522 if (pa != null)
3523 { 3523 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 6b30959..c7bb56a 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -260,12 +260,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
260 260
261 public void PostInitialise() 261 public void PostInitialise()
262 { 262 {
263 if(m_pluginEnabled) 263 if (m_pluginEnabled)
264 { 264 {
265 m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene"); 265 m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene");
266 266
267 // register the voice interface for this module, so the script engine can call us 267 // register the voice interface for this module, so the script engine can call us
268 m_scene.RegisterModuleInterface<IVoiceModule>(this); 268 m_scene.RegisterModuleInterface<IVoiceModule>(this);
269 } 269 }
270 } 270 }
271 271
@@ -811,7 +811,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
811 811
812 lock (m_ParcelAddress) 812 lock (m_ParcelAddress)
813 { 813 {
814 if (m_ParcelAddress.ContainsKey( land.GlobalID.ToString() )) 814 if (m_ParcelAddress.ContainsKey(land.GlobalID.ToString()))
815 { 815 {
816 m_log.DebugFormat("[FreeSwitchVoice]: parcel id {0}: using sip address {1}", 816 m_log.DebugFormat("[FreeSwitchVoice]: parcel id {0}: using sip address {1}",
817 land.GlobalID, m_ParcelAddress[land.GlobalID.ToString()]); 817 land.GlobalID, m_ParcelAddress[land.GlobalID.ToString()]);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 805c3d4..964d0bb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -871,7 +871,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
871 m_log.ErrorFormat("[XMLRPCGROUPDATA]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function); 871 m_log.ErrorFormat("[XMLRPCGROUPDATA]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
872 m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", e.ToString()); 872 m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", e.ToString());
873 873
874 foreach( string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None)) 874 foreach (string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
875 { 875 {
876 m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", ResponseLine); 876 m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", ResponseLine);
877 } 877 }
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs
index 7567556..aae8871 100644
--- a/OpenSim/Region/Physics/Meshing/Mesh.cs
+++ b/OpenSim/Region/Physics/Meshing/Mesh.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Physics.Meshing
149 149
150 public float[] getVertexListAsFloatLocked() 150 public float[] getVertexListAsFloatLocked()
151 { 151 {
152 if( pinnedVirtexes.IsAllocated ) 152 if (pinnedVirtexes.IsAllocated)
153 return (float[])(pinnedVirtexes.Target); 153 return (float[])(pinnedVirtexes.Target);
154 float[] result; 154 float[] result;
155 155
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 0873035..56eb359 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Physics.Meshing
171 171
172 } 172 }
173 173
174 private ulong GetMeshKey( PrimitiveBaseShape pbs, PhysicsVector size, float lod ) 174 private ulong GetMeshKey(PrimitiveBaseShape pbs, PhysicsVector size, float lod)
175 { 175 {
176 ulong hash = 5381; 176 ulong hash = 5381;
177 177
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 5a94957..fe26429 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -546,11 +546,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
546 bool retried = false; 546 bool retried = false;
547 do 547 do
548 { 548 {
549 lock (CScodeProvider) 549 lock (CScodeProvider)
550 { 550 {
551 results = CScodeProvider.CompileAssemblyFromSource( 551 results = CScodeProvider.CompileAssemblyFromSource(
552 parameters, Script); 552 parameters, Script);
553 } 553 }
554 // Deal with an occasional segv in the compiler. 554 // Deal with an occasional segv in the compiler.
555 // Rarely, if ever, occurs twice in succession. 555 // Rarely, if ever, occurs twice in succession.
556 // Line # == 0 and no file name are indications that 556 // Line # == 0 and no file name are indications that
@@ -573,20 +573,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
573 { 573 {
574 complete = true; 574 complete = true;
575 } 575 }
576 } 576 } while (!complete);
577 while(!complete);
578 break; 577 break;
579 case enumCompileType.js: 578 case enumCompileType.js:
580 results = JScodeProvider.CompileAssemblyFromSource( 579 results = JScodeProvider.CompileAssemblyFromSource(
581 parameters, Script); 580 parameters, Script);
582 break; 581 break;
583 case enumCompileType.yp: 582 case enumCompileType.yp:
584 results = YPcodeProvider.CompileAssemblyFromSource( 583 results = YPcodeProvider.CompileAssemblyFromSource(
585 parameters, Script); 584 parameters, Script);
586 break; 585 break;
587 default: 586 default:
588 throw new Exception("Compiler is not able to recongnize "+ 587 throw new Exception("Compiler is not able to recongnize "+
589 "language type \"" + lang.ToString() + "\""); 588 "language type \"" + lang.ToString() + "\"");
590 } 589 }
591 590
592 // Check result 591 // Check result
@@ -602,12 +601,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
602 { 601 {
603 foreach (CompilerError CompErr in results.Errors) 602 foreach (CompilerError CompErr in results.Errors)
604 { 603 {
605 604 string severity = CompErr.IsWarning ? "Warning" : "Error";
606 string severity = "Error";
607 if (CompErr.IsWarning)
608 {
609 severity = "Warning";
610 }
611 605
612 KeyValuePair<int, int> lslPos; 606 KeyValuePair<int, int> lslPos;
613 607
@@ -615,18 +609,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
615 609
616 if (severity == "Error") 610 if (severity == "Error")
617 { 611 {
618 lslPos = FindErrorPosition(CompErr.Line, CompErr.Column); 612 lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
619 string text = CompErr.ErrorText; 613 string text = CompErr.ErrorText;
620 614
621 // Use LSL type names 615 // Use LSL type names
622 if (lang == enumCompileType.lsl) 616 if (lang == enumCompileType.lsl)
623 text = ReplaceTypes(CompErr.ErrorText); 617 text = ReplaceTypes(CompErr.ErrorText);
624 618
625 // The Second Life viewer's script editor begins 619 // The Second Life viewer's script editor begins
626 // countingn lines and columns at 0, so we subtract 1. 620 // countingn lines and columns at 0, so we subtract 1.
627 errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n", 621 errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
628 lslPos.Key - 1, lslPos.Value - 1, 622 lslPos.Key - 1, lslPos.Value - 1,
629 CompErr.ErrorNumber, text, severity); 623 CompErr.ErrorNumber, text, severity);
630 hadErrors = true; 624 hadErrors = true;
631 } 625 }
632 } 626 }
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 656fcf5..db3a4ce 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -188,7 +188,7 @@ namespace OpenSim.Server.Base
188 { 188 {
189 string qstring = String.Empty; 189 string qstring = String.Empty;
190 190
191 foreach(KeyValuePair<string, string> kvp in data) 191 foreach (KeyValuePair<string, string> kvp in data)
192 { 192 {
193 string part; 193 string part;
194 if (kvp.Value != String.Empty) 194 if (kvp.Value != String.Empty)
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs
index ccda661..8798c5e 100644
--- a/OpenSim/Tests/Clients/Grid/GridClient.cs
+++ b/OpenSim/Tests/Clients/Grid/GridClient.cs
@@ -1,4 +1,31 @@
1using System; 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Text; 30using System.Text;
4using System.Reflection; 31using System.Reflection;
diff --git a/OpenSim/Tools/Compiler/Program.cs b/OpenSim/Tools/Compiler/Program.cs
index 9cd6bc8..b18e029 100644
--- a/OpenSim/Tools/Compiler/Program.cs
+++ b/OpenSim/Tools/Compiler/Program.cs
@@ -37,19 +37,19 @@ namespace OpenSim.Tools.LSL.Compiler
37 class Program 37 class Program
38 { 38 {
39 private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; 39 private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap;
40 private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); 40 private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
41 41
42 static void Main(string[] args) 42 static void Main(string[] args)
43 { 43 {
44 string source = null; 44 string source = null;
45 45
46 if(args.Length == 0) 46 if (args.Length == 0)
47 { 47 {
48 Console.WriteLine("No input file specified"); 48 Console.WriteLine("No input file specified");
49 Environment.Exit(1); 49 Environment.Exit(1);
50 } 50 }
51 51
52 if(!File.Exists(args[0])) 52 if (!File.Exists(args[0]))
53 { 53 {
54 Console.WriteLine("Input file does not exist"); 54 Console.WriteLine("Input file does not exist");
55 Environment.Exit(1); 55 Environment.Exit(1);
@@ -136,11 +136,7 @@ namespace OpenSim.Tools.LSL.Compiler
136 string errtext = String.Empty; 136 string errtext = String.Empty;
137 foreach (CompilerError CompErr in results.Errors) 137 foreach (CompilerError CompErr in results.Errors)
138 { 138 {
139 string severity = "Error"; 139 string severity = CompErr.IsWarning ? "Warning" : "Error";
140 if ( CompErr.IsWarning )
141 {
142 severity = "Warning";
143 }
144 140
145 KeyValuePair<int, int> lslPos; 141 KeyValuePair<int, int> lslPos;
146 142
@@ -153,8 +149,8 @@ namespace OpenSim.Tools.LSL.Compiler
153 // The Second Life viewer's script editor begins 149 // The Second Life viewer's script editor begins
154 // countingn lines and columns at 0, so we subtract 1. 150 // countingn lines and columns at 0, so we subtract 1.
155 errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n", 151 errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
156 lslPos.Key - 1, lslPos.Value - 1, 152 lslPos.Key - 1, lslPos.Value - 1,
157 CompErr.ErrorNumber, text, severity); 153 CompErr.ErrorNumber, text, severity);
158 } 154 }
159 155
160 disp = "Completed with errors"; 156 disp = "Completed with errors";
@@ -237,20 +233,20 @@ namespace OpenSim.Tools.LSL.Compiler
237 private static string ReplaceTypes(string message) 233 private static string ReplaceTypes(string message)
238 { 234 {
239 message = message.Replace( 235 message = message.Replace(
240 "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString", 236 "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString",
241 "string"); 237 "string");
242 238
243 message = message.Replace( 239 message = message.Replace(
244 "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger", 240 "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger",
245 "integer"); 241 "integer");
246 242
247 message = message.Replace( 243 message = message.Replace(
248 "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat", 244 "OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat",
249 "float"); 245 "float");
250 246
251 message = message.Replace( 247 message = message.Replace(
252 "OpenSim.Region.ScriptEngine.Shared.LSL_Types.list", 248 "OpenSim.Region.ScriptEngine.Shared.LSL_Types.list",
253 "list"); 249 "list");
254 250
255 return message; 251 return message;
256 } 252 }
@@ -263,7 +259,7 @@ namespace OpenSim.Tools.LSL.Compiler
263 private class kvpSorter : IComparer<KeyValuePair<int,int>> 259 private class kvpSorter : IComparer<KeyValuePair<int,int>>
264 { 260 {
265 public int Compare(KeyValuePair<int,int> a, 261 public int Compare(KeyValuePair<int,int> a,
266 KeyValuePair<int,int> b) 262 KeyValuePair<int,int> b)
267 { 263 {
268 return a.Key.CompareTo(b.Key); 264 return a.Key.CompareTo(b.Key);
269 } 265 }
diff --git a/Prebuild/COPYING b/Prebuild/COPYING
index d3cdf7e..c57c080 100644
--- a/Prebuild/COPYING
+++ b/Prebuild/COPYING
@@ -1,65 +1,65 @@
1BSD License 1BSD License
2Copyright (c)2004-2008 2Copyright (c)2004-2008
3 3
4See AUTHORS file for list of copyright holders 4See AUTHORS file for list of copyright holders
5 5
6Dave Hudson (jendave@yahoo.com), 6Dave Hudson (jendave@yahoo.com),
7Matthew Holmes (matthew@wildfiregames.com) 7Matthew Holmes (matthew@wildfiregames.com)
8Dan Moorehead (dan05a@gmail.com) 8Dan Moorehead (dan05a@gmail.com)
9Rob Loach (http://www.robloach.net) 9Rob Loach (http://www.robloach.net)
10C.J. Adams-Collier (cjac@colliertech.org) 10C.J. Adams-Collier (cjac@colliertech.org)
11 11
12http://dnpb.sourceforge.net 12http://dnpb.sourceforge.net
13All rights reserved. 13All rights reserved.
14 14
15Redistribution and use in source and binary forms, with or without 15Redistribution and use in source and binary forms, with or without
16modification, are permitted provided that the following conditions 16modification, are permitted provided that the following conditions
17are met: 17are met:
18 18
191. Redistributions of source code must retain the above copyright notice, 191. Redistributions of source code must retain the above copyright notice,
20 this list of conditions and the following disclaimer. 20 this list of conditions and the following disclaimer.
21 21
222. Redistributions in binary form must reproduce the above copyright notice, 222. Redistributions in binary form must reproduce the above copyright notice,
23 this list of conditions and the following disclaimer in the documentation 23 this list of conditions and the following disclaimer in the documentation
24 and/or other materials provided with the distribution. 24 and/or other materials provided with the distribution.
25 25
263. The names of the authors may not be used to endorse or promote 263. The names of the authors may not be used to endorse or promote
27 products derived from this software without specific prior written 27 products derived from this software without specific prior written
28 permission. 28 permission.
29 29
30 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 30 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
31 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 31 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
32 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 32 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
33 FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 33 FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
34 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 34 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
35 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 35 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
36 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 36 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
37 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 37 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
38 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 38 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
39 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 39 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
40 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 40 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
41 POSSIBILITY OF SUCH DAMAGE. 41 POSSIBILITY OF SUCH DAMAGE.
42 42
43--- 43---
44 44
45Portions of src/Core/Targets/AutotoolsTarget.cs 45Portions of src/Core/Targets/AutotoolsTarget.cs
46// Copyright (C) 2006 Novell, Inc (http://www.novell.com) 46// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
47// 47//
48// Permission is hereby granted, free of charge, to any person obtaining 48// Permission is hereby granted, free of charge, to any person obtaining
49// a copy of this software and associated documentation files (the 49// a copy of this software and associated documentation files (the
50// "Software"), to deal in the Software without restriction, including 50// "Software"), to deal in the Software without restriction, including
51// without limitation the rights to use, copy, modify, merge, publish, 51// without limitation the rights to use, copy, modify, merge, publish,
52// distribute, sublicense, and/or sell copies of the Software, and to 52// distribute, sublicense, and/or sell copies of the Software, and to
53// permit persons to whom the Software is furnished to do so, subject to 53// permit persons to whom the Software is furnished to do so, subject to
54// the following conditions: 54// the following conditions:
55// 55//
56// The above copyright notice and this permission notice shall be 56// The above copyright notice and this permission notice shall be
57// included in all copies or substantial portions of the Software. 57// included in all copies or substantial portions of the Software.
58// 58//
59// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 59// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
60// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 60// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
61// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 61// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
62// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 62// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
63// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 63// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
64// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 64// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
65// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 65// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Prebuild/NEWS b/Prebuild/NEWS
index bea28da..3ab3108 100644
--- a/Prebuild/NEWS
+++ b/Prebuild/NEWS
@@ -1,200 +1,200 @@
1Prebuild is an XML-driven pre-build tool allowing developers to easily generate project or make files for major IDE's and .NET development tools including: Visual Studio 2005, Visual Studio 2003, Visual Studio 2002, SharpDevelop, MonoDevelop, and NAnt. 1Prebuild is an XML-driven pre-build tool allowing developers to easily generate project or make files for major IDE's and .NET development tools including: Visual Studio 2005, Visual Studio 2003, Visual Studio 2002, SharpDevelop, MonoDevelop, and NAnt.
2 2
3Documentation and downloads are available at http://dnpb.sourceforge.net. 3Documentation and downloads are available at http://dnpb.sourceforge.net.
4 4
5Prebuild is licensed under the BSD license. 5Prebuild is licensed under the BSD license.
6 6
7[ XXXXXXX XX, XXX - 1.3.2 ] 7[ XXXXXXX XX, XXX - 1.3.2 ]
8 + Added Keyfile signing to NAnt target and VS2005 target 8 + Added Keyfile signing to NAnt target and VS2005 target
9 + Updated XSD file to 1.7 9 + Updated XSD file to 1.7
10 + Boo and VisualBasic Language support in VS2005 target 10 + Boo and VisualBasic Language support in VS2005 target
11 + Added basic Autotools target. It creates a non-recursive Autotools system. 11 + Added basic Autotools target. It creates a non-recursive Autotools system.
12 ! Multiple files can be excluded from the Match node 12 ! Multiple files can be excluded from the Match node
13 ! VS2005 now handles .resx files correctly. 13 ! VS2005 now handles .resx files correctly.
14 ! NAnt and Autotools now handle defines 14 ! NAnt and Autotools now handle defines
15 ! NAnt and Autotools now handle resources 15 ! NAnt and Autotools now handle resources
16 + Conditional XML variables can be passed through the command line. 16 + Conditional XML variables can be passed through the command line.
17 + Added /install and /remove command line flags to install and remove assemblies from the GAC 17 + Added /install and /remove command line flags to install and remove assemblies from the GAC
18 + Many fixes to VS2005 target 18 + Many fixes to VS2005 target
19 19
20[ July 21, 2006 - 1.3.1 ] 20[ July 21, 2006 - 1.3.1 ]
21 ! VS2005 fixes from Rob Loach 21 ! VS2005 fixes from Rob Loach
22 ! NAnt fixes from Rob Loach and David Hudson 22 ! NAnt fixes from Rob Loach and David Hudson
23 ! XML doc fixes from Rob Loach 23 ! XML doc fixes from Rob Loach
24 + Added SharpDevelop2 target (really just uses VS2005 target) 24 + Added SharpDevelop2 target (really just uses VS2005 target)
25 ! Fixed bug with BuildEvents in Monodevelop target 25 ! Fixed bug with BuildEvents in Monodevelop target
26 + Passing /yes will default to answering yes to any warnings 26 + Passing /yes will default to answering yes to any warnings
27 27
28[ February 28, 2006 - 1.3 ] 28[ February 28, 2006 - 1.3 ]
29 + Added MonoDevelop target. 29 + Added MonoDevelop target.
30 + Added NAnt target. 30 + Added NAnt target.
31 + Lots of fixes to all targets. 31 + Lots of fixes to all targets.
32 * Cleaned up the code using FXCop. 32 * Cleaned up the code using FXCop.
33 * Updated schema to 1.6 to fix a typo and add a new parameter. 33 * Updated schema to 1.6 to fix a typo and add a new parameter.
34 * jendave is now the maintainer of the project. RobLoach has been added as a developer. 34 * jendave is now the maintainer of the project. RobLoach has been added as a developer.
35 * Removed references to 'dnpb'. 35 * Removed references to 'dnpb'.
36 + Added rudimentary support for pre- and post- build scripts 36 + Added rudimentary support for pre- and post- build scripts
37 * Updated examples. 37 * Updated examples.
38 38
39[ August 5, 2004 - 1.2 ] 39[ August 5, 2004 - 1.2 ]
40 + Added Visual Studio Express (vs2005express) target contributed by Borrillis and modified for use with different languages 40 + Added Visual Studio Express (vs2005express) target contributed by Borrillis and modified for use with different languages
41 + Added the allowedgroups command line option followed by a pipe-delimited list of project group filter flags (eg. Group1|Group2) allow optional filtering of all projects that dont have at least one of these flags 41 + Added the allowedgroups command line option followed by a pipe-delimited list of project group filter flags (eg. Group1|Group2) allow optional filtering of all projects that dont have at least one of these flags
42 + Added the filterGroups XML attribute to the project node and updated the scheme to v1.5 for this addition, it is used to specified the delimited list of filter groups to which a project belongs 42 + Added the filterGroups XML attribute to the project node and updated the scheme to v1.5 for this addition, it is used to specified the delimited list of filter groups to which a project belongs
43 * Modified the removedir command line option to allow for a pipe-delimited list of directory names 43 * Modified the removedir command line option to allow for a pipe-delimited list of directory names
44 ! Modified the resource loading code to search for resourced without the prepended namespace (as Visual Studio .NET does it) to allow for it to be compiled with SharpDevelop as well 44 ! Modified the resource loading code to search for resourced without the prepended namespace (as Visual Studio .NET does it) to allow for it to be compiled with SharpDevelop as well
45 + Added the GenerateXmlDocFile boolean option to the Options XML element 45 + Added the GenerateXmlDocFile boolean option to the Options XML element
46 * Changed the behavior of the XmlDocFile option so that if not specified it uses the assemblyName (without file extension) + .xml for the file name instead of just not generating the file since the new GenerateXmlDocFile takes care of this 46 * Changed the behavior of the XmlDocFile option so that if not specified it uses the assemblyName (without file extension) + .xml for the file name instead of just not generating the file since the new GenerateXmlDocFile takes care of this
47 47
48[ January 3, 2004 - 1.1 ] 48[ January 3, 2004 - 1.1 ]
49 ! Replaced regex use for more efficient manual parsing to allow use on non-windows platforms with Mono which has Regex problems 49 ! Replaced regex use for more efficient manual parsing to allow use on non-windows platforms with Mono which has Regex problems
50 + Added the checkOsVars attribute to the root element for enabling interpolation for Enviroment variables in the form ${var}, otherwise no checking is performed for efficiency-sake 50 + Added the checkOsVars attribute to the root element for enabling interpolation for Enviroment variables in the form ${var}, otherwise no checking is performed for efficiency-sake
51 * Make the version attribute on the root element optional as it isn't used and not needed since the schema url contains the version 51 * Make the version attribute on the root element optional as it isn't used and not needed since the schema url contains the version
52 52
53[ December 30, 2004 - 1.1 ] 53[ December 30, 2004 - 1.1 ]
54 ! Applied Leed's fix for SharpDevelop references 54 ! Applied Leed's fix for SharpDevelop references
55 + Rewrote much of the processing for better validation and without the use of a temp file 55 + Rewrote much of the processing for better validation and without the use of a temp file
56 + Added support for configurations at the project level which are named All. They now apply changes to all Solution level defined configs 56 + Added support for configurations at the project level which are named All. They now apply changes to all Solution level defined configs
57 * Changed all spaces into tabs 57 * Changed all spaces into tabs
58 + Added support for the None build action 58 + Added support for the None build action
59 * Replaced all sequence's in the XML schema for all's because the order doesn't matter since the xml file is loaded into an XmlDocument 59 * Replaced all sequence's in the XML schema for all's because the order doesn't matter since the xml file is loaded into an XmlDocument
60 60
61[ December 25, 2004 - 1.0 ] 61[ December 25, 2004 - 1.0 ]
62 + Added the /removedir option for cleaning directories like obj before file releases 62 + Added the /removedir option for cleaning directories like obj before file releases
63 + Changed WriteTempXml() and the new DeleteTempXml() methods to be compiled only in DEBUG builds 63 + Changed WriteTempXml() and the new DeleteTempXml() methods to be compiled only in DEBUG builds
64 * Made path optional for Match elements (defaults to current directory) and updates schema for it 64 * Made path optional for Match elements (defaults to current directory) and updates schema for it
65 ! Fixed XML example in the readme.txt 65 ! Fixed XML example in the readme.txt
66 + Added example xml files to docs directory 66 + Added example xml files to docs directory
67 * Updated license.txt to add Dan Moorehead and update copyright years 67 * Updated license.txt to add Dan Moorehead and update copyright years
68 + Updated prebuild.xml to take advantage of the default path attribute for match elements 68 + Updated prebuild.xml to take advantage of the default path attribute for match elements
69 + Updated Clean to delete the obj directories 69 + Updated Clean to delete the obj directories
70 70
71[ December 25, 2004 - 0.13 ] 71[ December 25, 2004 - 0.13 ]
72 + Added dnpb.exe so that it can be used to generate the project files 72 + Added dnpb.exe so that it can be used to generate the project files
73 + Added dnpb.ico 73 + Added dnpb.ico
74 * Added parameterless Write statement to Log for writing a single line 74 * Added parameterless Write statement to Log for writing a single line
75 * Changed scehema to version 1.3 for support of icon attribute 75 * Changed scehema to version 1.3 for support of icon attribute
76 * Added support for All configuration name under a Project node signifying common settings for all configurations 76 * Added support for All configuration name under a Project node signifying common settings for all configurations
77 ! Fixed the SupressWarnings by adding the corresponding field to OptionsNode 77 ! Fixed the SupressWarnings by adding the corresponding field to OptionsNode
78 * Wrote documentation in docs/readme.txt 78 * Wrote documentation in docs/readme.txt
79 * Added Dan Moorehead to copyrights and extended date from 2004 to 2004-2005 79 * Added Dan Moorehead to copyrights and extended date from 2004 to 2004-2005
80 * Updated prebuild.xml 80 * Updated prebuild.xml
81 * Optimized Log class 81 * Optimized Log class
82 * Updated OutputUsage() 82 * Updated OutputUsage()
83 * /clean targets all by default 83 * /clean targets all by default
84 * No log file is used by default, /log without value specified uses default file name 84 * No log file is used by default, /log without value specified uses default file name
85 + Added support for the /pause which pauses the utility after execution to observe output 85 + Added support for the /pause which pauses the utility after execution to observe output
86 86
87 87
88[ September 27, 2004 - 0.12.2a ] 88[ September 27, 2004 - 0.12.2a ]
89 ! Fixed a nasty bug when trying to delete our temp file for pre-processing. 89 ! Fixed a nasty bug when trying to delete our temp file for pre-processing.
90 90
91[ September 15, 2004 - 0.12.2 ] 91[ September 15, 2004 - 0.12.2 ]
92 + Expanded platform identification, thanks to the NAnt guys for shedding some 92 + Expanded platform identification, thanks to the NAnt guys for shedding some
93 light on how to properly check for UNIX platforms! Thanks guys! 93 light on how to properly check for UNIX platforms! Thanks guys!
94 * POSIX OS identifier changed to UNIX. Valid OS names are now "Win32", "UNIX", 94 * POSIX OS identifier changed to UNIX. Valid OS names are now "Win32", "UNIX",
95 and "Unknown". 95 and "Unknown".
96 ! Fixed SharpDevelop target to properly use the 'rootNamespace' attribute of 96 ! Fixed SharpDevelop target to properly use the 'rootNamespace' attribute of
97 the Project tag. 97 the Project tag.
98 + New command-line switch, /ppo, forces DNPB to pre-process the file and write 98 + New command-line switch, /ppo, forces DNPB to pre-process the file and write
99 the pre-processed file. This allows you to test/debug your pre-processor 99 the pre-processed file. This allows you to test/debug your pre-processor
100 macros. No other processing will be done. You can specify a target file as 100 macros. No other processing will be done. You can specify a target file as
101 a paramter for the /ppo switch, or DNPB will write the file 'preprocessed.xml' 101 a paramter for the /ppo switch, or DNPB will write the file 'preprocessed.xml'
102 if you do not specify a file. 102 if you do not specify a file.
103 + The Match tag now has a 'buildAction' attribute which functions exactly like 103 + The Match tag now has a 'buildAction' attribute which functions exactly like
104 the attribute of the same name for the File tag. 104 the attribute of the same name for the File tag.
105 105
106[ August 5, 2004 - 0.12.1 ] 106[ August 5, 2004 - 0.12.1 ]
107 + Added environment variable expansion for all values. Environment variables 107 + Added environment variable expansion for all values. Environment variables
108 should be listed in the form ${VAR}. 108 should be listed in the form ${VAR}.
109 109
110[ July 30, 2004 - 0.12.0 ] 110[ July 30, 2004 - 0.12.0 ]
111 + Added preprocessing via XML processing information tags. Available tags 111 + Added preprocessing via XML processing information tags. Available tags
112 are: <?if <exp> ?>, <?elseif <exp> ?>, <?else ?> and <?endif ?>. The 112 are: <?if <exp> ?>, <?elseif <exp> ?>, <?else ?> and <?endif ?>. The
113 current expression parser is very basic, but will be replaced with a more 113 current expression parser is very basic, but will be replaced with a more
114 capable parser over time. Current operators available are: =, !=, <, >, 114 capable parser over time. Current operators available are: =, !=, <, >,
115 <=, >=. Current test variables available: OS, RuntimeVersion, RuntimeMajor, 115 <=, >=. Current test variables available: OS, RuntimeVersion, RuntimeMajor,
116 RuntimeMinor, RuntimeRevision. 116 RuntimeMinor, RuntimeRevision.
117 117
118[ July 27, 2004 - 0.11.4 ] 118[ July 27, 2004 - 0.11.4 ]
119 + Added 'useRegex' attribute to the Match tag. Matches can now use regular 119 + Added 'useRegex' attribute to the Match tag. Matches can now use regular
120 expressions to match filenames. 120 expressions to match filenames.
121 + Added the 'assemblyName' attribute to the Project tag. Projects can now 121 + Added the 'assemblyName' attribute to the Project tag. Projects can now
122 set their output assembly name. 122 set their output assembly name.
123 ! Fixed several bugs in the way that Project tags inheirt their parent 123 ! Fixed several bugs in the way that Project tags inheirt their parent
124 Solutions configuration options. This operation should now work fully as 124 Solutions configuration options. This operation should now work fully as
125 intended. 125 intended.
126 ! Due to some wierdness, Project Guid's are now stored as part of the Project 126 ! Due to some wierdness, Project Guid's are now stored as part of the Project
127 node and created at parse time. 127 node and created at parse time.
128 128
129[ May 11, 2004 - 0.11.3 ] 129[ May 11, 2004 - 0.11.3 ]
130 ! Fixed a bug where I was writing the wrong property name for a projects root 130 ! Fixed a bug where I was writing the wrong property name for a projects root
131 namespace. 131 namespace.
132 ! Removed a DEBUG statement I had left in the code in 0.11.2. 132 ! Removed a DEBUG statement I had left in the code in 0.11.2.
133 ! Fixed a bug in the VS2002 writer which caused the version variables to not 133 ! Fixed a bug in the VS2002 writer which caused the version variables to not
134 be overriden correctly. 134 be overriden correctly.
135 + Added the rootNamespace property to the <Project> element, allowing you to 135 + Added the rootNamespace property to the <Project> element, allowing you to
136 specify the root namespace. 136 specify the root namespace.
137 * /target and /clean are now mutually exclusive command line switches, and 137 * /target and /clean are now mutually exclusive command line switches, and
138 they both now take the all option. In the case of /target all, all build 138 they both now take the all option. In the case of /target all, all build
139 file for all targets will be created. In the case of /clean all, the user 139 file for all targets will be created. In the case of /clean all, the user
140 will be prompted to make sure they want to do it, and if so, will clean 140 will be prompted to make sure they want to do it, and if so, will clean
141 all build files for all targets. 141 all build files for all targets.
142 142
143[ April 22, 2004 - 0.11.2 ] 143[ April 22, 2004 - 0.11.2 ]
144 ! Fixed a bug with the /file command-line operator. Was using the unresolved 144 ! Fixed a bug with the /file command-line operator. Was using the unresolved
145 file path rather then the resolved one, was making the attempt to open the 145 file path rather then the resolved one, was making the attempt to open the
146 dnpb file fail. 146 dnpb file fail.
147 ! Fixed a bug in the schema that required at least 1 solution and 1 reference 147 ! Fixed a bug in the schema that required at least 1 solution and 1 reference
148 path. We can do just fine with 0 of either of these. Some files may be all 148 path. We can do just fine with 0 of either of these. Some files may be all
149 <Process> statements and not have any <Solution> tags. 149 <Process> statements and not have any <Solution> tags.
150 ! Fixed a bug that caused the project references not to be written with the 150 ! Fixed a bug that caused the project references not to be written with the
151 SharpDevelop target. 151 SharpDevelop target.
152 * Changed the schema to version 1.2, allowing for Configuration nodes to exist 152 * Changed the schema to version 1.2, allowing for Configuration nodes to exist
153 under project nodes. The inheritance of values is hierarchical. Meaning, if 153 under project nodes. The inheritance of values is hierarchical. Meaning, if
154 you define a configuration named Debug at the Soltion level, and one by the 154 you define a configuration named Debug at the Soltion level, and one by the
155 same name at the Project level, the one at the Project level will first 155 same name at the Project level, the one at the Project level will first
156 inherit the options of the Solution level configuration, then set it's own 156 inherit the options of the Solution level configuration, then set it's own
157 options. If you define a configuration at the Project level and it does not 157 options. If you define a configuration at the Project level and it does not
158 exist at the Solution level, it will be created at the Solution level. 158 exist at the Solution level, it will be created at the Solution level.
159 * Project references should now work correctly across the board. Note that due 159 * Project references should now work correctly across the board. Note that due
160 to a restriction in Visual Studio, you can only reference projects in the same 160 to a restriction in Visual Studio, you can only reference projects in the same
161 solution. 161 solution.
162 162
163[ April 21, 2004 - 0.11.1 ] 163[ April 21, 2004 - 0.11.1 ]
164 ! Fixed a problem with resolving paths in various targets. Was not properly 164 ! Fixed a problem with resolving paths in various targets. Was not properly
165 setting the CWD. 165 setting the CWD.
166 * Schema updated to 1.1, moving the ReferencePath element from the Options 166 * Schema updated to 1.1, moving the ReferencePath element from the Options
167 element to the Project element. This makes more logical sense, given that 167 element to the Project element. This makes more logical sense, given that
168 reference paths are resolved relative to the project path. Any prebuild.xml 168 reference paths are resolved relative to the project path. Any prebuild.xml
169 file referecning verison 1.0 will fail! Please update to the 1.1 schema. 169 file referecning verison 1.0 will fail! Please update to the 1.1 schema.
170 170
171[ April 19, 2004 - 0.11.0 ] 171[ April 19, 2004 - 0.11.0 ]
172 * Added several attributes across the code to make FxCop happy 172 * Added several attributes across the code to make FxCop happy
173 ! Fixed bugs in reference paths being written in the VS targets. 173 ! Fixed bugs in reference paths being written in the VS targets.
174 ! Fixed a bug in ProjectNode which was doing two CWDStack.Push() calls instead of 174 ! Fixed a bug in ProjectNode which was doing two CWDStack.Push() calls instead of
175 a Push/Pop pair. Was wreaking havoc with <Process> tags. 175 a Push/Pop pair. Was wreaking havoc with <Process> tags.
176 ! Fixed some bugs in the path tracking, both the Project and Solution nodes now 176 ! Fixed some bugs in the path tracking, both the Project and Solution nodes now
177 have a FullPath property, which is the full path to the file resolved at load 177 have a FullPath property, which is the full path to the file resolved at load
178 time. This should fix all path relativity problems. 178 time. This should fix all path relativity problems.
179 + Added new /clean switch, allowing the target to clean up any files it generated. 179 + Added new /clean switch, allowing the target to clean up any files it generated.
180 in accordance, the ITarget interface has been updated to support a new Clean() 180 in accordance, the ITarget interface has been updated to support a new Clean()
181 method. 181 method.
182 + Completed addition of the <Process> tag, to allow the referencing of external 182 + Completed addition of the <Process> tag, to allow the referencing of external
183 prebuild.xml files. 183 prebuild.xml files.
184 + Added the runtime attribute to the Project element. This allows the developer 184 + Added the runtime attribute to the Project element. This allows the developer
185 to specify which runtime a project should target (Mono or Microsoft). This is 185 to specify which runtime a project should target (Mono or Microsoft). This is
186 of course ignored in certain targets like the Visual Studio targets. 186 of course ignored in certain targets like the Visual Studio targets.
187 + Added the SharpDevelop target. 187 + Added the SharpDevelop target.
188 188
189[ April 13, 2004 - 0.10.1a ] 189[ April 13, 2004 - 0.10.1a ]
190 + Added the buildAction attribute to the File node. This is needed for dnpb 190 + Added the buildAction attribute to the File node. This is needed for dnpb
191 to even be able to bootstrap itself (dnpb-1.0.xsd must be an embedded resource) 191 to even be able to bootstrap itself (dnpb-1.0.xsd must be an embedded resource)
192 192
193[ April 13, 2004 - 0.10.1 ] 193[ April 13, 2004 - 0.10.1 ]
194 * First Release 194 * First Release
195 195
196[ Key ] 196[ Key ]
197* = Change or information 197* = Change or information
198+ = Addition 198+ = Addition
199! = Bug Fix 199! = Bug Fix
200 200
diff --git a/prebuild.xml b/prebuild.xml
index f6accd7..a38f9b7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -955,46 +955,6 @@
955 </Project> 955 </Project>
956 956
957 957
958 <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
959 <Configuration name="Debug">
960 <Options>
961 <OutputPath>../../../bin/</OutputPath>
962 </Options>
963 </Configuration>
964 <Configuration name="Release">
965 <Options>
966 <OutputPath>../../../bin/</OutputPath>
967 </Options>
968 </Configuration>
969
970 <ReferencePath>../../../bin/</ReferencePath>
971 <Reference name="System"/>
972 <Reference name="System.Data"/>
973 <Reference name="System.Xml"/>
974 <Reference name="System.Web"/>
975 <Reference name="OpenSim.Framework"/>
976 <Reference name="OpenSim.Framework.Console"/>
977 <Reference name="OpenSim.Framework.Communications"/>
978 <Reference name="OpenSim.Data"/>
979 <Reference name="OpenSim.Framework.Servers"/>
980 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
981 <Reference name="OpenSim.Framework.Statistics"/>
982 <Reference name="OpenSim.Grid.Communications.OGS1"/>
983 <Reference name="OpenSim.Grid.Framework"/>
984 <Reference name="OpenSim.Grid.UserServer.Modules"/>
985 <Reference name="OpenMetaverseTypes.dll"/>
986 <Reference name="OpenMetaverse.StructuredData.dll"/>
987 <Reference name="OpenMetaverse.dll"/>
988 <Reference name="XMLRPC.dll"/>
989 <Reference name="log4net.dll"/>
990 <Reference name="Nini.dll"/>
991 <Reference name="DotNetOpenId.dll"/>
992
993 <Files>
994 <Match pattern="*.cs" recurse="true"/>
995 </Files>
996 </Project>
997
998 <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library"> 958 <Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library">
999 <Configuration name="Debug"> 959 <Configuration name="Debug">
1000 <Options> 960 <Options>
@@ -1228,6 +1188,46 @@
1228 </Project> 1188 </Project>
1229 1189
1230 1190
1191 <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
1192 <Configuration name="Debug">
1193 <Options>
1194 <OutputPath>../../../bin/</OutputPath>
1195 </Options>
1196 </Configuration>
1197 <Configuration name="Release">
1198 <Options>
1199 <OutputPath>../../../bin/</OutputPath>
1200 </Options>
1201 </Configuration>
1202
1203 <ReferencePath>../../../bin/</ReferencePath>
1204 <Reference name="System"/>
1205 <Reference name="System.Data"/>
1206 <Reference name="System.Xml"/>
1207 <Reference name="System.Web"/>
1208 <Reference name="OpenSim.Framework"/>
1209 <Reference name="OpenSim.Framework.Console"/>
1210 <Reference name="OpenSim.Framework.Communications"/>
1211 <Reference name="OpenSim.Data"/>
1212 <Reference name="OpenSim.Framework.Servers"/>
1213 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1214 <Reference name="OpenSim.Framework.Statistics"/>
1215 <Reference name="OpenSim.Grid.Communications.OGS1"/>
1216 <Reference name="OpenSim.Grid.Framework"/>
1217 <Reference name="OpenSim.Grid.UserServer.Modules"/>
1218 <Reference name="OpenMetaverseTypes.dll"/>
1219 <Reference name="OpenMetaverse.StructuredData.dll"/>
1220 <Reference name="OpenMetaverse.dll"/>
1221 <Reference name="XMLRPC.dll"/>
1222 <Reference name="log4net.dll"/>
1223 <Reference name="Nini.dll"/>
1224 <Reference name="DotNetOpenId.dll"/>
1225
1226 <Files>
1227 <Match pattern="*.cs" recurse="true"/>
1228 </Files>
1229 </Project>
1230
1231 <Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library"> 1231 <Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
1232 <Configuration name="Debug"> 1232 <Configuration name="Debug">
1233 <Options> 1233 <Options>