diff options
author | Lluis Sanchez <lluis@novell.com> | 2010-05-25 18:20:44 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2010-05-25 18:20:44 +0400 |
commit | e888cb2d660bba9d05774fba2f0f54de6df1d5cf (patch) | |
tree | 06fd8c1a4ed422e3f2b0a98035922bcdfe6b6d07 | |
parent | cd1df7b2a4cb170c95f2ea5b1e9cd0f7d89ba14f (diff) |
* Mono.Addins.sln:
* mautil/mautil.csproj:
* Mono.Addins/Mono.Addins.csproj:
* Mono.Addins.Gui/Mono.Addins.Gui.csproj: Add Debug and Release
configurations.
* Mono.Addins.CecilReflector/Mono.Addins.CecilReflector/Reflector.cs:
When resolving custom attribute properties and fields look it base
classes.
* Mono.Addins/Mono.Addins.Database/AddinScanner.cs: Fixed node type
parsing issue with TypeExtensionPointAttribute.
svn path=/trunk/mono-addins/; revision=157853
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Mono.Addins.CecilReflector/ChangeLog | 5 | ||||
-rw-r--r-- | Mono.Addins.CecilReflector/Mono.Addins.CecilReflector/Reflector.cs | 41 | ||||
-rw-r--r-- | Mono.Addins.Gui/ChangeLog | 5 | ||||
-rw-r--r-- | Mono.Addins.Gui/Mono.Addins.Gui.csproj | 13 | ||||
-rw-r--r-- | Mono.Addins.sln | 83 | ||||
-rw-r--r-- | Mono.Addins/ChangeLog | 7 | ||||
-rw-r--r-- | Mono.Addins/Mono.Addins.Database/AddinScanner.cs | 5 | ||||
-rw-r--r-- | Mono.Addins/Mono.Addins.csproj | 15 | ||||
-rw-r--r-- | mautil/ChangeLog | 4 | ||||
-rw-r--r-- | mautil/mautil.csproj | 12 |
11 files changed, 142 insertions, 52 deletions
@@ -1,5 +1,9 @@ 2010-05-25 Lluis Sanchez Gual <lluis@novell.com> + * Mono.Addins.sln: Add Debug and Release configurations. + +2010-05-25 Lluis Sanchez Gual <lluis@novell.com> + * Samples/Samples.mdw: * Samples/TextEditorSWF: Added new sample diff --git a/Mono.Addins.CecilReflector/ChangeLog b/Mono.Addins.CecilReflector/ChangeLog index 8b40f71..d19e7fd 100644 --- a/Mono.Addins.CecilReflector/ChangeLog +++ b/Mono.Addins.CecilReflector/ChangeLog @@ -1,3 +1,8 @@ +2010-05-25 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins.CecilReflector/Reflector.cs: When resolving + custom attribute properties and fields look it base classes. + 2010-05-20 Lluis Sanchez Gual <lluis@novell.com> * Mono.Addins.CecilReflector/Reflector.cs: Added methods for diff --git a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector/Reflector.cs b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector/Reflector.cs index a569eb4..b86a0c7 100644 --- a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector/Reflector.cs +++ b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector/Reflector.cs @@ -196,12 +196,19 @@ namespace Mono.Addins.CecilReflector if (val == null) continue; - foreach (PropertyDefinition prop in attType.Properties.GetProperties (pname)) { - NodeAttributeAttribute bat = (NodeAttributeAttribute) GetCustomAttribute (prop, typeof(NodeAttributeAttribute), false); - if (bat != null) { - string name = string.IsNullOrEmpty (bat.Name) ? prop.Name : bat.Name; - mat.Add (name, Convert.ToString (val, System.Globalization.CultureInfo.InvariantCulture)); + foreach (TypeDefinition td in GetInheritanceChain (attType)) { + bool propFound = false; + foreach (PropertyDefinition prop in td.Properties.GetProperties (pname)) { + NodeAttributeAttribute bat = (NodeAttributeAttribute) GetCustomAttribute (prop, typeof(NodeAttributeAttribute), false); + if (bat != null) { + string name = string.IsNullOrEmpty (bat.Name) ? prop.Name : bat.Name; + mat.Add (name, Convert.ToString (val, System.Globalization.CultureInfo.InvariantCulture)); + propFound = true; + break; + } } + if (propFound) + break; } } @@ -211,17 +218,29 @@ namespace Mono.Addins.CecilReflector if (val == null) continue; - FieldDefinition field = attType.Fields.GetField (pname); - if (field != null) { - NodeAttributeAttribute bat = (NodeAttributeAttribute) GetCustomAttribute (field, typeof(NodeAttributeAttribute), false); - if (bat != null) { - string name = string.IsNullOrEmpty (bat.Name) ? field.Name : bat.Name; - mat.Add (name, Convert.ToString (val, System.Globalization.CultureInfo.InvariantCulture)); + foreach (TypeDefinition td in GetInheritanceChain (attType)) { + FieldDefinition field = td.Fields.GetField (pname); + if (field != null) { + NodeAttributeAttribute bat = (NodeAttributeAttribute) GetCustomAttribute (field, typeof(NodeAttributeAttribute), false); + if (bat != null) { + string name = string.IsNullOrEmpty (bat.Name) ? field.Name : bat.Name; + mat.Add (name, Convert.ToString (val, System.Globalization.CultureInfo.InvariantCulture)); + } } } } return mat; } + + IEnumerable<TypeDefinition> GetInheritanceChain (TypeDefinition td) + { + yield return td; + while (td != null && td.BaseType != null && td.BaseType.FullName != "System.Object") { + td = FindTypeDefinition (td.Module.Assembly, td.BaseType); + if (td != null) + yield return td; + } + } MethodReference FindConstructor (CustomAttribute att) { diff --git a/Mono.Addins.Gui/ChangeLog b/Mono.Addins.Gui/ChangeLog index 9325502..1af60b3 100644 --- a/Mono.Addins.Gui/ChangeLog +++ b/Mono.Addins.Gui/ChangeLog @@ -1,3 +1,8 @@ +2010-05-25 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins.Gui.csproj: Add Debug and Release + configurations. + 2010-03-30 Lluis Sanchez Gual <lluis@novell.com> * Mono.Addins.Gui.csproj: csc doesn't like iso-2. diff --git a/Mono.Addins.Gui/Mono.Addins.Gui.csproj b/Mono.Addins.Gui/Mono.Addins.Gui.csproj index 15cdaf9..1aa55e8 100644 --- a/Mono.Addins.Gui/Mono.Addins.Gui.csproj +++ b/Mono.Addins.Gui/Mono.Addins.Gui.csproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Default</Configuration> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.50727</ProductVersion> <ProjectGuid>{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}</ProjectGuid> @@ -12,7 +12,7 @@ <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Default|AnyCPU' "> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>true</Optimize> @@ -22,6 +22,15 @@ <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <ConsolePause>false</ConsolePause> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>none</DebugType> + <Optimize>true</Optimize> + <OutputPath>..\bin</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + <ConsolePause>false</ConsolePause> + </PropertyGroup> <ItemGroup> <Reference Include="glib-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> <SpecificVersion>False</SpecificVersion> diff --git a/Mono.Addins.sln b/Mono.Addins.sln index ff701e3..304e03a 100644 --- a/Mono.Addins.sln +++ b/Mono.Addins.sln @@ -32,64 +32,81 @@ EndProject Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DebugWin32|Any CPU = DebugWin32|Any CPU
- Default|Any CPU = Default|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {04C62888-E58A-4C6E-8688-A4F6F5459E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {04C62888-E58A-4C6E-8688-A4F6F5459E14}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04C62888-E58A-4C6E-8688-A4F6F5459E14}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {04C62888-E58A-4C6E-8688-A4F6F5459E14}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {04C62888-E58A-4C6E-8688-A4F6F5459E14}.Default|Any CPU.Build.0 = Debug|Any CPU
+ {04C62888-E58A-4C6E-8688-A4F6F5459E14}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {04C62888-E58A-4C6E-8688-A4F6F5459E14}.Release|Any CPU.Build.0 = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Default|Any CPU.Build.0 = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Release|Any CPU.Build.0 = Debug|Any CPU
+ {2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Default|Any CPU.Build.0 = Debug|Any CPU
+ {2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Release|Any CPU.Build.0 = Debug|Any CPU
+ {42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {42D1CE65-A14B-4218-B787-58AD7AA68513}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {42D1CE65-A14B-4218-B787-58AD7AA68513}.Default|Any CPU.Build.0 = Debug|Any CPU
+ {42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4F29F0C0-725A-4927-9931-AAB0A595F370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F29F0C0-725A-4927-9931-AAB0A595F370}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F29F0C0-725A-4927-9931-AAB0A595F370}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {4F29F0C0-725A-4927-9931-AAB0A595F370}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {4F29F0C0-725A-4927-9931-AAB0A595F370}.Default|Any CPU.Build.0 = Debug|Any CPU
+ {4F29F0C0-725A-4927-9931-AAB0A595F370}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F29F0C0-725A-4927-9931-AAB0A595F370}.Release|Any CPU.Build.0 = Debug|Any CPU
+ {87EADEFB-B389-4479-9C36-CDAA07839983}.Debug|Any CPU.ActiveCfg = Default|Any CPU
+ {87EADEFB-B389-4479-9C36-CDAA07839983}.Debug|Any CPU.Build.0 = Default|Any CPU
{87EADEFB-B389-4479-9C36-CDAA07839983}.DebugWin32|Any CPU.ActiveCfg = Default|Any CPU
- {87EADEFB-B389-4479-9C36-CDAA07839983}.Default|Any CPU.ActiveCfg = Default|Any CPU
- {87EADEFB-B389-4479-9C36-CDAA07839983}.Default|Any CPU.Build.0 = Default|Any CPU
- {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.ActiveCfg = Default|Any CPU
- {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.Build.0 = Default|Any CPU
- {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Default|Any CPU.ActiveCfg = Default|Any CPU
- {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Default|Any CPU.Build.0 = Default|Any CPU
+ {87EADEFB-B389-4479-9C36-CDAA07839983}.Release|Any CPU.ActiveCfg = Default|Any CPU
+ {87EADEFB-B389-4479-9C36-CDAA07839983}.Release|Any CPU.Build.0 = Default|Any CPU
+ {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Default|Any CPU.Build.0 = Debug|Any CPU
+ {A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Release|Any CPU.Build.0 = Debug|Any CPU
+ {A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {A85C9721-C054-4BD8-A1F3-0227615F0A36}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {A85C9721-C054-4BD8-A1F3-0227615F0A36}.Default|Any CPU.Build.0 = Debug|Any CPU
+ {A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.Build.0 = Release|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugWin32|Any CPU.ActiveCfg = Default|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugWin32|Any CPU.Build.0 = Default|Any CPU
- {B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Default|Any CPU.ActiveCfg = Default|Any CPU
- {B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Default|Any CPU.Build.0 = Default|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Release|Any CPU.Build.0 = Release|Any CPU
- {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugWin32|Any CPU.ActiveCfg = Default|Any CPU
- {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugWin32|Any CPU.Build.0 = Default|Any CPU
- {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Default|Any CPU.ActiveCfg = Default|Any CPU
- {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Default|Any CPU.Build.0 = Default|Any CPU
+ {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F109148D-849E-4044-8700-5E8EA0AB2476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F109148D-849E-4044-8700-5E8EA0AB2476}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F109148D-849E-4044-8700-5E8EA0AB2476}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {F109148D-849E-4044-8700-5E8EA0AB2476}.Default|Any CPU.ActiveCfg = Debug|Any CPU
- {F109148D-849E-4044-8700-5E8EA0AB2476}.Default|Any CPU.Build.0 = Debug|Any CPU
- {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.ActiveCfg = Default|Any CPU
- {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Default|Any CPU
- {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Default|Any CPU.ActiveCfg = Default|Any CPU
- {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Default|Any CPU.Build.0 = Default|Any CPU
+ {F109148D-849E-4044-8700-5E8EA0AB2476}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {F109148D-849E-4044-8700-5E8EA0AB2476}.Release|Any CPU.Build.0 = Debug|Any CPU
+ {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F109148D-849E-4044-8700-5E8EA0AB2476} = {7EFC0684-310E-417D-B8BD-5584C3F34BD5}
diff --git a/Mono.Addins/ChangeLog b/Mono.Addins/ChangeLog index b331267..ed792d8 100644 --- a/Mono.Addins/ChangeLog +++ b/Mono.Addins/ChangeLog @@ -1,3 +1,10 @@ +2010-05-25 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins.csproj: Add Debug and Release configurations. + + * Mono.Addins.Database/AddinScanner.cs: Fixed node type + parsing issue with TypeExtensionPointAttribute. + 2010-05-21 Lluis Sanchez Gual <lluis@novell.com> * Mono.Addins.Database/AddinUpdateData.cs: When resolving diff --git a/Mono.Addins/Mono.Addins.Database/AddinScanner.cs b/Mono.Addins/Mono.Addins.Database/AddinScanner.cs index 372e0d8..3ecc24b 100644 --- a/Mono.Addins/Mono.Addins.Database/AddinScanner.cs +++ b/Mono.Addins/Mono.Addins.Database/AddinScanner.cs @@ -917,7 +917,7 @@ namespace Mono.Addins.Database nt.ObjectTypeName = typeFullName; } nt.Id = epa.NodeName; - nt.TypeName = epa.NodeType.FullName; + nt.TypeName = epa.NodeTypeName; nt.ExtensionAttributeTypeName = epa.ExtensionAttributeTypeName; ep.NodeSet.NodeTypes.Add (nt); ep.Description = epa.Description; @@ -932,6 +932,9 @@ namespace Mono.Addins.Database ExtensionNodeDescription elem = module.AddExtensionNode ("%" + att.TypeName, "Type"); foreach (KeyValuePair<string,string> prop in att) elem.SetAttribute (prop.Key, prop.Value); + elem.SetAttribute ("type", typeFullName); + if (string.IsNullOrEmpty (elem.GetAttribute ("id"))) + elem.SetAttribute ("id", typeFullName); } } } diff --git a/Mono.Addins/Mono.Addins.csproj b/Mono.Addins/Mono.Addins.csproj index 0b4b9f3..043a2b6 100644 --- a/Mono.Addins/Mono.Addins.csproj +++ b/Mono.Addins/Mono.Addins.csproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Default</Configuration> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.50727</ProductVersion> <ProjectGuid>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</ProjectGuid> @@ -12,7 +12,7 @@ <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Default|AnyCPU' "> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>true</Optimize> @@ -22,6 +22,15 @@ <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <ConsolePause>false</ConsolePause> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>none</DebugType> + <Optimize>true</Optimize> + <OutputPath>..\bin</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + <ConsolePause>false</ConsolePause> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> @@ -133,7 +142,7 @@ <ProjectExtensions> <MonoDevelop> <Properties> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true"> + <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true"> <BuildFilesVar Sync="true" Name="FILES" /> <DeployFilesVar Sync="true" Name="DATA_FILES" /> <ResourcesVar Sync="true" Name="RESOURCES" /> diff --git a/mautil/ChangeLog b/mautil/ChangeLog index 6340b06..348ce5b 100644 --- a/mautil/ChangeLog +++ b/mautil/ChangeLog @@ -1,3 +1,7 @@ +2010-05-25 Lluis Sanchez Gual <lluis@novell.com> + + * mautil.csproj: Add Debug and Release configurations. + 2010-03-26 Lluis Sanchez Gual <lluis@novell.com> * mautil.csproj: Flush. diff --git a/mautil/mautil.csproj b/mautil/mautil.csproj index d7f2ba4..3b1cb91 100644 --- a/mautil/mautil.csproj +++ b/mautil/mautil.csproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Default</Configuration> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.50727</ProductVersion> <ProjectGuid>{EA2F08DC-8289-4A89-A405-1A70D8B4C569}</ProjectGuid> @@ -10,7 +10,7 @@ <SchemaVersion>2.0</SchemaVersion> <RootNamespace>mautil</RootNamespace> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Default|AnyCPU' "> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>true</Optimize> @@ -19,6 +19,14 @@ <WarningLevel>4</WarningLevel> <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>none</DebugType> + <Optimize>true</Optimize> + <OutputPath>..\bin</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> </ItemGroup> |