From: Gert D. <dri...@us...> - 2004-07-15 19:47:28
|
Update of /cvsroot/nant/nant/src/NAnt.Core/Tasks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10451 Modified Files: AttribTask.cs AvailableTask.cs CopyTask.cs DeleteTask.cs EchoTask.cs ExecTask.cs ExternalProgramBase.cs GetTask.cs IfTask.cs IncludeTask.cs Log Message: no longer prefix build output with LogPrefix, as this is now handled by the DefaultLogger Index: AttribTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/AttribTask.cs,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** AttribTask.cs 24 May 2004 18:06:46 -0000 1.20 --- AttribTask.cs 15 Jul 2004 19:47:18 -0000 1.21 *************** *** 184,188 **** // display build log message ! Log(Level.Info, LogPrefix + "Setting file attributes for {0} files to {1}.", AttribFileSet.FileNames.Count, fileAttributes.ToString(CultureInfo.InvariantCulture)); --- 184,188 ---- // display build log message ! Log(Level.Info, "Setting file attributes for {0} files to {1}.", AttribFileSet.FileNames.Count, fileAttributes.ToString(CultureInfo.InvariantCulture)); *************** *** 198,202 **** // display build log message ! Log(Level.Info, LogPrefix + "Setting attributes for {0} directories to {1}.", AttribFileSet.DirectoryNames.Count, directoryAttributes.ToString(CultureInfo.InvariantCulture)); --- 198,202 ---- // display build log message ! Log(Level.Info, "Setting attributes for {0} directories to {1}.", AttribFileSet.DirectoryNames.Count, directoryAttributes.ToString(CultureInfo.InvariantCulture)); *************** *** 246,250 **** try { if (System.IO.File.Exists(path)) { ! Log(Level.Verbose, LogPrefix + path); System.IO.File.SetAttributes(path, fileAttributes); } else { --- 246,250 ---- try { if (System.IO.File.Exists(path)) { ! Log(Level.Verbose, path); System.IO.File.SetAttributes(path, fileAttributes); } else { *************** *** 257,261 **** throw new BuildException(msg, Location, ex); } else { ! Log(Level.Verbose, LogPrefix + msg); } } --- 257,261 ---- throw new BuildException(msg, Location, ex); } else { ! Log(Level.Verbose, msg); } } *************** *** 286,290 **** try { if (System.IO.Directory.Exists(path)) { ! Log(Level.Verbose, LogPrefix + path); System.IO.File.SetAttributes(path, fileAttributes); } else { --- 286,290 ---- try { if (System.IO.Directory.Exists(path)) { ! Log(Level.Verbose, path); System.IO.File.SetAttributes(path, fileAttributes); } else { *************** *** 297,301 **** throw new BuildException(msg, Location, ex); } else { ! Log(Level.Verbose, LogPrefix + msg); } } --- 297,301 ---- throw new BuildException(msg, Location, ex); } else { ! Log(Level.Verbose, msg); } } Index: AvailableTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/AvailableTask.cs,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** AvailableTask.cs 28 Jun 2004 05:56:51 -0000 1.21 --- AvailableTask.cs 15 Jul 2004 19:47:18 -0000 1.22 *************** *** 196,200 **** if (!resourceAvailable) { ! Log(Level.Verbose, LogPrefix + "Unable to find {0} {1}.", Type, Resource); } --- 196,200 ---- if (!resourceAvailable) { ! Log(Level.Verbose, "Unable to find {0} {1}.", Type, Resource); } Index: CopyTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/CopyTask.cs,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** CopyTask.cs 11 Jul 2004 13:23:58 -0000 1.36 --- CopyTask.cs 15 Jul 2004 19:47:18 -0000 1.37 *************** *** 350,354 **** string destinationDirectory = Path.Combine(ToDirectory.FullName, dstRelPath); if (!Directory.Exists(destinationDirectory)) { ! Log(Level.Verbose, LogPrefix + "Created directory '{0}'.", destinationDirectory); Directory.CreateDirectory(destinationDirectory); } --- 350,354 ---- string destinationDirectory = Path.Combine(ToDirectory.FullName, dstRelPath); if (!Directory.Exists(destinationDirectory)) { ! Log(Level.Verbose, "Created directory '{0}'.", destinationDirectory); Directory.CreateDirectory(destinationDirectory); } *************** *** 372,378 **** if (fileCount > 0 || Verbose) { if (ToFile != null) { ! Log(Level.Info, LogPrefix + "Copying {0} file{1} to '{2}'.", fileCount, (fileCount != 1) ? "s" : "", ToFile); } else { ! Log(Level.Info, LogPrefix + "Copying {0} file{1} to '{2}'.", fileCount, (fileCount != 1) ? "s" : "", ToDirectory); } --- 372,378 ---- if (fileCount > 0 || Verbose) { if (ToFile != null) { ! Log(Level.Info, "Copying {0} file{1} to '{2}'.", fileCount, (fileCount != 1) ? "s" : "", ToFile); } else { ! Log(Level.Info, "Copying {0} file{1} to '{2}'.", fileCount, (fileCount != 1) ? "s" : "", ToDirectory); } *************** *** 385,394 **** } if (sourceFile == destinationFile) { ! Log(Level.Verbose, LogPrefix + "Skipping self-copy of '{0}'.", sourceFile); continue; } try { ! Log(Level.Verbose, LogPrefix + "Copying '{0}' to '{1}'.", sourceFile, destinationFile); // create directory if not present --- 385,394 ---- } if (sourceFile == destinationFile) { ! Log(Level.Verbose, "Skipping self-copy of '{0}'.", sourceFile); continue; } try { ! Log(Level.Verbose, "Copying '{0}' to '{1}'.", sourceFile, destinationFile); // create directory if not present *************** *** 396,400 **** if (!Directory.Exists(destinationDirectory)) { Directory.CreateDirectory(destinationDirectory); ! Log(Level.Verbose, LogPrefix + "Created directory '{0}'.", destinationDirectory); } --- 396,400 ---- if (!Directory.Exists(destinationDirectory)) { Directory.CreateDirectory(destinationDirectory); ! Log(Level.Verbose, "Created directory '{0}'.", destinationDirectory); } Index: DeleteTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/DeleteTask.cs,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** DeleteTask.cs 24 May 2004 18:06:46 -0000 1.24 --- DeleteTask.cs 15 Jul 2004 19:47:18 -0000 1.25 *************** *** 158,171 **** } ! Log(Level.Info, LogPrefix + "Deleting directory '{0}'.", Directory.FullName); RecursiveDeleteDirectory(Directory.FullName); } else { // delete files or directories in fileset if (DeleteFileSet.DirectoryNames.Count == 0) { ! Log(Level.Info, LogPrefix + "Deleting {0} files.", DeleteFileSet.FileNames.Count); } else if (DeleteFileSet.FileNames.Count == 0) { ! Log(Level.Info, LogPrefix + "Deleting {0} directories.", DeleteFileSet.DirectoryNames.Count); } else { ! Log(Level.Info, LogPrefix + "Deleting {0} files and {1} directories.", DeleteFileSet.FileNames.Count, DeleteFileSet.DirectoryNames.Count); } --- 158,171 ---- } ! Log(Level.Info, "Deleting directory '{0}'.", Directory.FullName); RecursiveDeleteDirectory(Directory.FullName); } else { // delete files or directories in fileset if (DeleteFileSet.DirectoryNames.Count == 0) { ! Log(Level.Info, "Deleting {0} files.", DeleteFileSet.FileNames.Count); } else if (DeleteFileSet.FileNames.Count == 0) { ! Log(Level.Info, "Deleting {0} directories.", DeleteFileSet.DirectoryNames.Count); } else { ! Log(Level.Info, "Deleting {0} files and {1} directories.", DeleteFileSet.FileNames.Count, DeleteFileSet.DirectoryNames.Count); } *************** *** 202,206 **** try { System.IO.File.SetAttributes(file, FileAttributes.Normal); ! Log(Level.Verbose, LogPrefix + "Deleting file '{0}'.", file); System.IO.File.Delete(file); } catch (Exception ex) { --- 202,206 ---- try { System.IO.File.SetAttributes(file, FileAttributes.Normal); ! Log(Level.Verbose, "Deleting file '{0}'.", file); System.IO.File.Delete(file); } catch (Exception ex) { *************** *** 210,214 **** throw new BuildException(msg, Location, ex); } ! Log(Level.Verbose, LogPrefix + msg); } } --- 210,214 ---- throw new BuildException(msg, Location, ex); } ! Log(Level.Verbose, msg); } } *************** *** 217,221 **** System.IO.File.SetAttributes(path, FileAttributes.Normal); // write output to build log ! Log(Level.Verbose, LogPrefix + "Deleting directory '{0}'.", path); // finally, delete the directory System.IO.Directory.Delete(path); --- 217,221 ---- System.IO.File.SetAttributes(path, FileAttributes.Normal); // write output to build log ! Log(Level.Verbose, "Deleting directory '{0}'.", path); // finally, delete the directory System.IO.Directory.Delete(path); *************** *** 228,232 **** throw new BuildException(msg, Location, ex); } ! Log(Level.Verbose, LogPrefix + msg); } } --- 228,232 ---- throw new BuildException(msg, Location, ex); } ! Log(Level.Verbose, msg); } } *************** *** 237,241 **** if (deleteInfo.Exists) { if (verbose) { ! Log(Level.Info, LogPrefix + "Deleting file {0}.", path); } if (deleteInfo.Attributes != FileAttributes.Normal) { --- 237,241 ---- if (deleteInfo.Exists) { if (verbose) { ! Log(Level.Info, "Deleting file {0}.", path); } if (deleteInfo.Attributes != FileAttributes.Normal) { *************** *** 253,257 **** throw new BuildException(msg, Location, ex); } ! Log(Level.Verbose, LogPrefix + msg + " " + ex.Message); } } --- 253,257 ---- throw new BuildException(msg, Location, ex); } ! Log(Level.Verbose, msg + " " + ex.Message); } } Index: EchoTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/EchoTask.cs,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** EchoTask.cs 28 Jun 2004 05:57:11 -0000 1.22 --- EchoTask.cs 15 Jul 2004 19:47:18 -0000 1.23 *************** *** 208,216 **** } else { // output to build log if (!StringUtils.IsNullOrEmpty(Message)) { ! Log(MessageLevel, LogPrefix + Message); } else if (!StringUtils.IsNullOrEmpty(Contents)) { ! Log(MessageLevel, LogPrefix + Contents); } else { ! Log(MessageLevel, LogPrefix); } } --- 208,216 ---- } else { // output to build log if (!StringUtils.IsNullOrEmpty(Message)) { ! Log(MessageLevel, Message); } else if (!StringUtils.IsNullOrEmpty(Contents)) { ! Log(MessageLevel, Contents); } else { ! Log(MessageLevel, string.Empty); } } Index: ExecTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/ExecTask.cs,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ExecTask.cs 12 Jul 2004 17:28:16 -0000 1.29 --- ExecTask.cs 15 Jul 2004 19:47:18 -0000 1.30 *************** *** 261,265 **** /// </summary> protected override void ExecuteTask() { - Log(Level.Info, LogPrefix + "{0} {1}", ProgramFileName, CommandLine); base.ExecuteTask(); if (ResultProperty != null) { --- 261,264 ---- Index: ExternalProgramBase.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/ExternalProgramBase.cs,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** ExternalProgramBase.cs 27 May 2004 14:59:24 -0000 1.59 --- ExternalProgramBase.cs 15 Jul 2004 19:47:18 -0000 1.60 *************** *** 197,203 **** get { if (_outputWriter == null) { ! //do not print LogPrefix, just pad that length. ! _outputWriter = new LogWriter(this, Level.Info, new string(char.Parse(" "), ! LogPrefix.Length), CultureInfo.InvariantCulture); } return _outputWriter; --- 197,202 ---- get { if (_outputWriter == null) { ! _outputWriter = new LogWriter(this, Level.Info, ! CultureInfo.InvariantCulture); } return _outputWriter; *************** *** 221,227 **** get { if (_errorWriter == null) { ! //do not print LogPrefix, just pad that length. ! _errorWriter = new LogWriter(this, Level.Warning, new string(char.Parse(" "), ! LogPrefix.Length), CultureInfo.InvariantCulture); } return _errorWriter; --- 220,225 ---- get { if (_errorWriter == null) { ! _errorWriter = new LogWriter(this, Level.Warning, ! CultureInfo.InvariantCulture); } return _errorWriter; *************** *** 389,393 **** string msg = string.Format( CultureInfo.InvariantCulture, ! LogPrefix + "Starting '{1} ({2})' in '{0}'", p.StartInfo.WorkingDirectory, p.StartInfo.FileName, --- 387,391 ---- string msg = string.Format( CultureInfo.InvariantCulture, ! "Starting '{1} ({2})' in '{0}'", p.StartInfo.WorkingDirectory, p.StartInfo.FileName, *************** *** 399,406 **** p.Start(); return p; ! } catch (Exception e) { ! string msg = string.Format(CultureInfo.InvariantCulture, "[{0}] {1} failed to start.", Name, p.StartInfo.FileName); ! logger.Error(msg, e); ! throw new BuildException(msg, Location, e); } } --- 397,403 ---- p.Start(); return p; ! } catch (Exception ex) { ! throw new BuildException(string.Format(CultureInfo.InvariantCulture, ! "'{0}' failed to start.", p.StartInfo.FileName), Location, ex); } } Index: GetTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/GetTask.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** GetTask.cs 4 Jun 2004 11:40:24 -0000 1.17 --- GetTask.cs 15 Jul 2004 19:47:18 -0000 1.18 *************** *** 218,222 **** if (UseTimeStamp && DestinationFile.Exists) { fileTimeStamp = DestinationFile.LastWriteTime; ! Log(Level.Verbose, LogPrefix + "Local file time stamp is {0}.", fileTimeStamp.ToString(CultureInfo.InvariantCulture)); } --- 218,222 ---- if (UseTimeStamp && DestinationFile.Exists) { fileTimeStamp = DestinationFile.LastWriteTime; ! Log(Level.Verbose, "Local file time stamp is {0}.", fileTimeStamp.ToString(CultureInfo.InvariantCulture)); } *************** *** 242,246 **** DestinationFile.FullName), Location); } else { ! Log(Level.Warning, LogPrefix + "Unable to open connection to '{0}' (try {1} of 3): " + ex.Message, Source, tryCount); } } --- 242,246 ---- DestinationFile.FullName), Location); } else { ! Log(Level.Warning, "Unable to open connection to '{0}' (try {1} of 3): " + ex.Message, Source, tryCount); } } *************** *** 254,258 **** DestinationFile.FullName, FileMode.Create)); ! Log(Level.Info, LogPrefix + "Retrieving '{0}' to '{1}'.", Source, DestinationFile.FullName); --- 254,258 ---- DestinationFile.FullName, FileMode.Create)); ! Log(Level.Info, "Retrieving '{0}' to '{1}'.", Source, DestinationFile.FullName); *************** *** 289,293 **** Log(Level.Verbose, ""); } ! Log(Level.Verbose, LogPrefix + "Number of bytes read: {0}.", totalBytesReadFromStream.ToString(CultureInfo.InvariantCulture)); --- 289,293 ---- Log(Level.Verbose, ""); } ! Log(Level.Verbose, "Number of bytes read: {0}.", totalBytesReadFromStream.ToString(CultureInfo.InvariantCulture)); *************** *** 316,320 **** DateTime remoteTimestamp = httpResponse.LastModified; ! Log(Level.Verbose, LogPrefix + "'{0}' last modified on {1}.", Source, remoteTimestamp.ToString(CultureInfo.InvariantCulture)); --- 316,320 ---- DateTime remoteTimestamp = httpResponse.LastModified; ! Log(Level.Verbose, "'{0}' last modified on {1}.", Source, remoteTimestamp.ToString(CultureInfo.InvariantCulture)); *************** *** 340,344 **** //download happened when it didn't ! Log(Level.Verbose, LogPrefix + "'{0}' not downloaded. Not modified since {1}.", Source, httpResponse.LastModified.ToString(CultureInfo.InvariantCulture)); return; --- 340,344 ---- //download happened when it didn't ! Log(Level.Verbose, "'{0}' not downloaded. Not modified since {1}.", Source, httpResponse.LastModified.ToString(CultureInfo.InvariantCulture)); return; *************** *** 370,374 **** try { if (file.Exists) { ! Log(Level.Verbose, LogPrefix + "Touching file {0} with {1}.", file.FullName, touchDateTime.ToString(CultureInfo.InvariantCulture)); file.LastWriteTime = touchDateTime; --- 370,374 ---- try { if (file.Exists) { ! Log(Level.Verbose, "Touching file {0} with {1}.", file.FullName, touchDateTime.ToString(CultureInfo.InvariantCulture)); file.LastWriteTime = touchDateTime; *************** *** 378,382 **** } catch (Exception e) { // swallow any errors and move on ! Log(Level.Verbose, LogPrefix + "Error: {0}.", e.ToString()); } } --- 378,382 ---- } catch (Exception e) { // swallow any errors and move on ! Log(Level.Verbose, "Error: {0}.", e.ToString()); } } Index: IfTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/IfTask.cs,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** IfTask.cs 30 Jun 2004 19:21:48 -0000 1.34 --- IfTask.cs 15 Jul 2004 19:47:18 -0000 1.35 *************** *** 309,318 **** if (primaryFile == null || !primaryFile.Exists) { ret = false; ! Log(Level.Verbose, LogPrefix + "Uptodatefile(s) do(es) not exist."); } else { string newerFile = FileSet.FindMoreRecentLastWriteTime(_compareFiles.FileNames, primaryFile.LastWriteTime); bool needsAnUpdate = (newerFile != null); if (needsAnUpdate) { ! Log(Level.Verbose, LogPrefix + "{0} is newer than {1}.", newerFile, primaryFile.Name); } ret = ret && !needsAnUpdate; --- 309,318 ---- if (primaryFile == null || !primaryFile.Exists) { ret = false; ! Log(Level.Verbose, "Uptodatefile(s) do(es) not exist."); } else { string newerFile = FileSet.FindMoreRecentLastWriteTime(_compareFiles.FileNames, primaryFile.LastWriteTime); bool needsAnUpdate = (newerFile != null); if (needsAnUpdate) { ! Log(Level.Verbose, "{0} is newer than {1}.", newerFile, primaryFile.Name); } ret = ret && !needsAnUpdate; *************** *** 344,349 **** base.InitializeTask (taskNode); //check that we have something to do. ! if((UpToDateFiles == null || CompareFiles == null) && Test == null && PropertyNameExists == null && PropertyNameTrue == null && TargetNameExists == null) { ! throw new BuildException(LogPrefix + " at least one if condition" + " must be set (test, propertytrue, targetexists, etc...):", Location); } --- 344,349 ---- base.InitializeTask (taskNode); //check that we have something to do. ! if ((UpToDateFiles == null || CompareFiles == null) && Test == null && PropertyNameExists == null && PropertyNameTrue == null && TargetNameExists == null) { ! throw new BuildException("At least one if condition" + " must be set (test, propertytrue, targetexists, etc...):", Location); } Index: IncludeTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Tasks/IncludeTask.cs,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** IncludeTask.cs 19 Feb 2004 04:45:40 -0000 1.20 --- IncludeTask.cs 15 Jul 2004 19:47:18 -0000 1.21 *************** *** 142,146 **** //if we aren't supported to fail if the file is missing, then we should finish up now. if (!FailOnMissingFile && !File.Exists(includedFileName)) { ! Log(Level.Verbose, LogPrefix + "Include file not found {0}({1})", includedFileName, BuildFileName); return; } --- 142,146 ---- //if we aren't supported to fail if the file is missing, then we should finish up now. if (!FailOnMissingFile && !File.Exists(includedFileName)) { ! Log(Level.Verbose, "Include file not found {0}({1})", includedFileName, BuildFileName); return; } *************** *** 148,152 **** // has this file already been mapped ? if (Project.LocationMap.FileIsMapped(includedFileName)) { ! Log(Level.Verbose, LogPrefix + "Duplicate include of file {0}.", includedFileName); return; } --- 148,152 ---- // has this file already been mapped ? if (Project.LocationMap.FileIsMapped(includedFileName)) { ! Log(Level.Verbose, "Duplicate include of file {0}.", includedFileName); return; } *************** *** 158,162 **** _nestinglevel ++; ! Log(Level.Verbose, LogPrefix + "Including file {0}.", includedFileName); // store original base directory --- 158,162 ---- _nestinglevel ++; ! Log(Level.Verbose, "Including file {0}.", includedFileName); // store original base directory |