2006-03-11 Marek Sieradzki <marek.sieradzki@gmail.com>
authorMarek Sieradzki <msierad@mono-cvs.ximian.com>
Sat, 11 Mar 2006 17:26:53 +0000 (17:26 -0000)
committerMarek Sieradzki <msierad@mono-cvs.ximian.com>
Sat, 11 Mar 2006 17:26:53 +0000 (17:26 -0000)
* MonoTODOAttribute.cs: Removed.
* CombinePath.cs, CreateProperty.cs, GenerateResources.cs,
SignFile.cs: Added missing attributes.
* Warning.cs: Added missing properties.
* WriteLinesToFiles.cs: Compressed properties.
* Exec.cs, ManagedCompiler.cs: Added missing methods.

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

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CombinePath.cs
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Exec.cs
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MonoTODOAttribute.cs [deleted file]
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/SignFile.cs
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Warning.cs
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/WriteLinesToFile.cs

index 0def06b9e87323f32a0a4fa689b9715add2f857e..c74aeabdaaa821114c8a36dc3671328f27087a17 100644 (file)
@@ -1,3 +1,12 @@
+2006-03-11  Marek Sieradzki  <marek.sieradzki@gmail.com> 
+
+       * MonoTODOAttribute.cs: Removed.
+       * CombinePath.cs, CreateProperty.cs, GenerateResources.cs,
+       SignFile.cs: Added missing attributes.
+       * Warning.cs: Added missing properties.
+       * WriteLinesToFiles.cs: Compressed properties.
+       * Exec.cs, ManagedCompiler.cs: Added missing methods.
+
 2006-02-26  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
        * CombinePath.cs: Added.
index a0f2111f7e6afd30c2f54594a02cd3c07994bdfb..68cd095d33b884536db93a76889eef3011a7195a 100644 (file)
@@ -53,11 +53,13 @@ namespace Microsoft.Build.Tasks {
                        set { basePath = value; }
                }
                
+               [Output]
                public ITaskItem[] CombinedPaths {
                        get { return combinedPaths; }
                        set { combinedPaths = value; }
                }
                
+               [Required]
                public ITaskItem[] Paths {
                        get { return paths; }
                        set { paths = value; }
index 537742e550a0ff0b6802100090da4eeb775f1b79..c69040e1ce4fa438554c36432768e25e7c4ddd3e 100644 (file)
@@ -44,12 +44,14 @@ namespace Microsoft.Build.Tasks {
                        return true;
                }
 
+               [Output]
                public string[] Value {
                        get { return this.@value; }
                        set { this.@value = value; }
                }
 
                // FIXME: is this value after evaluation?
+               [Output]
                public string[] ValueSetByTask {
                        get { return valueSetByTask; }
                }
index 886bb9bec474fbd6e467531ce3dab0ec58e75967..855917e8721bd34e012ac69fbee85391e9cc3a39 100644 (file)
@@ -58,7 +58,7 @@ namespace Microsoft.Build.Tasks {
                        executionTime = 0;
                }
 
-               public override bool Execute ()
+               /*public override bool Execute ()
                {
                        StringCollection temporaryOutputs = new StringCollection ();
                        string line = null;
@@ -93,10 +93,18 @@ namespace Microsoft.Build.Tasks {
                                return false;
                        }
                        
-                       /*if (exitCode != 0 && ignoreExitCode == false)
+                       if (exitCode != 0 && ignoreExitCode == false)
                                return false;
-                       else*/
+                       else
                                return true;
+               }*/
+               
+               [MonoTODO]
+               protected override int ExecuteTool (string pathToTool,
+                                                   string responseFileCommands,
+                                                   string commandLineCommands)
+               {
+                       return 0;
                }
                
                [MonoTODO]
@@ -105,6 +113,35 @@ namespace Microsoft.Build.Tasks {
                        return null;
                }
                
+               [MonoTODO]
+               protected override string GetWorkingDirectory ()
+               {
+                       return Environment.CurrentDirectory;
+               }
+               
+               [MonoTODO]
+               protected override bool HandleTaskExecutionErrors ()
+               {
+                       return true;
+               }
+               
+               [MonoTODO]
+               protected override void LogPathToTool (string toolName,
+                                                      string pathToTool)
+               {
+               }
+               
+               [MonoTODO]
+               protected override void LogToolCommand (string message)
+               {
+               }
+               
+               [MonoTODO]
+               protected override bool ValidateParameters ()
+               {
+                       return true;
+               }
+               
                [Required]
                public string Command {
                        get { return command; }
@@ -138,19 +175,21 @@ namespace Microsoft.Build.Tasks {
                        get { return base.StandardOutputLoggingImportance; }
                }
                
-               //FIXME: what's this?
+               [MonoTODO]
+               [Output]
                public string StdOutEncoding {
                        get { return stdOutEncoding; }
                        set { stdOutEncoding = value; }
                }
                
-               //FIXME: what's this?
+               [MonoTODO]
+               [Output]
                public string StdErrEncoding {
                        get { return stdErrEncoding; }
                        set { stdErrEncoding = value; }
                }
                
-               // FIXME: crashes the compiler when replaced with return base.ToolName
+               [MonoTODO]
                protected override string ToolName {
                        get { return String.Empty; }
                }
index 8167c3e5030a1941628947b3024a2587daa7a9fe..6e85d31bd35cb55ff0904c8e4943739348d72a20 100644 (file)
@@ -173,9 +173,6 @@ namespace Microsoft.Build.Tasks {
                        get {
                                return filesWritten;
                        }
-                       set {
-                               filesWritten = value;
-                       }
                }
 
                [MonoTODO]
@@ -241,6 +238,7 @@ namespace Microsoft.Build.Tasks {
                        }
                }
 
