Author: nicko
Date: Mon Feb 12 00:55:07 2007
New Revision: 506378
URL: http://svn.apache.org/viewvc?view=rev&rev=506378
Log:
Fixed issue with ExceptionPatternConverter on NETCF Compact Framework build.
Fixed NAnt warnings.
Updated to NAnt 0.85.
Modified:
logging/log4net/trunk/build.cmd
logging/log4net/trunk/log4net.build
logging/log4net/trunk/src/Layout/Pattern/ExceptionPatternConverter.cs
Modified: logging/log4net/trunk/build.cmd
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/build.cmd?view=diff&rev=506378&r1=506377&r2=506378
==============================================================================
--- logging/log4net/trunk/build.cmd (original)
+++ logging/log4net/trunk/build.cmd Mon Feb 12 00:55:07 2007
@@ -18,7 +18,7 @@
IF NOT ERRORLEVEL 1 goto FoundNAnt
REM Try hard coded path for NAnt
-SET NANTEXE_PATH=C:\Program
Files\NAnt\nant-0.85-nightly-2006-03-06\bin\nant.exe
+SET NANTEXE_PATH=C:\Program Files\NAnt\nant-0.85\bin\nant.exe
"%NANTEXE_PATH%" -help >NUL: 2>NUL:
IF NOT ERRORLEVEL 1 goto FoundNAnt
Modified: logging/log4net/trunk/log4net.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?view=diff&rev=506378&r1=506377&r2=506378
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Mon Feb 12 00:55:07 2007
@@ -135,7 +135,7 @@
<target name="display-target-framework">
<echo message="" />
<echo
message="----------------------------------------------------------" />
- <echo message=" ${nant.settings.currentframework.description}" />
+ <echo message="
${framework::get-description(framework::get-target-framework())}" />
<echo
message="----------------------------------------------------------" />
<echo message="" />
<echo message="framework : ${framework::get-target-framework()}" />
Modified: logging/log4net/trunk/src/Layout/Pattern/ExceptionPatternConverter.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/ExceptionPatternConverter.cs?view=diff&rev=506378&r1=506377&r2=506378
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/ExceptionPatternConverter.cs
(original)
+++ logging/log4net/trunk/src/Layout/Pattern/ExceptionPatternConverter.cs Mon
Feb 12 00:55:07 2007
@@ -68,7 +68,9 @@
/// It is typical to put a newline before the exception
/// and to have the exception as the last data in the pattern.
/// </para>
- /// <para>Recognized values for the Option parameter are:</para>
+ /// <para>
+ /// Recognized values for the Option parameter are:
+ /// </para>
/// <list type="bullet">
/// <item>
/// <description>Message</description>
@@ -86,7 +88,6 @@
/// <description>HelpLink</description>
/// </item>
/// </list>
- /// </para>
/// </remarks>
override protected void Convert(TextWriter writer, LoggingEvent
loggingEvent)
{
@@ -97,6 +98,7 @@
case "message":
WriteObject(writer,
loggingEvent.Repository, loggingEvent.ExceptionObject.Message);
break;
+#if !NETCF
case "source":
WriteObject(writer,
loggingEvent.Repository, loggingEvent.ExceptionObject.Source);
break;
@@ -109,6 +111,7 @@
case "helplink":
WriteObject(writer,
loggingEvent.Repository, loggingEvent.ExceptionObject.HelpLink);
break;
+#endif
default:
// do not output
SystemInfo.NotAvailableText
break;
