OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
sedebug
Diva Canto 2014-12-30 12:53:31 -08:00
parent 2506728e35
commit 7466ef0525
21 changed files with 37 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: Addin("OpenSim.Groups", "0.1")]
[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
[assembly: Addin("OpenSim.Groups", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]

4
OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: Addin("OpenSim.OfflineIM", "0.1")]
[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
[assembly: Addin("OpenSim.OfflineIM", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]

4
OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
View File

@ -65,5 +65,5 @@ using Mono.Addins;
[assembly : AssemblyVersion("0.8.1.*")]
[assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", "0.1")]
[assembly: AddinDependency("OpenSim", "0.8.1")]
[assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]

4
OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", "0.1")]
[assembly: AddinDependency("OpenSim", "0.8.1")]
[assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]

4
OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", "0.1")]
[assembly: AddinDependency("OpenSim", "0.8.1")]
[assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]

2
OpenSim/Framework/Servers/VersionInfo.cs → OpenSim/Framework/VersionInfo.cs
View File

@ -29,7 +29,7 @@ namespace OpenSim
{
public class VersionInfo
{
private const string VERSION_NUMBER = "0.8.1";
public const string VERSION_NUMBER = "0.8.1.0";
private const Flavour VERSION_FLAVOUR = Flavour.Dev;
public enum Flavour

2
OpenSim/Region/Application/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: AddinRoot("OpenSim", "0.8.1")]
[assembly: AddinRoot("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: ImportAddinAssembly("Opensim.Framework.dll")]

4
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
View File

@ -40,8 +40,8 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using Caps = OpenSim.Framework.Capabilities.Caps;
[assembly: Addin("LindenCaps", "0.1")]
[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
[assembly: Addin("LindenCaps", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Region.ClientStack.Linden
{

4
OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
View File

@ -33,6 +33,6 @@ using Mono.Addins;
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
[assembly: Addin("OpenSim.Region.CoreModules", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]

4
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
View File

@ -42,8 +42,8 @@ using OpenSim.Region.DataSnapshot.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
[assembly: Addin("DataSnapshot", "0.1")]
[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
[assembly: Addin("DataSnapshot", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Region.DataSnapshot
{

2
OpenSim/Region/Framework/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using Mono.Addins;
// Revision
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: AddinRoot("OpenSim.Region.Framework", "0.8.1")]
[assembly: AddinRoot("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]

4
OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
View File

@ -33,5 +33,5 @@ using Mono.Addins;
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]
[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
[assembly: Addin("OpenSim.Region.OptionalModules", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]

3
OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
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.RegionModules.RegionCombinerModule", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]

4
OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
View File

@ -31,10 +31,12 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using Mono.Addins;
namespace OpenSim.Region.RegionCombinerModule
{
public class RegionCombinerPermissionModule
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")]
public class RegionCombinerPermissionModule
{
private Scene m_rootScene;

14
OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
View File

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

3
OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
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)]

13
OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
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>

2
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
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);

4
OpenSim/Region/UserStatistics/WebStatsModule.cs
View File

@ -50,8 +50,8 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
using OSD = OpenMetaverse.StructuredData.OSD;
using OSDMap = OpenMetaverse.StructuredData.OSDMap;
[assembly: Addin("WebStats", "1.0")]
[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
[assembly: Addin("WebStats", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Region.UserStatistics
{

4
OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
View File

@ -39,8 +39,8 @@ using OpenSim.Services.Interfaces;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
[assembly: Addin("SimianGrid", "1.0")]
[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
[assembly: Addin("SimianGrid", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Services.Connectors.SimianGrid
{

1
prebuild.xml
View File

@ -2355,6 +2355,7 @@
<Reference name="SmartThreadPool"/>
<Reference name="Nini" path="../../../../bin/"/>
<Reference name="log4net" path="../../../../bin/"/>
<Reference name="Mono.Addins" path="../../../../bin/"/>
<Files>
<Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>