[NaCl Addin] Fix to PNaCl lib creation from MSVS

visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLink.cs

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 using System;
 using System.IO;
 using System.Resources;
 using System.Reflection;
 using System.Text;
 using Microsoft.Build.Framework;
 using Microsoft.Build.CPPTasks;
 using Microsoft.Build.Utilities;
 
 
 namespace NaCl.Build.CPPTasks
 {

[Sam Clegg, 2012/11/12 20:10:36]

All these removals have been lifted into the superclass.

     public class NaClLink : NaClToolTask
     {
-        public bool BuildingInIDE { get; set; }
-
         /// <summary>
         /// Property set only in PNaCl builds to signal that the translator
         /// should be run post-link.
         /// </summary>
         public bool TranslateARM { get; set; }
 
         /// <summary>
         /// Property set only in PNaCl builds to signal that the translator
         /// should be run post-link.
         /// </summary>
         public bool TranslateX86 { get; set; }
 
         /// <summary>
         /// Property set only in PNaCl builds to signal that the translator
         /// should be run post-link.
         /// </summary>
         public bool TranslateX64 { get; set; }
 
         [Required]
-        public bool OutputCommandLine { get; set; }
-
-        [Required]
         public bool CreateNMF { get; set; }
 
         [Required]
         public string NaClLinkerPath { get; set; }
 
         [Required]
         public string ProjectName { get; set; }
 
         [Required]
         public string ToolchainName { get; set; }
 
         [Required]
-        public string Platform { get; set; }
-
-        [Required]
         public string CreateNMFPath { get; set; }
 
         [Required]
-        public virtual string OutputFile { get; set; }
-
-        [Required]
         public string PropertiesFile { get; set; }
 
         [Required]
         public string ConfigurationType { get; set; }
 
-        protected override CanonicalTrackedOutputFiles OutputWriteTLog(ITaskItem[] inputs)
-        {
-            string path = Path.Combine(TlogDirectory, WriteTLogFilename);
-            TaskItem item = new TaskItem(path);
-            CanonicalTrackedOutputFiles trackedFiles =
-                new CanonicalTrackedOutputFiles(new TaskItem[] { item });
-
-            foreach (ITaskItem sourceItem in Sources)
-            {
-                //remove this entry associated with compiled source which is about to be recomputed
-                trackedFiles.RemoveEntriesForSource(sourceItem);
-
-                //add entry with updated information
-                string upper = Path.GetFullPath(sourceItem.ItemSpec).ToUpperInvariant();
-                trackedFiles.AddComputedOutputForSourceRoot(upper, OutputFile);
-            }
-
-            //output tlog
-            trackedFiles.SaveTlog();
-
-            return trackedFiles;
-        }
-
-        protected override void OutputReadTLog(ITaskItem[] compiledSources, CanonicalTrackedOutputFiles outputs)
-        {
-            string trackerPath = Path.GetFullPath(TlogDirectory + ReadTLogFilenames[0]);
-
-            using (StreamWriter writer = new StreamWriter(trackerPath, false, Encoding.Unicode))
-            {
-                string sourcePath = "";
-                foreach (ITaskItem source in Sources)
-                {
-                    if (sourcePath != "")
-                        sourcePath += "|";
-                    sourcePath += Path.GetFullPath(source.ItemSpec).ToUpperInvariant();
-                }
-
-                writer.WriteLine("^" + sourcePath);
-                foreach (ITaskItem source in Sources)
-                {
-                    writer.WriteLine(Path.GetFullPath(source.ItemSpec).ToUpperInvariant());
-                }
-                writer.WriteLine(Path.GetFullPath(OutputFile).ToUpperInvariant());
-            }
-        }
-
-        protected override void OutputCommandTLog(ITaskItem[] compiledSources)
-        {
-            using (StreamWriter writer = new StreamWriter(TLogCommandFile.GetMetadata("FullPath"), false, Encoding.Unicode))
-            {
-                string cmds = GenerateResponseFileCommands();
-                string sourcePath = "";
-                foreach (ITaskItem source in Sources)
-                {
-                    if (sourcePath != "")
-                        sourcePath += "|";
-                    sourcePath += Path.GetFullPath(source.ItemSpec).ToUpperInvariant();
-                }
-
-                writer.WriteLine("^" + sourcePath);
-                writer.WriteLine(cmds);
-            }
-        }
-
         public NaClLink()
             : base(new ResourceManager("NaCl.Build.CPPTasks.Properties.Resources", Assembly.GetExecutingAssembly()))
         {
             this.EnvironmentVariables = new string[] { "CYGWIN=nodosfilewarning", "LC_CTYPE=C" };
         }
 
         protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance)
         {
             base.LogEventsFromTextOutput(GCCUtilities.ConvertGCCOutput(singleLine), messageImportance);
         }
@@ skipping 38 matching lines @@
                 Log.LogMessage("pnacl-translate -> {0}", Path.GetFileName(outfile));
 
             if (ExecuteTool(translateTool, cmd, string.Empty) != 0)
             {
                 return false;
             }
 
             return true;
         }
 
-        private bool IsPNaCl()
-        {
-            return Platform.Equals("pnacl", StringComparison.OrdinalIgnoreCase);
-        }
-
         public override bool Execute()
         {
-            if (IsPNaCl())
-            {
-                if (!SDKUtilities.FindPython())
-                {
-                    Log.LogError("PNaCl linking requires python in your executable path.");
-                    return false;
-                }
-            }
-
             xamlParser = new XamlParser(PropertiesFile);
             if (!Setup())
                 return false;
 
             if (!OutputCommandLine)
                 Log.LogMessage("Linking: {0}", Path.GetFileName(OutputFile));
 
             if (!base.Execute())
                 return false;
 
@@ skipping 78 matching lines @@
         protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
         {
             if (OutputCommandLine)
             {
                 Log.LogMessage(MessageImportance.High, pathToTool + "  " + responseFileCommands + " " + commandLineCommands);
             }
 
             return base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands);
         }
 
-        protected override string GenerateFullPathToTool()
-        {
-            return this.ToolName;
-        }
-
         protected override Encoding ResponseFileEncoding
         {
             get
             {
                 return Encoding.ASCII;
             }
         }
 
         protected override string ToolName
         {
@@ skipping 19 matching lines @@
             }
         }
 
         protected override string WriteTLogFilename
         {
             get
             {
                 return BaseTool() + ".link.write.1.tlog";
             }
         }
-
-        public virtual string PlatformToolset
-        {
-            get
-            {
-                return "GCC";
-            }
-            set
-            {}
-        }
     }
 }