Fix bug #558739.

* GenerateResource (Resgen): New. Internal task to run resgen
with MONO_IOMAP=drive .
(Execute): Use the new Resgen task to compile the resources.

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

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
index 8d8e293057661f60961a28b6e665425e6afab8ad..9eec53cdf7619a3fdfa39d9adeec6c4cfcf4471a 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-10  Ankit Jain  <jankit@novell.com>
+
+       Fix bug #558739.
+       * GenerateResource (Resgen): New. Internal task to run resgen
+       with MONO_IOMAP=drive .
+       (Execute): Use the new Resgen task to compile the resources.
+
 2010-02-06  Ankit Jain  <jankit@novell.com>
 
        * LC.cs: New.

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
index ca3738e85cec1da2fd7f28c8aa3ef5ec57511ea6..ed3316abc4dc6c3ed5dad8a0dc12758331f7ae77 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
@@ -70,7 +70,11 @@ namespace Microsoft.Build.Tasks {
                                foreach (ITaskItem source in sources) {
                                        string sourceFile = source.ItemSpec;
                                        string outputFile = Path.ChangeExtension (sourceFile, "resources");
-                                       CompileResourceFile (sourceFile, outputFile);
+
+                                       if (!CompileResourceFile (sourceFile, outputFile)) {
+                                               Log.LogErrorFromException (new Exception ("Error during compiling resource file."));
+                                               return false;
+                                       }
                                }
                        } else {
                                if (sources.Length != outputResources.Length) {
@@ -79,14 +83,12 @@ namespace Microsoft.Build.Tasks {
                                }
 
                                for (int i = 0; i < sources.Length; i ++) {
-                                       string sourceFile = sources [i].ItemSpec;
-                                       string outputFile = outputResources [i].ItemSpec;
-
-                                       if (outputFile == String.Empty) {
+                                       if (String.IsNullOrEmpty (outputResources [i].ItemSpec)) {
                                                Log.LogErrorFromException (new Exception ("Filename of output can not be empty."));
                                                return false;
                                        }
-                                       if (CompileResourceFile (sourceFile, outputFile) == false) {
+
+                                       if (!CompileResourceFile (sources [i].ItemSpec, outputResources [i].ItemSpec)) {
                                                Log.LogErrorFromException (new Exception ("Error during compiling resource file."));
                                                return false;
                                        }
@@ -99,6 +101,7 @@ namespace Microsoft.Build.Tasks {
                        return true;
                }
                
+#if false
                private IResourceReader GetReader (Stream stream, string name)
                {
                        string format = Path.GetExtension (name);
@@ -140,39 +143,18 @@ namespace Microsoft.Build.Tasks {
                                throw new Exception ("Unknown format in file " + name);
                        }
                }
+#endif
                
                private bool CompileResourceFile (string sname, string dname )
                {
-                       FileStream source, dest;
-                       IResourceReader reader;
-                       IResourceWriter writer;
-
-                       Log.LogMessage ("Compiling resource file '{0}' into '{1}'", sname, dname);
-                       try {
-                               source = new FileStream (sname, FileMode.Open, FileAccess.Read);
-
-                               reader = GetReader (source, sname);
-
-                               dest = new FileStream (dname, FileMode.Create, FileAccess.Write);
-                               writer = GetWriter (dest, dname);
-
-                               int rescount = 0;
-                               foreach (DictionaryEntry e in reader) {
-                                       rescount++;
-                                       object val = e.Value;
-                                       if (val is string)
-                                               writer.AddResource ((string)e.Key, (string)e.Value);
-                                       else
-                                               writer.AddResource ((string)e.Key, e.Value);
-                               }
+                       Resgen resgen = new Resgen ();
+                       resgen.BuildEngine = this.BuildEngine;
+                       resgen.UseSourcePath = true;
 
-                               reader.Close ();
-                               writer.Close ();
-                       } catch (Exception e) {
-                               Log.LogErrorFromException (e);
-                               return false;
-                       }
-                       return true;
+                       resgen.SourceFile = sname;
+                       resgen.OutputFile = dname;
+
+                       return resgen.Execute ();
                }
 
                [Output]
@@ -282,6 +264,47 @@ namespace Microsoft.Build.Tasks {
                        }
                }
        }
+
+       class Resgen : ToolTaskExtension
+       {
+               public Resgen ()
+               {
+               }
+
+               protected internal override void AddCommandLineCommands (
+                                                CommandLineBuilderExtension commandLine)
+               {
+                       if (UseSourcePath)
+                               commandLine.AppendSwitch ("/useSourcePath");
+
+                       commandLine.AppendSwitch (String.Format ("/compile {0}{1}", SourceFile,
+                                               OutputFile != null ? "," + OutputFile : ""));
+               }
+
+               public override bool Execute ()
+               {
+                       EnvironmentOverride ["MONO_IOMAP"] = "drive";
+                       return base.Execute ();
+               }
+
+               protected override string GenerateFullPathToTool ()
+               {
+                       return Path.Combine (ToolPath, ToolExe);
+               }
+
+               protected override MessageImportance StandardOutputLoggingImportance {
+                       get { return MessageImportance.Low; }
+               }
+
+               protected override string ToolName {
+                       get { return Utilities.RunningOnWindows ? "resgen2.bat" : "resgen2"; }
+               }
+
+               public string SourceFile { get; set; }
+               public string OutputFile { get; set; }
+
+               public bool UseSourcePath { get; set; }
+       }
 }
 
 #endif