Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diva Canto
commit
51d9f7ebd4
|
|
@ -135,7 +135,7 @@ namespace OpenSim.Data.MSSQL
|
||||||
|
|
||||||
insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm);
|
insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm);
|
||||||
insertBuilder.Append(String.Join("', '", fields));
|
insertBuilder.Append(String.Join("', '", fields));
|
||||||
insertBuilder.Append("') values ( @principalID, @");
|
insertBuilder.Append("') values (@principalID, @");
|
||||||
insertBuilder.Append(String.Join(", @", fields));
|
insertBuilder.Append(String.Join(", @", fields));
|
||||||
insertBuilder.Append(")");
|
insertBuilder.Append(")");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,7 @@ namespace OpenSim.Data.MSSQL
|
||||||
StringBuilder insertBuilder = new StringBuilder();
|
StringBuilder insertBuilder = new StringBuilder();
|
||||||
insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm);
|
insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm);
|
||||||
insertBuilder.Append(String.Join("', '", fields));
|
insertBuilder.Append(String.Join("', '", fields));
|
||||||
insertBuilder.Append("') values ( @principalID, @scopeID, @");
|
insertBuilder.Append("') values (@principalID, @scopeID, @");
|
||||||
insertBuilder.Append(String.Join(", @", fields));
|
insertBuilder.Append(String.Join(", @", fields));
|
||||||
insertBuilder.Append(")");
|
insertBuilder.Append(")");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ namespace OpenSim.Data.MySQL
|
||||||
{
|
{
|
||||||
string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
|
string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
|
||||||
String.Join("`, `", fields) +
|
String.Join("`, `", fields) +
|
||||||
"`) values ( ?principalID, ?" + String.Join(", ?", fields) + ")";
|
"`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
|
||||||
|
|
||||||
cmd.CommandText = insert;
|
cmd.CommandText = insert;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -773,7 +773,7 @@ namespace OpenSim.Data.MySQL
|
||||||
"use_estate_sun, fixed_sun, sun_position, " +
|
"use_estate_sun, fixed_sun, sun_position, " +
|
||||||
"covenant, Sandbox, sunvectorx, sunvectory, " +
|
"covenant, Sandbox, sunvectorx, sunvectory, " +
|
||||||
"sunvectorz, loaded_creation_datetime, " +
|
"sunvectorz, loaded_creation_datetime, " +
|
||||||
"loaded_creation_id) values ( ?RegionUUID, ?BlockTerraform, " +
|
"loaded_creation_id) values (?RegionUUID, ?BlockTerraform, " +
|
||||||
"?BlockFly, ?AllowDamage, ?RestrictPushing, " +
|
"?BlockFly, ?AllowDamage, ?RestrictPushing, " +
|
||||||
"?AllowLandResell, ?AllowLandJoinDivide, " +
|
"?AllowLandResell, ?AllowLandJoinDivide, " +
|
||||||
"?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
|
"?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
|
||||||
|
|
|
||||||
|
|
@ -146,7 +146,7 @@ namespace OpenSim.Data.MySQL
|
||||||
{
|
{
|
||||||
string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
|
string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
|
||||||
String.Join("`, `", fields) +
|
String.Join("`, `", fields) +
|
||||||
"`) values ( ?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
|
"`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
|
||||||
|
|
||||||
cmd.CommandText = insert;
|
cmd.CommandText = insert;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ namespace OpenSim.Data.Null
|
||||||
{
|
{
|
||||||
List<RegionData> ret = new List<RegionData>();
|
List<RegionData> ret = new List<RegionData>();
|
||||||
|
|
||||||
foreach(RegionData r in m_regionData.Values)
|
foreach (RegionData r in m_regionData.Values)
|
||||||
{
|
{
|
||||||
if (regionName.Contains("%"))
|
if (regionName.Contains("%"))
|
||||||
{
|
{
|
||||||
|
|
@ -71,7 +71,7 @@ namespace OpenSim.Data.Null
|
||||||
{
|
{
|
||||||
List<RegionData> ret = new List<RegionData>();
|
List<RegionData> ret = new List<RegionData>();
|
||||||
|
|
||||||
foreach(RegionData r in m_regionData.Values)
|
foreach (RegionData r in m_regionData.Values)
|
||||||
{
|
{
|
||||||
if (r.posX == posX && r.posY == posY)
|
if (r.posX == posX && r.posY == posY)
|
||||||
ret.Add(r);
|
ret.Add(r);
|
||||||
|
|
@ -95,7 +95,7 @@ namespace OpenSim.Data.Null
|
||||||
{
|
{
|
||||||
List<RegionData> ret = new List<RegionData>();
|
List<RegionData> ret = new List<RegionData>();
|
||||||
|
|
||||||
foreach(RegionData r in m_regionData.Values)
|
foreach (RegionData r in m_regionData.Values)
|
||||||
{
|
{
|
||||||
if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
|
if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
|
||||||
ret.Add(r);
|
ret.Add(r);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,31 @@
|
||||||
using System;
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3517,7 +3517,7 @@ if (m_shape != null) {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{ // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
|
{ // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
|
||||||
// (mumbles, well, at least if you have infinte CPU powers :-) )
|
// (mumbles, well, at least if you have infinte CPU powers :-))
|
||||||
PhysicsActor pa = this.PhysActor;
|
PhysicsActor pa = this.PhysActor;
|
||||||
if (pa != null)
|
if (pa != null)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -260,12 +260,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
|
|
||||||
public void PostInitialise()
|
public void PostInitialise()
|
||||||
{
|
{
|
||||||
if(m_pluginEnabled)
|
if (m_pluginEnabled)
|
||||||
{
|
{
|
||||||
m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene");
|
m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene");
|
||||||
|
|
||||||
// register the voice interface for this module, so the script engine can call us
|
// register the voice interface for this module, so the script engine can call us
|
||||||
m_scene.RegisterModuleInterface<IVoiceModule>(this);
|
m_scene.RegisterModuleInterface<IVoiceModule>(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -811,7 +811,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
|
|
||||||
lock (m_ParcelAddress)
|
lock (m_ParcelAddress)
|
||||||
{
|
{
|
||||||
if (m_ParcelAddress.ContainsKey( land.GlobalID.ToString() ))
|
if (m_ParcelAddress.ContainsKey(land.GlobalID.ToString()))
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[FreeSwitchVoice]: parcel id {0}: using sip address {1}",
|
m_log.DebugFormat("[FreeSwitchVoice]: parcel id {0}: using sip address {1}",
|
||||||
land.GlobalID, m_ParcelAddress[land.GlobalID.ToString()]);
|
land.GlobalID, m_ParcelAddress[land.GlobalID.ToString()]);
|
||||||
|
|
|
||||||
|
|
@ -871,7 +871,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||||
m_log.ErrorFormat("[XMLRPCGROUPDATA]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
|
m_log.ErrorFormat("[XMLRPCGROUPDATA]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
|
||||||
m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", e.ToString());
|
m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", e.ToString());
|
||||||
|
|
||||||
foreach( string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
|
foreach (string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", ResponseLine);
|
m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", ResponseLine);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -149,7 +149,7 @@ namespace OpenSim.Region.Physics.Meshing
|
||||||
|
|
||||||
public float[] getVertexListAsFloatLocked()
|
public float[] getVertexListAsFloatLocked()
|
||||||
{
|
{
|
||||||
if( pinnedVirtexes.IsAllocated )
|
if (pinnedVirtexes.IsAllocated)
|
||||||
return (float[])(pinnedVirtexes.Target);
|
return (float[])(pinnedVirtexes.Target);
|
||||||
float[] result;
|
float[] result;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -171,7 +171,7 @@ namespace OpenSim.Region.Physics.Meshing
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private ulong GetMeshKey( PrimitiveBaseShape pbs, PhysicsVector size, float lod )
|
private ulong GetMeshKey(PrimitiveBaseShape pbs, PhysicsVector size, float lod)
|
||||||
{
|
{
|
||||||
ulong hash = 5381;
|
ulong hash = 5381;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -546,11 +546,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
|
||||||
bool retried = false;
|
bool retried = false;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
lock (CScodeProvider)
|
lock (CScodeProvider)
|
||||||
{
|
{
|
||||||
results = CScodeProvider.CompileAssemblyFromSource(
|
results = CScodeProvider.CompileAssemblyFromSource(
|
||||||
parameters, Script);
|
parameters, Script);
|
||||||
}
|
}
|
||||||
// Deal with an occasional segv in the compiler.
|
// Deal with an occasional segv in the compiler.
|
||||||
// Rarely, if ever, occurs twice in succession.
|
// Rarely, if ever, occurs twice in succession.
|
||||||
// Line # == 0 and no file name are indications that
|
// Line # == 0 and no file name are indications that
|
||||||
|
|
@ -573,20 +573,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
|
||||||
{
|
{
|
||||||
complete = true;
|
complete = true;
|
||||||
}
|
}
|
||||||
}
|
} while (!complete);
|
||||||
while(!complete);
|
|
||||||
break;
|
break;
|
||||||
case enumCompileType.js:
|
case enumCompileType.js:
|
||||||
results = JScodeProvider.CompileAssemblyFromSource(
|
results = JScodeProvider.CompileAssemblyFromSource(
|
||||||
parameters, Script);
|
parameters, Script);
|
||||||
break;
|
break;
|
||||||
case enumCompileType.yp:
|
case enumCompileType.yp:
|
||||||
results = YPcodeProvider.CompileAssemblyFromSource(
|
results = YPcodeProvider.CompileAssemblyFromSource(
|
||||||
parameters, Script);
|
parameters, Script);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new Exception("Compiler is not able to recongnize "+
|
throw new Exception("Compiler is not able to recongnize "+
|
||||||
"language type \"" + lang.ToString() + "\"");
|
"language type \"" + lang.ToString() + "\"");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check result
|
// Check result
|
||||||
|
|
@ -602,12 +601,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
|
||||||
{
|
{
|
||||||
foreach (CompilerError CompErr in results.Errors)
|
foreach (CompilerError CompErr in results.Errors)
|
||||||
{
|
{
|
||||||
|
string severity = CompErr.IsWarning ? "Warning" : "Error";
|
||||||
string severity = "Error";
|
|
||||||
if (CompErr.IsWarning)
|
|
||||||
{
|
|
||||||
severity = "Warning";
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyValuePair<int, int> lslPos;
|
KeyValuePair<int, int> lslPos;
|
||||||
|
|
||||||
|
|
@ -615,18 +609,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
|
||||||
|
|
||||||
if (severity == "Error")
|
if (severity == "Error")
|
||||||
{
|
{
|
||||||
lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
|
lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
|
||||||
string text = CompErr.ErrorText;
|
string text = CompErr.ErrorText;
|
||||||
|
|
||||||
// Use LSL type names
|
// Use LSL type names
|
||||||
if (lang == enumCompileType.lsl)
|
if (lang == enumCompileType.lsl)
|
||||||
text = ReplaceTypes(CompErr.ErrorText);
|
text = ReplaceTypes(CompErr.ErrorText);
|
||||||
|
|
||||||
// The Second Life viewer's script editor begins
|
// The Second Life viewer's script editor begins
|
||||||
// countingn lines and columns at 0, so we subtract 1.
|
// countingn lines and columns at 0, so we subtract 1.
|
||||||
errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
|
errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
|
||||||
lslPos.Key - 1, lslPos.Value - 1,
|
lslPos.Key - 1, lslPos.Value - 1,
|
||||||
CompErr.ErrorNumber, text, severity);
|
CompErr.ErrorNumber, text, severity);
|
||||||
hadErrors = true;
|
hadErrors = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ namespace OpenSim.Server.Base
|
||||||
{
|
{
|
||||||
string qstring = String.Empty;
|
string qstring = String.Empty;
|
||||||
|
|
||||||
foreach(KeyValuePair<string, string> kvp in data)
|
foreach (KeyValuePair<string, string> kvp in data)
|
||||||
{
|
{
|
||||||
string part;
|
string part;
|
||||||
if (kvp.Value != String.Empty)
|
if (kvp.Value != String.Empty)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,31 @@
|
||||||
using System;
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
|
||||||
|
|
@ -37,19 +37,19 @@ namespace OpenSim.Tools.LSL.Compiler
|
||||||
class Program
|
class Program
|
||||||
{
|
{
|
||||||
private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap;
|
private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap;
|
||||||
private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
|
private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
|
||||||
|
|
||||||
static void Main(string[] args)
|
static void Main(string[] args)
|
||||||
{
|
{
|
||||||
string source = null;
|
string source = null;
|
||||||
|
|
||||||
if(args.Length == 0)
|
if (args.Length == 0)
|
||||||
{
|
{
|
||||||
Console.WriteLine("No input file specified");
|
Console.WriteLine("No input file specified");
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!File.Exists(args[0]))
|
if (!File.Exists(args[0]))
|
||||||
{
|
{
|
||||||
Console.WriteLine("Input file does not exist");
|
Console.WriteLine("Input file does not exist");
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
|
|
@ -136,11 +136,7 @@ namespace OpenSim.Tools.LSL.Compiler
|
||||||
string errtext = String.Empty;
|
string errtext = String.Empty;
|
||||||
foreach (CompilerError CompErr in results.Errors)
|
foreach (CompilerError CompErr in results.Errors)
|
||||||
{
|
{
|
||||||
string severity = "Error";
|
string severity = CompErr.IsWarning ? "Warning" : "Error";
|
||||||
if ( CompErr.IsWarning )
|
|
||||||
{
|
|
||||||
severity = "Warning";
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyValuePair<int, int> lslPos;
|
KeyValuePair<int, int> lslPos;
|
||||||
|
|
||||||
|
|
@ -153,8 +149,8 @@ namespace OpenSim.Tools.LSL.Compiler
|
||||||
// The Second Life viewer's script editor begins
|
// The Second Life viewer's script editor begins
|
||||||
// countingn lines and columns at 0, so we subtract 1.
|
// countingn lines and columns at 0, so we subtract 1.
|
||||||
errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
|
errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
|
||||||
lslPos.Key - 1, lslPos.Value - 1,
|
lslPos.Key - 1, lslPos.Value - 1,
|
||||||
CompErr.ErrorNumber, text, severity);
|
CompErr.ErrorNumber, text, severity);
|
||||||
}
|
}
|
||||||
|
|
||||||
disp = "Completed with errors";
|
disp = "Completed with errors";
|
||||||
|
|
@ -237,20 +233,20 @@ namespace OpenSim.Tools.LSL.Compiler
|
||||||
private static string ReplaceTypes(string message)
|
private static string ReplaceTypes(string message)
|
||||||
{
|
{
|
||||||
message = message.Replace(
|
message = message.Replace(
|
||||||
"OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString",
|
"OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString",
|
||||||
"string");
|
"string");
|
||||||
|
|
||||||
message = message.Replace(
|
message = message.Replace(
|
||||||
"OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger",
|
"OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger",
|
||||||
"integer");
|
"integer");
|
||||||
|
|
||||||
message = message.Replace(
|
message = message.Replace(
|
||||||
"OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat",
|
"OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat",
|
||||||
"float");
|
"float");
|
||||||
|
|
||||||
message = message.Replace(
|
message = message.Replace(
|
||||||
"OpenSim.Region.ScriptEngine.Shared.LSL_Types.list",
|
"OpenSim.Region.ScriptEngine.Shared.LSL_Types.list",
|
||||||
"list");
|
"list");
|
||||||
|
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
@ -263,7 +259,7 @@ namespace OpenSim.Tools.LSL.Compiler
|
||||||
private class kvpSorter : IComparer<KeyValuePair<int,int>>
|
private class kvpSorter : IComparer<KeyValuePair<int,int>>
|
||||||
{
|
{
|
||||||
public int Compare(KeyValuePair<int,int> a,
|
public int Compare(KeyValuePair<int,int> a,
|
||||||
KeyValuePair<int,int> b)
|
KeyValuePair<int,int> b)
|
||||||
{
|
{
|
||||||
return a.Key.CompareTo(b.Key);
|
return a.Key.CompareTo(b.Key);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
130
Prebuild/COPYING
130
Prebuild/COPYING
|
|
@ -1,65 +1,65 @@
|
||||||
BSD License
|
BSD License
|
||||||
Copyright (c)2004-2008
|
Copyright (c)2004-2008
|
||||||
|
|
||||||
See AUTHORS file for list of copyright holders
|
See AUTHORS file for list of copyright holders
|
||||||
|
|
||||||
Dave Hudson (jendave@yahoo.com),
|
Dave Hudson (jendave@yahoo.com),
|
||||||
Matthew Holmes (matthew@wildfiregames.com)
|
Matthew Holmes (matthew@wildfiregames.com)
|
||||||
Dan Moorehead (dan05a@gmail.com)
|
Dan Moorehead (dan05a@gmail.com)
|
||||||
Rob Loach (http://www.robloach.net)
|
Rob Loach (http://www.robloach.net)
|
||||||
C.J. Adams-Collier (cjac@colliertech.org)
|
C.J. Adams-Collier (cjac@colliertech.org)
|
||||||
|
|
||||||
http://dnpb.sourceforge.net
|
http://dnpb.sourceforge.net
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions
|
modification, are permitted provided that the following conditions
|
||||||
are met:
|
are met:
|
||||||
|
|
||||||
1. Redistributions of source code must retain the above copyright notice,
|
1. Redistributions of source code must retain the above copyright notice,
|
||||||
this list of conditions and the following disclaimer.
|
this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
this list of conditions and the following disclaimer in the documentation
|
this list of conditions and the following disclaimer in the documentation
|
||||||
and/or other materials provided with the distribution.
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
3. The names of the authors may not be used to endorse or promote
|
3. The names of the authors may not be used to endorse or promote
|
||||||
products derived from this software without specific prior written
|
products derived from this software without specific prior written
|
||||||
permission.
|
permission.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||||
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||||
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||||
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||||
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
POSSIBILITY OF SUCH DAMAGE.
|
POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
Portions of src/Core/Targets/AutotoolsTarget.cs
|
Portions of src/Core/Targets/AutotoolsTarget.cs
|
||||||
// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
|
// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining
|
// Permission is hereby granted, free of charge, to any person obtaining
|
||||||
// a copy of this software and associated documentation files (the
|
// a copy of this software and associated documentation files (the
|
||||||
// "Software"), to deal in the Software without restriction, including
|
// "Software"), to deal in the Software without restriction, including
|
||||||
// without limitation the rights to use, copy, modify, merge, publish,
|
// without limitation the rights to use, copy, modify, merge, publish,
|
||||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
// permit persons to whom the Software is furnished to do so, subject to
|
// permit persons to whom the Software is furnished to do so, subject to
|
||||||
// the following conditions:
|
// the following conditions:
|
||||||
//
|
//
|
||||||
// The above copyright notice and this permission notice shall be
|
// The above copyright notice and this permission notice shall be
|
||||||
// included in all copies or substantial portions of the Software.
|
// included in all copies or substantial portions of the Software.
|
||||||
//
|
//
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
|
||||||
400
Prebuild/NEWS
400
Prebuild/NEWS
|
|
@ -1,200 +1,200 @@
|
||||||
Prebuild 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.
|
Prebuild 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.
|
||||||
|
|
||||||
Documentation and downloads are available at http://dnpb.sourceforge.net.
|
Documentation and downloads are available at http://dnpb.sourceforge.net.
|
||||||
|
|
||||||
Prebuild is licensed under the BSD license.
|
Prebuild is licensed under the BSD license.
|
||||||
|
|
||||||
[ XXXXXXX XX, XXX - 1.3.2 ]
|
[ XXXXXXX XX, XXX - 1.3.2 ]
|
||||||
+ Added Keyfile signing to NAnt target and VS2005 target
|
+ Added Keyfile signing to NAnt target and VS2005 target
|
||||||
+ Updated XSD file to 1.7
|
+ Updated XSD file to 1.7
|
||||||
+ Boo and VisualBasic Language support in VS2005 target
|
+ Boo and VisualBasic Language support in VS2005 target
|
||||||
+ Added basic Autotools target. It creates a non-recursive Autotools system.
|
+ Added basic Autotools target. It creates a non-recursive Autotools system.
|
||||||
! Multiple files can be excluded from the Match node
|
! Multiple files can be excluded from the Match node
|
||||||
! VS2005 now handles .resx files correctly.
|
! VS2005 now handles .resx files correctly.
|
||||||
! NAnt and Autotools now handle defines
|
! NAnt and Autotools now handle defines
|
||||||
! NAnt and Autotools now handle resources
|
! NAnt and Autotools now handle resources
|
||||||
+ Conditional XML variables can be passed through the command line.
|
+ Conditional XML variables can be passed through the command line.
|
||||||
+ Added /install and /remove command line flags to install and remove assemblies from the GAC
|
+ Added /install and /remove command line flags to install and remove assemblies from the GAC
|
||||||
+ Many fixes to VS2005 target
|
+ Many fixes to VS2005 target
|
||||||
|
|
||||||
[ July 21, 2006 - 1.3.1 ]
|
[ July 21, 2006 - 1.3.1 ]
|
||||||
! VS2005 fixes from Rob Loach
|
! VS2005 fixes from Rob Loach
|
||||||
! NAnt fixes from Rob Loach and David Hudson
|
! NAnt fixes from Rob Loach and David Hudson
|
||||||
! XML doc fixes from Rob Loach
|
! XML doc fixes from Rob Loach
|
||||||
+ Added SharpDevelop2 target (really just uses VS2005 target)
|
+ Added SharpDevelop2 target (really just uses VS2005 target)
|
||||||
! Fixed bug with BuildEvents in Monodevelop target
|
! Fixed bug with BuildEvents in Monodevelop target
|
||||||
+ Passing /yes will default to answering yes to any warnings
|
+ Passing /yes will default to answering yes to any warnings
|
||||||
|
|
||||||
[ February 28, 2006 - 1.3 ]
|
[ February 28, 2006 - 1.3 ]
|
||||||
+ Added MonoDevelop target.
|
+ Added MonoDevelop target.
|
||||||
+ Added NAnt target.
|
+ Added NAnt target.
|
||||||
+ Lots of fixes to all targets.
|
+ Lots of fixes to all targets.
|
||||||
* Cleaned up the code using FXCop.
|
* Cleaned up the code using FXCop.
|
||||||
* Updated schema to 1.6 to fix a typo and add a new parameter.
|
* Updated schema to 1.6 to fix a typo and add a new parameter.
|
||||||
* jendave is now the maintainer of the project. RobLoach has been added as a developer.
|
* jendave is now the maintainer of the project. RobLoach has been added as a developer.
|
||||||
* Removed references to 'dnpb'.
|
* Removed references to 'dnpb'.
|
||||||
+ Added rudimentary support for pre- and post- build scripts
|
+ Added rudimentary support for pre- and post- build scripts
|
||||||
* Updated examples.
|
* Updated examples.
|
||||||
|
|
||||||
[ August 5, 2004 - 1.2 ]
|
[ August 5, 2004 - 1.2 ]
|
||||||
+ Added Visual Studio Express (vs2005express) target contributed by Borrillis and modified for use with different languages
|
+ Added Visual Studio Express (vs2005express) target contributed by Borrillis and modified for use with different languages
|
||||||
+ 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
|
+ 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
|
||||||
+ 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
|
+ 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
|
||||||
* Modified the removedir command line option to allow for a pipe-delimited list of directory names
|
* Modified the removedir command line option to allow for a pipe-delimited list of directory names
|
||||||
! 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
|
! 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
|
||||||
+ Added the GenerateXmlDocFile boolean option to the Options XML element
|
+ Added the GenerateXmlDocFile boolean option to the Options XML element
|
||||||
* 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
|
* 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
|
||||||
|
|
||||||
[ January 3, 2004 - 1.1 ]
|
[ January 3, 2004 - 1.1 ]
|
||||||
! Replaced regex use for more efficient manual parsing to allow use on non-windows platforms with Mono which has Regex problems
|
! Replaced regex use for more efficient manual parsing to allow use on non-windows platforms with Mono which has Regex problems
|
||||||
+ 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
|
+ 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
|
||||||
* Make the version attribute on the root element optional as it isn't used and not needed since the schema url contains the version
|
* Make the version attribute on the root element optional as it isn't used and not needed since the schema url contains the version
|
||||||
|
|
||||||
[ December 30, 2004 - 1.1 ]
|
[ December 30, 2004 - 1.1 ]
|
||||||
! Applied Leed's fix for SharpDevelop references
|
! Applied Leed's fix for SharpDevelop references
|
||||||
+ Rewrote much of the processing for better validation and without the use of a temp file
|
+ Rewrote much of the processing for better validation and without the use of a temp file
|
||||||
+ Added support for configurations at the project level which are named All. They now apply changes to all Solution level defined configs
|
+ Added support for configurations at the project level which are named All. They now apply changes to all Solution level defined configs
|
||||||
* Changed all spaces into tabs
|
* Changed all spaces into tabs
|
||||||
+ Added support for the None build action
|
+ Added support for the None build action
|
||||||
* 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
|
* 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
|
||||||
|
|
||||||
[ December 25, 2004 - 1.0 ]
|
[ December 25, 2004 - 1.0 ]
|
||||||
+ Added the /removedir option for cleaning directories like obj before file releases
|
+ Added the /removedir option for cleaning directories like obj before file releases
|
||||||
+ Changed WriteTempXml() and the new DeleteTempXml() methods to be compiled only in DEBUG builds
|
+ Changed WriteTempXml() and the new DeleteTempXml() methods to be compiled only in DEBUG builds
|
||||||
* Made path optional for Match elements (defaults to current directory) and updates schema for it
|
* Made path optional for Match elements (defaults to current directory) and updates schema for it
|
||||||
! Fixed XML example in the readme.txt
|
! Fixed XML example in the readme.txt
|
||||||
+ Added example xml files to docs directory
|
+ Added example xml files to docs directory
|
||||||
* Updated license.txt to add Dan Moorehead and update copyright years
|
* Updated license.txt to add Dan Moorehead and update copyright years
|
||||||
+ Updated prebuild.xml to take advantage of the default path attribute for match elements
|
+ Updated prebuild.xml to take advantage of the default path attribute for match elements
|
||||||
+ Updated Clean to delete the obj directories
|
+ Updated Clean to delete the obj directories
|
||||||
|
|
||||||
[ December 25, 2004 - 0.13 ]
|
[ December 25, 2004 - 0.13 ]
|
||||||
+ Added dnpb.exe so that it can be used to generate the project files
|
+ Added dnpb.exe so that it can be used to generate the project files
|
||||||
+ Added dnpb.ico
|
+ Added dnpb.ico
|
||||||
* Added parameterless Write statement to Log for writing a single line
|
* Added parameterless Write statement to Log for writing a single line
|
||||||
* Changed scehema to version 1.3 for support of icon attribute
|
* Changed scehema to version 1.3 for support of icon attribute
|
||||||
* Added support for All configuration name under a Project node signifying common settings for all configurations
|
* Added support for All configuration name under a Project node signifying common settings for all configurations
|
||||||
! Fixed the SupressWarnings by adding the corresponding field to OptionsNode
|
! Fixed the SupressWarnings by adding the corresponding field to OptionsNode
|
||||||
* Wrote documentation in docs/readme.txt
|
* Wrote documentation in docs/readme.txt
|
||||||
* Added Dan Moorehead to copyrights and extended date from 2004 to 2004-2005
|
* Added Dan Moorehead to copyrights and extended date from 2004 to 2004-2005
|
||||||
* Updated prebuild.xml
|
* Updated prebuild.xml
|
||||||
* Optimized Log class
|
* Optimized Log class
|
||||||
* Updated OutputUsage()
|
* Updated OutputUsage()
|
||||||
* /clean targets all by default
|
* /clean targets all by default
|
||||||
* No log file is used by default, /log without value specified uses default file name
|
* No log file is used by default, /log without value specified uses default file name
|
||||||
+ Added support for the /pause which pauses the utility after execution to observe output
|
+ Added support for the /pause which pauses the utility after execution to observe output
|
||||||
|
|
||||||
|
|
||||||
[ September 27, 2004 - 0.12.2a ]
|
[ September 27, 2004 - 0.12.2a ]
|
||||||
! Fixed a nasty bug when trying to delete our temp file for pre-processing.
|
! Fixed a nasty bug when trying to delete our temp file for pre-processing.
|
||||||
|
|
||||||
[ September 15, 2004 - 0.12.2 ]
|
[ September 15, 2004 - 0.12.2 ]
|
||||||
+ Expanded platform identification, thanks to the NAnt guys for shedding some
|
+ Expanded platform identification, thanks to the NAnt guys for shedding some
|
||||||
light on how to properly check for UNIX platforms! Thanks guys!
|
light on how to properly check for UNIX platforms! Thanks guys!
|
||||||
* POSIX OS identifier changed to UNIX. Valid OS names are now "Win32", "UNIX",
|
* POSIX OS identifier changed to UNIX. Valid OS names are now "Win32", "UNIX",
|
||||||
and "Unknown".
|
and "Unknown".
|
||||||
! Fixed SharpDevelop target to properly use the 'rootNamespace' attribute of
|
! Fixed SharpDevelop target to properly use the 'rootNamespace' attribute of
|
||||||
the Project tag.
|
the Project tag.
|
||||||
+ New command-line switch, /ppo, forces DNPB to pre-process the file and write
|
+ New command-line switch, /ppo, forces DNPB to pre-process the file and write
|
||||||
the pre-processed file. This allows you to test/debug your pre-processor
|
the pre-processed file. This allows you to test/debug your pre-processor
|
||||||
macros. No other processing will be done. You can specify a target file as
|
macros. No other processing will be done. You can specify a target file as
|
||||||
a paramter for the /ppo switch, or DNPB will write the file 'preprocessed.xml'
|
a paramter for the /ppo switch, or DNPB will write the file 'preprocessed.xml'
|
||||||
if you do not specify a file.
|
if you do not specify a file.
|
||||||
+ The Match tag now has a 'buildAction' attribute which functions exactly like
|
+ The Match tag now has a 'buildAction' attribute which functions exactly like
|
||||||
the attribute of the same name for the File tag.
|
the attribute of the same name for the File tag.
|
||||||
|
|
||||||
[ August 5, 2004 - 0.12.1 ]
|
[ August 5, 2004 - 0.12.1 ]
|
||||||
+ Added environment variable expansion for all values. Environment variables
|
+ Added environment variable expansion for all values. Environment variables
|
||||||
should be listed in the form ${VAR}.
|
should be listed in the form ${VAR}.
|
||||||
|
|
||||||
[ July 30, 2004 - 0.12.0 ]
|
[ July 30, 2004 - 0.12.0 ]
|
||||||
+ Added preprocessing via XML processing information tags. Available tags
|
+ Added preprocessing via XML processing information tags. Available tags
|
||||||
are: <?if <exp> ?>, <?elseif <exp> ?>, <?else ?> and <?endif ?>. The
|
are: <?if <exp> ?>, <?elseif <exp> ?>, <?else ?> and <?endif ?>. The
|
||||||
current expression parser is very basic, but will be replaced with a more
|
current expression parser is very basic, but will be replaced with a more
|
||||||
capable parser over time. Current operators available are: =, !=, <, >,
|
capable parser over time. Current operators available are: =, !=, <, >,
|
||||||
<=, >=. Current test variables available: OS, RuntimeVersion, RuntimeMajor,
|
<=, >=. Current test variables available: OS, RuntimeVersion, RuntimeMajor,
|
||||||
RuntimeMinor, RuntimeRevision.
|
RuntimeMinor, RuntimeRevision.
|
||||||
|
|
||||||
[ July 27, 2004 - 0.11.4 ]
|
[ July 27, 2004 - 0.11.4 ]
|
||||||
+ Added 'useRegex' attribute to the Match tag. Matches can now use regular
|
+ Added 'useRegex' attribute to the Match tag. Matches can now use regular
|
||||||
expressions to match filenames.
|
expressions to match filenames.
|
||||||
+ Added the 'assemblyName' attribute to the Project tag. Projects can now
|
+ Added the 'assemblyName' attribute to the Project tag. Projects can now
|
||||||
set their output assembly name.
|
set their output assembly name.
|
||||||
! Fixed several bugs in the way that Project tags inheirt their parent
|
! Fixed several bugs in the way that Project tags inheirt their parent
|
||||||
Solutions configuration options. This operation should now work fully as
|
Solutions configuration options. This operation should now work fully as
|
||||||
intended.
|
intended.
|
||||||
! Due to some wierdness, Project Guid's are now stored as part of the Project
|
! Due to some wierdness, Project Guid's are now stored as part of the Project
|
||||||
node and created at parse time.
|
node and created at parse time.
|
||||||
|
|
||||||
[ May 11, 2004 - 0.11.3 ]
|
[ May 11, 2004 - 0.11.3 ]
|
||||||
! Fixed a bug where I was writing the wrong property name for a projects root
|
! Fixed a bug where I was writing the wrong property name for a projects root
|
||||||
namespace.
|
namespace.
|
||||||
! Removed a DEBUG statement I had left in the code in 0.11.2.
|
! Removed a DEBUG statement I had left in the code in 0.11.2.
|
||||||
! Fixed a bug in the VS2002 writer which caused the version variables to not
|
! Fixed a bug in the VS2002 writer which caused the version variables to not
|
||||||
be overriden correctly.
|
be overriden correctly.
|
||||||
+ Added the rootNamespace property to the <Project> element, allowing you to
|
+ Added the rootNamespace property to the <Project> element, allowing you to
|
||||||
specify the root namespace.
|
specify the root namespace.
|
||||||
* /target and /clean are now mutually exclusive command line switches, and
|
* /target and /clean are now mutually exclusive command line switches, and
|
||||||
they both now take the all option. In the case of /target all, all build
|
they both now take the all option. In the case of /target all, all build
|
||||||
file for all targets will be created. In the case of /clean all, the user
|
file for all targets will be created. In the case of /clean all, the user
|
||||||
will be prompted to make sure they want to do it, and if so, will clean
|
will be prompted to make sure they want to do it, and if so, will clean
|
||||||
all build files for all targets.
|
all build files for all targets.
|
||||||
|
|
||||||
[ April 22, 2004 - 0.11.2 ]
|
[ April 22, 2004 - 0.11.2 ]
|
||||||
! Fixed a bug with the /file command-line operator. Was using the unresolved
|
! Fixed a bug with the /file command-line operator. Was using the unresolved
|
||||||
file path rather then the resolved one, was making the attempt to open the
|
file path rather then the resolved one, was making the attempt to open the
|
||||||
dnpb file fail.
|
dnpb file fail.
|
||||||
! Fixed a bug in the schema that required at least 1 solution and 1 reference
|
! Fixed a bug in the schema that required at least 1 solution and 1 reference
|
||||||
path. We can do just fine with 0 of either of these. Some files may be all
|
path. We can do just fine with 0 of either of these. Some files may be all
|
||||||
<Process> statements and not have any <Solution> tags.
|
<Process> statements and not have any <Solution> tags.
|
||||||
! Fixed a bug that caused the project references not to be written with the
|
! Fixed a bug that caused the project references not to be written with the
|
||||||
SharpDevelop target.
|
SharpDevelop target.
|
||||||
* Changed the schema to version 1.2, allowing for Configuration nodes to exist
|
* Changed the schema to version 1.2, allowing for Configuration nodes to exist
|
||||||
under project nodes. The inheritance of values is hierarchical. Meaning, if
|
under project nodes. The inheritance of values is hierarchical. Meaning, if
|
||||||
you define a configuration named Debug at the Soltion level, and one by the
|
you define a configuration named Debug at the Soltion level, and one by the
|
||||||
same name at the Project level, the one at the Project level will first
|
same name at the Project level, the one at the Project level will first
|
||||||
inherit the options of the Solution level configuration, then set it's own
|
inherit the options of the Solution level configuration, then set it's own
|
||||||
options. If you define a configuration at the Project level and it does not
|
options. If you define a configuration at the Project level and it does not
|
||||||
exist at the Solution level, it will be created at the Solution level.
|
exist at the Solution level, it will be created at the Solution level.
|
||||||
* Project references should now work correctly across the board. Note that due
|
* Project references should now work correctly across the board. Note that due
|
||||||
to a restriction in Visual Studio, you can only reference projects in the same
|
to a restriction in Visual Studio, you can only reference projects in the same
|
||||||
solution.
|
solution.
|
||||||
|
|
||||||
[ April 21, 2004 - 0.11.1 ]
|
[ April 21, 2004 - 0.11.1 ]
|
||||||
! Fixed a problem with resolving paths in various targets. Was not properly
|
! Fixed a problem with resolving paths in various targets. Was not properly
|
||||||
setting the CWD.
|
setting the CWD.
|
||||||
* Schema updated to 1.1, moving the ReferencePath element from the Options
|
* Schema updated to 1.1, moving the ReferencePath element from the Options
|
||||||
element to the Project element. This makes more logical sense, given that
|
element to the Project element. This makes more logical sense, given that
|
||||||
reference paths are resolved relative to the project path. Any prebuild.xml
|
reference paths are resolved relative to the project path. Any prebuild.xml
|
||||||
file referecning verison 1.0 will fail! Please update to the 1.1 schema.
|
file referecning verison 1.0 will fail! Please update to the 1.1 schema.
|
||||||
|
|
||||||
[ April 19, 2004 - 0.11.0 ]
|
[ April 19, 2004 - 0.11.0 ]
|
||||||
* Added several attributes across the code to make FxCop happy
|
* Added several attributes across the code to make FxCop happy
|
||||||
! Fixed bugs in reference paths being written in the VS targets.
|
! Fixed bugs in reference paths being written in the VS targets.
|
||||||
! Fixed a bug in ProjectNode which was doing two CWDStack.Push() calls instead of
|
! Fixed a bug in ProjectNode which was doing two CWDStack.Push() calls instead of
|
||||||
a Push/Pop pair. Was wreaking havoc with <Process> tags.
|
a Push/Pop pair. Was wreaking havoc with <Process> tags.
|
||||||
! Fixed some bugs in the path tracking, both the Project and Solution nodes now
|
! Fixed some bugs in the path tracking, both the Project and Solution nodes now
|
||||||
have a FullPath property, which is the full path to the file resolved at load
|
have a FullPath property, which is the full path to the file resolved at load
|
||||||
time. This should fix all path relativity problems.
|
time. This should fix all path relativity problems.
|
||||||
+ Added new /clean switch, allowing the target to clean up any files it generated.
|
+ Added new /clean switch, allowing the target to clean up any files it generated.
|
||||||
in accordance, the ITarget interface has been updated to support a new Clean()
|
in accordance, the ITarget interface has been updated to support a new Clean()
|
||||||
method.
|
method.
|
||||||
+ Completed addition of the <Process> tag, to allow the referencing of external
|
+ Completed addition of the <Process> tag, to allow the referencing of external
|
||||||
prebuild.xml files.
|
prebuild.xml files.
|
||||||
+ Added the runtime attribute to the Project element. This allows the developer
|
+ Added the runtime attribute to the Project element. This allows the developer
|
||||||
to specify which runtime a project should target (Mono or Microsoft). This is
|
to specify which runtime a project should target (Mono or Microsoft). This is
|
||||||
of course ignored in certain targets like the Visual Studio targets.
|
of course ignored in certain targets like the Visual Studio targets.
|
||||||
+ Added the SharpDevelop target.
|
+ Added the SharpDevelop target.
|
||||||
|
|
||||||
[ April 13, 2004 - 0.10.1a ]
|
[ April 13, 2004 - 0.10.1a ]
|
||||||
+ Added the buildAction attribute to the File node. This is needed for dnpb
|
+ Added the buildAction attribute to the File node. This is needed for dnpb
|
||||||
to even be able to bootstrap itself (dnpb-1.0.xsd must be an embedded resource)
|
to even be able to bootstrap itself (dnpb-1.0.xsd must be an embedded resource)
|
||||||
|
|
||||||
[ April 13, 2004 - 0.10.1 ]
|
[ April 13, 2004 - 0.10.1 ]
|
||||||
* First Release
|
* First Release
|
||||||
|
|
||||||
[ Key ]
|
[ Key ]
|
||||||
* = Change or information
|
* = Change or information
|
||||||
+ = Addition
|
+ = Addition
|
||||||
! = Bug Fix
|
! = Bug Fix
|
||||||
|
|
||||||
|
|
|
||||||
80
prebuild.xml
80
prebuild.xml
|
|
@ -955,46 +955,6 @@
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
<Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
|
|
||||||
<Configuration name="Debug">
|
|
||||||
<Options>
|
|
||||||
<OutputPath>../../../bin/</OutputPath>
|
|
||||||
</Options>
|
|
||||||
</Configuration>
|
|
||||||
<Configuration name="Release">
|
|
||||||
<Options>
|
|
||||||
<OutputPath>../../../bin/</OutputPath>
|
|
||||||
</Options>
|
|
||||||
</Configuration>
|
|
||||||
|
|
||||||
<ReferencePath>../../../bin/</ReferencePath>
|
|
||||||
<Reference name="System"/>
|
|
||||||
<Reference name="System.Data"/>
|
|
||||||
<Reference name="System.Xml"/>
|
|
||||||
<Reference name="System.Web"/>
|
|
||||||
<Reference name="OpenSim.Framework"/>
|
|
||||||
<Reference name="OpenSim.Framework.Console"/>
|
|
||||||
<Reference name="OpenSim.Framework.Communications"/>
|
|
||||||
<Reference name="OpenSim.Data"/>
|
|
||||||
<Reference name="OpenSim.Framework.Servers"/>
|
|
||||||
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
|
||||||
<Reference name="OpenSim.Framework.Statistics"/>
|
|
||||||
<Reference name="OpenSim.Grid.Communications.OGS1"/>
|
|
||||||
<Reference name="OpenSim.Grid.Framework"/>
|
|
||||||
<Reference name="OpenSim.Grid.UserServer.Modules"/>
|
|
||||||
<Reference name="OpenMetaverseTypes.dll"/>
|
|
||||||
<Reference name="OpenMetaverse.StructuredData.dll"/>
|
|
||||||
<Reference name="OpenMetaverse.dll"/>
|
|
||||||
<Reference name="XMLRPC.dll"/>
|
|
||||||
<Reference name="log4net.dll"/>
|
|
||||||
<Reference name="Nini.dll"/>
|
|
||||||
<Reference name="DotNetOpenId.dll"/>
|
|
||||||
|
|
||||||
<Files>
|
|
||||||
<Match pattern="*.cs" recurse="true"/>
|
|
||||||
</Files>
|
|
||||||
</Project>
|
|
||||||
|
|
||||||
<Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library">
|
<Project frameworkVersion="v3_5" name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
|
@ -1228,6 +1188,46 @@
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
|
<Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
|
||||||
|
<Configuration name="Debug">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
<Configuration name="Release">
|
||||||
|
<Options>
|
||||||
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
</Options>
|
||||||
|
</Configuration>
|
||||||
|
|
||||||
|
<ReferencePath>../../../bin/</ReferencePath>
|
||||||
|
<Reference name="System"/>
|
||||||
|
<Reference name="System.Data"/>
|
||||||
|
<Reference name="System.Xml"/>
|
||||||
|
<Reference name="System.Web"/>
|
||||||
|
<Reference name="OpenSim.Framework"/>
|
||||||
|
<Reference name="OpenSim.Framework.Console"/>
|
||||||
|
<Reference name="OpenSim.Framework.Communications"/>
|
||||||
|
<Reference name="OpenSim.Data"/>
|
||||||
|
<Reference name="OpenSim.Framework.Servers"/>
|
||||||
|
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
||||||
|
<Reference name="OpenSim.Framework.Statistics"/>
|
||||||
|
<Reference name="OpenSim.Grid.Communications.OGS1"/>
|
||||||
|
<Reference name="OpenSim.Grid.Framework"/>
|
||||||
|
<Reference name="OpenSim.Grid.UserServer.Modules"/>
|
||||||
|
<Reference name="OpenMetaverseTypes.dll"/>
|
||||||
|
<Reference name="OpenMetaverse.StructuredData.dll"/>
|
||||||
|
<Reference name="OpenMetaverse.dll"/>
|
||||||
|
<Reference name="XMLRPC.dll"/>
|
||||||
|
<Reference name="log4net.dll"/>
|
||||||
|
<Reference name="Nini.dll"/>
|
||||||
|
<Reference name="DotNetOpenId.dll"/>
|
||||||
|
|
||||||
|
<Files>
|
||||||
|
<Match pattern="*.cs" recurse="true"/>
|
||||||
|
</Files>
|
||||||
|
</Project>
|
||||||
|
|
||||||
<Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
|
<Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue