This cleans up versioning. Specifically:

- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions

It also eliminates the last addin.xml files that were still there, for consistency.
This commit is contained in:
Diva Canto
2014-12-30 12:53:31 -08:00
parent 2506728e35
commit 7466ef0525
21 changed files with 37 additions and 53 deletions

View File

@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Addins;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices;
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: Addin("OpenSim.Region.ScriptEngine.XEngine", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]

View File

@@ -1,13 +0,0 @@
<Addin id="OpenSim.Region.ScriptEngine.XEngine" version="0.2">
<Runtime>
<Import assembly="OpenSim.Region.ScriptEngine.XEngine.dll"/>
</Runtime>
<Dependencies>
<Addin id="OpenSim" version="0.8.1" />
</Dependencies>
<Extension path = "/OpenSim/RegionModules">
<RegionModule id="XEngine" type="OpenSim.Region.ScriptEngine.XEngine.XEngine" />
</Extension>
</Addin>

View File

@@ -42,6 +42,7 @@ using OpenMetaverse.StructuredData;
using log4net;
using Nini.Config;
using Amib.Threading;
using Mono.Addins;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Framework.Scenes;
@@ -60,6 +61,7 @@ using ScriptCompileQueue = OpenSim.Framework.LocklessQueue<object[]>;
namespace OpenSim.Region.ScriptEngine.XEngine
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEngine")]
public class XEngine : INonSharedRegionModule, IScriptModule, IScriptEngine
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);