Index: visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLib.cs |
diff --git a/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLib.cs b/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLib.cs |
index 7750907a6022f345bba5858f6729b60b0166a57f..55f224a94fedc2ebe9a3019ce0731b9141285524 100644 |
--- a/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLib.cs |
+++ b/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLib.cs |
@@ -17,25 +17,14 @@ using Microsoft.Build.Utilities; |
namespace NaCl.Build.CPPTasks |
{ |
- public class NaClLib : TrackedVCToolTask |
+ public class NaClLib : NaClToolTask |
{ |
- public bool BuildingInIDE { get; set; } |
- |
[Required] |
public string LibrarianToolPath { get; set; } |
[Required] |
public string PropertiesFile { get; set; } |
- [Required] |
- public virtual string OutputFile { get; set; } |
- |
- [Required] |
- public string OutputCommandLine { get; set; } |
- |
- [Required] |
- public virtual ITaskItem[] Sources { get; set; } |
- |
public NaClLib() |
: base(new ResourceManager("NaCl.Build.CPPTasks.Properties.Resources", Assembly.GetExecutingAssembly())) |
{ |
@@ -56,43 +45,22 @@ namespace NaCl.Build.CPPTasks |
return responseFileCmds.ToString(); |
} |
- protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands) |
+ public override bool Execute() |
{ |
- if (OutputCommandLine == "true") |
- { |
- Log.LogMessage(MessageImportance.High, pathToTool + " " + responseFileCommands); |
- } |
- |
- return base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands); |
- } |
- |
+ if (!Setup()) |
+ return false; |
- |
- public virtual string PlatformToolset |
- { |
- get |
- { |
- return "GCC"; |
- } |
+ return base.Execute(); |
} |
- protected override bool MaintainCompositeRootingMarkers |
+ protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands) |
{ |
- get |
- { |
- return true; |
- } |
- } |
+ if (OutputCommandLine) |
+ Log.LogMessage(MessageImportance.High, pathToTool + " " + responseFileCommands); |
- protected override ITaskItem[] TrackedInputFiles |
- { |
- get |
- { |
- return Sources; |
- } |
+ return base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands); |
} |
- |
protected override Encoding ResponseFileEncoding |
{ |
get |
@@ -108,54 +76,5 @@ namespace NaCl.Build.CPPTasks |
return LibrarianToolPath; |
} |
} |
- |
- protected override string TrackerIntermediateDirectory |
- { |
- get |
- { |
- if (this.TrackerLogDirectory != null) |
- { |
- return this.TrackerLogDirectory; |
- } |
- else |
- { |
- return string.Empty; |
- } |
- } |
- } |
- |
- protected override string CommandTLogName |
- { |
- get |
- { |
- return "default.link.command.tlog"; |
- } |
- } |
- |
- protected override string[] ReadTLogNames |
- { |
- get |
- { |
- return new string[] |
- { |
- "default.link.read.tlog" |
- }; |
- } |
- } |
- |
- protected override string[] WriteTLogNames |
- { |
- get |
- { |
- return new string[] |
- { |
- "default.link.write.tlog" |
- }; |
- } |
- } |
- |
- public string TrackerLogDirectory { get; set; } |
} |
- |
- |
} |