* XamlG.cs: Fix arg to XamlGCompiler, to use path relative to project

dir. Bug uncovered by Rolf.

svn path=/trunk/mcs/; revision=160484

diff --git a/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/ChangeLog b/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/ChangeLog
index 8851010c37011bd2ccf1c9a988c2b33bf777b4ad..ac07f0fb0665b9018e1de69e31979716f440daf3 100644 (file)
--- a/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/ChangeLog
+++ b/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-16  Ankit Jain  <jankit@novell.com>
+
+       * XamlG.cs: Fix arg to XamlGCompiler, to use path relative to project
+       dir. Bug uncovered by Rolf.
+
 2010-04-13  Ankit Jain  <jankit@novell.com>
 
        * CreateTestPage.cs:

diff --git a/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/XamlG.cs b/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/XamlG.cs
index 63bea8af80065e9d82a7f3111b6a40e1ed268515..a5f7b1a5fad835f1022c14968580b20371090da6 100644 (file)
--- a/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/XamlG.cs
+++ b/mcs/class/Moonlight.Build.Tasks/Moonlight.Build.Tasks/XamlG.cs
@@ -66,7 +66,8 @@ namespace Moonlight.Build.Tasks {
 
                                        string full_source_path = source_item.GetMetadata ("FullPath");
                                        try {
-                                               if (!XamlGCompiler.GenerateFile (codedom_provider, AssemblyName, full_source_path, full_source_path, dest_item.ItemSpec, Log)) {
+                                               if (!XamlGCompiler.GenerateFile (codedom_provider, AssemblyName, full_source_path,
+                                                                               source_item.GetMetadata ("RelativeDir"), dest_item.ItemSpec, Log)) {
                                                        Log.LogError ("Error generating {0} from {1}", full_source_path, dest_item.ItemSpec);
                                                        return false;
                                                }