Author: nicko
Date: Sat Feb 17 17:27:01 2007
New Revision: 508849
URL:
http://svn.apache.org/viewvc?view=rev&rev=508849
Log:
Fixed issue with some debug builds having strong names (all
those that pass /keyfile to csc).
Added strong name to Compact Framework 2.0 release builds.
This requires a minor update to the NAnt 0.85 config file:
I had to update the NAnt.exe.config to add support for the
/keyfile option:
<attribute
name="supportskeyfile">true</attribute>
In the <framework
name="netcf-2.0">/<task
name="csc"> section.
Modified:
logging/log4net/trunk/log4net.build
Modified: logging/log4net/trunk/log4net.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4
net.build?view=diff&rev=508849&r1=508848&r2=5088
49
============================================================
==================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Sat Feb 17 17:27:01
2007
 -356,7
+356,20
</if>
</if>
<if test="${not temp.build.skip}">
- <csc warnaserror="true"
target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
+ <csc if="${current.build.config.release}"
keyfile="${path::combine(log4net.basedir,
'log4net.snk')}" warnaserror="true"
target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
+ <sources
basedir="${log4net.basedir}/src">
+ <include name="**/*.cs" />
+ </sources>
+ <references>
+ <include name="mscorlib.dll" />
+ <include name="System.dll" />
+ <include name="System.Data.dll" />
+ <include name="System.Xml.dll" />
+ <!-- allow for third party assemblies to be
referenced by just storing them in the lib/<framework
family>/<framework version>/<build
configuration> directory -->
+ <include
name="lib/${framework::get-family(framework::get-target
-framework())}/${framework::get-version(framework::get-targe
t-framework())}/${current.build.config}/*.dll" />
+ </references>
+ </csc>
+ <csc if="${current.build.config.debug}"
warnaserror="true" target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
<sources
basedir="${log4net.basedir}/src">
<include name="**/*.cs" />
</sources>
-465,7
+478,26
</if>
</if>
<if test="${not temp.build.skip}">
- <csc
keyfile="${path::combine(log4net.basedir,
'log4net.snk')}" nostdlib="true"
noconfig="true" warnaserror="true"
target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
+ <csc
if="${current.build.config.release}"
keyfile="${path::combine(log4net.basedir,
'log4net.snk')}" nostdlib="true"
noconfig="true" warnaserror="true"
target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
+ <nowarn>
+ <!-- warning CS1058: A previous
catch clause already catches all exceptions. All
non-exceptions thrown will be wrapped in a
System.Runtime.CompilerServices.RuntimeWrappedException
-->
+ <warning number="1058"
/>
+ </nowarn>
+ <sources
basedir="${log4net.basedir}/src">
+ <include name="**/*.cs"
/>
+ </sources>
+ <references>
+ <include
name="mscorlib.dll" />
+ <include name="System.dll"
/>
+ <include
name="System.Data.dll" />
+ <include
name="System.Web.dll" />
+ <include
name="System.Xml.dll" />
+ <include
name="System.Configuration.dll" />
+ <!-- allow for third party
assemblies to be referenced by just storing them in the
lib/<framework family>/<framework
version>/<build configuration> directory -->
+ <include
name="lib/${framework::get-family(framework::get-target
-framework())}/${framework::get-version(framework::get-targe
t-framework())}/${current.build.config}/*.dll" />
+ </references>
+ </csc>
+ <csc
if="${current.build.config.debug}"
nostdlib="true" noconfig="true"
warnaserror="true" target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
<nowarn>
<!-- warning CS1058: A previous
catch clause already catches all exceptions. All
non-exceptions thrown will be wrapped in a
System.Runtime.CompilerServices.RuntimeWrappedException
-->
<warning number="1058"
/>
-504,7
+536,26
</if>
</if>
<if test="${not temp.build.skip}">
- <csc
keyfile="${path::combine(log4net.basedir,
'log4net.snk')}" nostdlib="false"
noconfig="true" warnaserror="true"
target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
+ <csc
if="${current.build.config.release}"
keyfile="${path::combine(log4net.basedir,
'log4net.snk')}" nostdlib="false"
noconfig="true" warnaserror="true"
target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
+ <nowarn>
+ <!-- workaround for Mono bug #61902
-->
+ <warning number="0618"
/>
+ <!-- warning CS1058: A previous
catch clause already catches all exceptions. All
non-exceptions thrown will be wrapped in a
System.Runtime.CompilerServices.RuntimeWrappedException
-->
+ <warning number="1058"
/>
+ </nowarn>
+ <sources
basedir="${log4net.basedir}/src">
+ <include name="**/*.cs"
/>
+ </sources>
+ <references>
+ <include name="System.dll"
/>
+ <include
name="System.Data.dll" />
+ <include
name="System.Web.dll" />
+ <include
name="System.Xml.dll" />
+ <!-- allow for third party
assemblies to be referenced by just storing them in the
lib/<framework family>/<framework
version>/<build configuration> directory -->
+ <include
name="lib/${framework::get-family(framework::get-target
-framework())}/${framework::get-version(framework::get-targe
t-framework())}/${current.build.config}/*.dll" />
+ </references>
+ </csc>
+ <csc
if="${current.build.config.debug}"
nostdlib="false" noconfig="true"
warnaserror="true" target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
<nowarn>
<!-- workaround for Mono bug #61902
-->
<warning number="0618"
/>
-543,7
+594,26
</if>
</if>
<if test="${not temp.build.skip}">
- <csc
keyfile="${path::combine(log4net.basedir,
'log4net.snk')}" nostdlib="false"
noconfig="true" warnaserror="true"
target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
+ <csc
if="${current.build.config.release}"
keyfile="${path::combine(log4net.basedir,
'log4net.snk')}" nostdlib="false"
noconfig="true" warnaserror="true"
target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
+ <nowarn>
+ <!-- workaround for Mono bug #61902
-->
+ <warning number="0618"
/>
+ <!-- warning CS1058: A previous
catch clause already catches all exceptions. All
non-exceptions thrown will be wrapped in a
System.Runtime.CompilerServices.RuntimeWrappedException
-->
+ <warning number="1058"
/>
+ </nowarn>
+ <sources
basedir="${log4net.basedir}/src">
+ <include name="**/*.cs"
/>
+ </sources>
+ <references>
+ <include name="System.dll"
/>
+ <include
name="System.Data.dll" />
+ <include
name="System.Web.dll" />
+ <include
name="System.Xml.dll" />
+ <!-- allow for third party
assemblies to be referenced by just storing them in the
lib/<framework family>/<framework
version>/<build configuration> directory -->
+ <include
name="lib/${framework::get-family(framework::get-target
-framework())}/${framework::get-version(framework::get-targe
t-framework())}/${current.build.config}/*.dll" />
+ </references>
+ </csc>
+ <csc
if="${current.build.config.debug}"
nostdlib="false" noconfig="true"
warnaserror="true" target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/log4net.dll"
doc="${current.bin.dir}/log4net.xml">
<nowarn>
<!-- workaround for Mono bug #61902
-->
<warning number="0618"
/>
|
