Author: bodewig
Date: Mon Sep 19 08:57:08 2011
New Revision: 1172524
URL: http://svn.apache.org/viewvc?rev=1172524&view=rev
Log:
try to enable old and new key strong naming on all platforms I can currently
build
Modified:
logging/log4net/trunk/log4net.build
Modified: logging/log4net/trunk/log4net.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1172524&r1=1172523&r2=1172524&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Mon Sep 19 08:57:08 2011
@@ -422,10 +422,6 @@ limitations under the License.
<property name="temp.build.skip" value="true" />
</if>
</if>
- <if test="${file::exists(log4net.basedir + '/old-log4net.snk')}">
- <!-- copy the log4net key file to the location where the
compiler expects it to be -->
- <copy file="${log4net.basedir}/old-log4net.snk"
todir="${current.bin.dir}/../../../" />
- </if>
</if>
<if test="${not temp.build.skip}">
<csc if="${current.build.config.release}"
keyfile="${path::combine(log4net.basedir, 'old-log4net.snk')}"
warnaserror="true" target="library" debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/../oldkey/log4net.dll"
doc="${current.bin.dir}/../oldkey/log4net.xml">
@@ -446,6 +442,23 @@ limitations under the License.
</references>
</csc>
</if>
+ <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>
+ <resources failonempty="true">
+ <include name="${log4net.basedir}/NOTICE" />
+ <include name="${log4net.basedir}/LICENSE" />
+ </resources>
+ <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-target-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" />
@@ -536,22 +549,24 @@ limitations under the License.
<!-- check if the log4net key file is available -->
<if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
<if test="${property::exists('project.build.package') and
project.build.package}">
- <fail message="Key file not found." />
+ <fail message="Old key file not found." />
</if>
<if test="${not(property::exists('project.build.package') and
project.build.package)}">
- <echo message="Key file not found. You can generate a key
file by running 'sn -k log4net.snk'." />
- <echo message="The generated key file should be stored in
the log4net base directory." />
- <echo message="The release build will be skipped." />
+ <echo message="Old key file not found."/>
+ <echo message="The release build using the old key will be
skipped." />
<property name="temp.build.skip" value="true" />
</if>
</if>
- <if test="${file::exists(log4net.basedir + '/log4net.snk')}">
- <!-- copy the log4net key file to the location where the
compiler expects it to be -->
- <copy file="${log4net.basedir}/log4net.snk"
todir="${current.bin.dir}/../../../" />
+ <if test="${file::exists(log4net.basedir + '/old-log4net.snk')}">
+ <!-- copy the log4net key file to the location where
+ the compiler expects it to be -->
+ <copy file="${log4net.basedir}/old-log4net.snk"
+ tofile="${current.bin.dir}/../../../log4net.snk"
+ overwrite="true"/>
</if>
</if>
<if test="${not temp.build.skip}">
- <csc 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}" nostdlib="true"
noconfig="true" warnaserror="true" target="library"
debug="${current.build.debug}" define="${current.build.defines.csc}"
output="${current.bin.dir}/../oldkey/log4net.dll"
doc="${current.bin.dir}/../oldkey/log4net.xml">
<sources basedir="${log4net.basedir}/src">
<include name="**/*.cs" />
</sources>
@@ -570,6 +585,27 @@ limitations under the License.
</references>
</csc>
</if>
+ <copy file="${log4net.basedir}/log4net.snk"
+ todir="${current.bin.dir}/../../../"
+ overwrite="true"/>
+ <csc 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">
+ <sources basedir="${log4net.basedir}/src">
+ <include name="**/*.cs" />
+ </sources>
+ <resources failonempty="true">
+ <include name="${log4net.basedir}/NOTICE" />
+ <include name="${log4net.basedir}/LICENSE" />
+ </resources>
+ <references>
+ <include name="mscorlib.dll" />
+ <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-target-framework())}/${current.build.config}/*.dll"
/>
+ </references>
+ </csc>
</target>
<target name="compile-net-2.0" description="Builds .NET Framework 2.0
version" depends="set-net-2.0-runtime-configuration, check-log4net-basedir,
clean-current-bin-dir">
<!-- initialize the temp.build.skip property to false -->
@@ -1338,24 +1374,26 @@ limitations under the License.
<property name="temp.build.skip" value="false" />
<if test="${current.build.config.release}">
<!-- check if the log4net key file is available -->
- <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+ <if test="${not file::exists(log4net.basedir +
'/old-log4net.snk')}">
<if test="${property::exists('project.build.package') and
project.build.package}">
- <fail message="Key file not found." />
+ <fail message="Old key file not found." />
</if>
<if test="${not(property::exists('project.build.package') and
project.build.package)}">
- <echo message="Key file not found. You can generate a key
file by running 'sn -k log4net.snk'." />
- <echo message="The generated key file should be stored in
the log4net base directory." />
- <echo message="The release build will be skipped." />
+ <echo message="Old key file not found."/>
+ <echo message="The release build using the old key will be
skipped." />
<property name="temp.build.skip" value="true" />
</if>
</if>
- <if test="${file::exists(log4net.basedir + '/log4net.snk')}">
- <!-- copy the log4net key file to the location where the
compiler expects it to be -->
- <copy file="${log4net.basedir}/log4net.snk"
todir="${current.bin.dir}/../../../" />
+ <if test="${file::exists(log4net.basedir + '/old-log4net.snk')}">
+ <!-- copy the log4net key file to the location where
+ the compiler expects it to be -->
+ <copy file="${log4net.basedir}/old-log4net.snk"
+ tofile="${current.bin.dir}/../../../log4net.snk"
+ overwrite="true"/>
</if>
</if>
<if test="${not temp.build.skip}">
- <csc 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 nostdlib="true" noconfig="true" warnaserror="true"
target="library" debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/../oldkey/log4net.dll"
doc="${current.bin.dir}/../oldkey/log4net.xml">
<sources basedir="${log4net.basedir}/src">
<include name="**/*.cs" />
</sources>
@@ -1374,6 +1412,27 @@ limitations under the License.
</references>
</csc>
</if>
+ <copy file="${log4net.basedir}/log4net.snk"
+ todir="${current.bin.dir}/../../../"
+ overwrite="true"/>
+ <csc 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">
+ <sources basedir="${log4net.basedir}/src">
+ <include name="**/*.cs" />
+ </sources>
+ <resources failonempty="true">
+ <include name="${log4net.basedir}/NOTICE" />
+ <include name="${log4net.basedir}/LICENSE" />
+ </resources>
+ <references>
+ <include name="mscorlib.dll" />
+ <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-target-framework())}/${current.build.config}/*.dll"
/>
+ </references>
+ </csc>
</target>
<!-- Target for generating docs for all runtime configurations -->
<target name="generate-sdkdoc-all" depends="check-current-build-config">
