* Mono.Addins.targets:

* ResolveAddinReferences.cs: The target application is now specified
  using the ExtensionDomain property. Addin references now use a colon
  as version separator.

* Makefile.am: Install the .targets file to the xbuild dir.

svn path=/trunk/mono-addins/; revision=152726

4 files changed, 23 insertions, 10 deletions

diff --git a/Mono.Addins.MSBuild/ChangeLog b/Mono.Addins.MSBuild/ChangeLog
index 0365c9d..b230ab1 100644
--- a/Mono.Addins.MSBuild/ChangeLog
+++ b/Mono.Addins.MSBuild/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-01  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* Mono.Addins.targets:
+	* ResolveAddinReferences.cs: The target application is now
+	  specified using the ExtensionDomain property. Addin
+	  references now use a colon as version separator.
+
+	* Makefile.am: Install the .targets file to the xbuild dir.
+
 2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* AssemblyInfo.cs: Bump Mono.Addins version.
diff --git a/Mono.Addins.MSBuild/Makefile.am b/Mono.Addins.MSBuild/Makefile.am
index aac1843..2b59f4e 100644
--- a/Mono.Addins.MSBuild/Makefile.am
+++ b/Mono.Addins.MSBuild/Makefile.am
@@ -38,6 +38,9 @@ $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(POLICY_ASS
 	mkdir -p $(dir $(ASSEMBLY))		
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref)
 
+xbuilddir = $(libdir)/mono/xbuild
+xbuild_DATA = Mono.Addins.targets
+
 install-data-local: gac-install
 
 uninstall-local: gac-uninstall
diff --git a/Mono.Addins.MSBuild/Mono.Addins.targets b/Mono.Addins.MSBuild/Mono.Addins.targets
index 5986fb4..688d2c9 100644
--- a/Mono.Addins.MSBuild/Mono.Addins.targets
+++ b/Mono.Addins.MSBuild/Mono.Addins.targets
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 	
 	<Target Name="ResolveAddinReferences">
-		<ResolveAddinReferences AddinReferences="@(AddinReference)" ExtensionDomain="@(ExtensionDomain)">
+		<ResolveAddinReferences AddinReferences="@(AddinReference)" ExtensionDomain="$(ExtensionDomain)">
 			<Output TaskParameter="References" ItemName="ReferencePath" />
 		</ResolveAddinReferences>
 	</Target>
diff --git a/Mono.Addins.MSBuild/ResolveAddinReferences.cs b/Mono.Addins.MSBuild/ResolveAddinReferences.cs
index 99870a6..b5393d4 100644
--- a/Mono.Addins.MSBuild/ResolveAddinReferences.cs
+++ b/Mono.Addins.MSBuild/ResolveAddinReferences.cs
@@ -38,32 +38,33 @@ namespace Mono.Addins.MSBuild
 	{
 		List<TaskItem> references = new List<TaskItem> ();
 		ITaskItem[] addinReferences;
-		ITaskItem[] extensionDomain;
+		string extensionDomain;
 		
 		public override bool Execute ()
 		{
-			if (extensionDomain == null || extensionDomain.Length == 0) {
+			if (string.IsNullOrEmpty (extensionDomain)) {
 				Log.LogError ("ExtensionDomain item not found");
 				return false;
 			}
 			if (addinReferences == null) {
 				return true;
 			}
-			string domain = extensionDomain[0].ItemSpec;
-			Application app = SetupService.GetExtensibleApplication (domain);
+
+			Application app = SetupService.GetExtensibleApplication (extensionDomain);
 			if (app == null) {
-				Log.LogError ("Extension domain '{0}' not found", domain);
+				Log.LogError ("Extension domain '{0}' not found", extensionDomain);
 				return false;
 			}
 			
 			foreach (ITaskItem item in addinReferences) {
-				Addin addin = app.Registry.GetAddin (item.ItemSpec);
+				string addinId = item.ItemSpec.Replace (':',',');
+				Addin addin = app.Registry.GetAddin (addinId);
 				if (addin == null) {
-					Log.LogError ("Add-in '{0}' not found", item.ItemSpec);
+					Log.LogError ("Add-in '{0}' not found", addinId);
 					return false;
 				}
 				if (addin.Description == null) {
-					Log.LogError ("Add-in '{0}' could not be loaded", item.ItemSpec);
+					Log.LogError ("Add-in '{0}' could not be loaded", addinId);
 					return false;
 				}
 				foreach (string asm in addin.Description.MainModule.Assemblies) {
@@ -80,7 +81,7 @@ namespace Mono.Addins.MSBuild
 			set { addinReferences = value; }
 		}
 		
-		public ITaskItem[] ExtensionDomain {
+		public string ExtensionDomain {
 			get { return extensionDomain; }
 			set { extensionDomain = value; }
 		}