+               [Output]
                public string StronglyTypedFileName {
                        get {
                                return stronglyTypedFilename;
index 414509089ffa82e27089dca73915b944754469ff..472be51c2aea733b3c507f2f06467aeb42c4e839 100644 (file)
@@ -115,6 +115,13 @@ namespace Microsoft.Build.Tasks {
                {
                        return true;
                }
+               
+               [MonoTODO]
+               protected bool ListHasNoDuplicateItems (ITaskItem itemList,
+                                                       string parameterName)
+               {
+                       return true;
+               }
 
                protected override bool ValidateParameters ()
                {
@@ -201,6 +208,7 @@ namespace Microsoft.Build.Tasks {
                        set { Bag ["Optimize"] = value; }
                }
 
+               [Output]
                public ITaskItem OutputAssembly {
                        get { return (ITaskItem) Bag ["OutputAssembly"]; }
                        set { Bag ["OutputAssembly"] = value; }
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MonoTODOAttribute.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MonoTODOAttribute.cs
deleted file mode 100644 (file)
index 7c986cf..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// MonoTODOAttribute.cs
-//
-// Author:
-//   Ravi Pratap (ravi@ximian.com)
-//
-// (C) Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System {
-       
-       [AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
-       internal sealed class MonoTODOAttribute : Attribute {
-
-               string comment;
-               
-               public MonoTODOAttribute ()
-               {
-               }
-
-               public MonoTODOAttribute (string comment)
-               {
-                       this.comment = comment;
-               }
-
-               public string Comment {
-                       get { return comment; }
-               }
-       }
-}
index a08219c27467623909f58e19a263b529cd76bbee..a152c981c762c415e86be103f996f6b2f7062850 100644 (file)
@@ -27,6 +27,7 @@
 
 #if NET_2_0
 
+using System;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
@@ -41,6 +42,7 @@ namespace Microsoft.Build.Tasks {
                {
                }
 
+               [MonoTODO]
                public override bool Execute ()
                {
                        return true;
@@ -77,4 +79,4 @@ namespace Microsoft.Build.Tasks {
        }
 }
 
-#endif
\ No newline at end of file
+#endif
index 52747f0ab50dc9028247263f0e64464f20ec7312..74279dd2debb3df71ed2c78047b79502a4c25d03 100644 (file)
@@ -34,6 +34,8 @@ using Microsoft.Build.Utilities;
 namespace Microsoft.Build.Tasks {
        public sealed class Warning : TaskExtension {
                
+               string  code;
+               string  helpKeyword;
                string  text;
        
                public Warning ()
@@ -44,20 +46,26 @@ namespace Microsoft.Build.Tasks {
                {
                        if (text == null)
                                text = String.Empty;
-                       Log.LogWarning (null, null, null, BuildEngine.ProjectFileOfTaskNode,
+                       Log.LogWarning (null, code, helpKeyword, BuildEngine.ProjectFileOfTaskNode,
                                BuildEngine.LineNumberOfTaskNode, BuildEngine.ColumnNumberOfTaskNode,
                                BuildEngine.LineNumberOfTaskNode, BuildEngine.ColumnNumberOfTaskNode,
                                text, null);
                        return true;
                }
 
+               public string Code {
+                       get { return code; }
+                       set { code = value; }
+               }
+               
+               public string HelpKeyword {
+                       get { return helpKeyword; }
+                       set { helpKeyword = value; }
+               }
+               
                public string Text {
-                       get {
-                               return text;
-                       }
-                       set {
-                               text = value;
-                       }
+                       get { return text; }
+                       set { text = value; }
                }
        }
 }
index 474436da4b1292d15f4ad8a6416546a411facc02..adf6418d303ff48f110002fc7ca287389a6e6690 100644 (file)
@@ -71,30 +71,18 @@ namespace Microsoft.Build.Tasks {
 
                [Required]
                public ITaskItem File {
-                       get {
-                               return file;
-                       }
-                       set {
-                               file = value;
-                       }
+                       get { return file; }
+                       set { file = value; }
                }
 
                public ITaskItem[] Lines {
-                       get {
-                               return lines;
-                       }
-                       set {
-                               lines  = value;
-                       }
+                       get { return lines; }
+                       set { lines  = value; }
                }
 
                public bool Overwrite {
-                       get {
-                               return overwrite;
-                       }
-                       set {
-                               overwrite = value;
-                       }
+                       get { return overwrite; }
+                       set { overwrite = value; }
                }
        }
 }