Author: nicko
Date: Sun Feb 25 10:38:47 2007
New Revision: 511571
URL: http://svn.apache.org/viewvc?view=rev&rev=511571
Log:
Renamed LICENSE.txt and NOTICE.txt to LICENSE and NOTICE.
Added LICENSE and NOTICE as embedded resources in all log4net dlls.
Added:
logging/log4net/trunk/LICENSE
- copied unchanged from r511515, logging/log4net/trunk/LICENSE.txt
logging/log4net/trunk/NOTICE
- copied unchanged from r511515, logging/log4net/trunk/NOTICE.txt
Removed:
logging/log4net/trunk/LICENSE.txt
logging/log4net/trunk/NOTICE.txt
Modified:
logging/log4net/trunk/log4net.build
Modified: logging/log4net/trunk/log4net.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?view=diff&rev=511571&r1=511570&r2=511571
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Sun Feb 25 10:38:47 2007
@@ -106,15 +106,15 @@
<if test="${not framework::exists('netcf-1.0')}">
<echo message=".NET Compact Framework 1.0 runtime is not
available." />
</if>
- <!-- .NET Compact Framework 2.0 -->
- <if test="${framework::exists('netcf-2.0')}">
- <property name="nant.settings.currentframework"
value="netcf-2.0" />
- <call target="display-target-framework" />
- </if>
- <if test="${not framework::exists('netcf-2.0')}">
- <echo message=".NET Compact Framework 2.0 runtime is
not available." />
- </if>
- <!-- Mono 1.0 -->
+ <!-- .NET Compact Framework 2.0 -->
+ <if test="${framework::exists('netcf-2.0')}">
+ <property name="nant.settings.currentframework" value="netcf-2.0"
/>
+ <call target="display-target-framework" />
+ </if>
+ <if test="${not framework::exists('netcf-2.0')}">
+ <echo message=".NET Compact Framework 2.0 runtime is not
available." />
+ </if>
+ <!-- Mono 1.0 -->
<if test="${framework::exists('mono-1.0')}">
<property name="nant.settings.currentframework" value="mono-1.0" />
<call target="display-target-framework" />
@@ -194,7 +194,7 @@
<!-- Target for compiling all runtime configurations in the current build
configuration -->
<target name="compile-build" description="Compile current build
configurations for all runtime configurations">
<echo message="Compiling all framework versions for the
${current.build.config} build configuration." />
- <!-- NETCF_1_0 -->
+ <!-- NETCF_1_0 -->
<if test="${framework::exists('netcf-1.0')}">
<call target="compile-netcf-1.0" />
</if>
@@ -207,21 +207,21 @@
message="The .NET Compact Framework 1.0 is not available.
Build skipped." />
</if>
</if>
- <!-- NETCF_2_0 -->
- <if test="${framework::exists('netcf-2.0')}">
- <call target="compile-netcf-2.0" />
- </if>
- <if test="${not framework::exists('netcf-2.0')}">
- <if test="${property::exists('project.build.package')
and project.build.package}">
- <fail message="The .NET Compact Framework 2.0
is not available." />
- </if>
- <if
test="${not(property::exists('project.build.package') and
project.build.package)}">
- <echo
+ <!-- NETCF_2_0 -->
+ <if test="${framework::exists('netcf-2.0')}">
+ <call target="compile-netcf-2.0" />
+ </if>
+ <if test="${not framework::exists('netcf-2.0')}">
+ <if test="${property::exists('project.build.package') and
project.build.package}">
+ <fail message="The .NET Compact Framework 2.0 is not
available." />
+ </if>
+ <if test="${not(property::exists('project.build.package') and
project.build.package)}">
+ <echo
message="The .NET Compact Framework 2.0 is not available.
Build skipped." />
- </if>
- </if>
- <!-- NET_1_0 -->
- <if test="${framework::exists('net-1.0')}">
+ </if>
+ </if>
+ <!-- NET_1_0 -->
+ <if test="${framework::exists('net-1.0')}">
<call target="compile-net-1.0" />
<call target="compile-cli-1.0" />
</if>
@@ -233,20 +233,20 @@
<echo message="The .NET Framework 1.0 is not available. Build
skipped." />
</if>
</if>
- <!-- NET_1_1 -->
- <if test="${framework::exists('net-1.1')}">
- <call target="compile-net-1.1" />
- </if>
- <if test="${not framework::exists('net-1.1')}">
- <if test="${property::exists('project.build.package')
and project.build.package}">
- <fail message="The .NET Framework 1.1 is not
available." />
- </if>
- <if
test="${not(property::exists('project.build.package') and
project.build.package)}">
- <echo message="The .NET Framework 1.1 is not
available. Build skipped." />
- </if>
- </if>
- <!-- NET_2_0 -->
- <if test="${framework::exists('net-2.0')}">
+ <!-- NET_1_1 -->
+ <if test="${framework::exists('net-1.1')}">
+ <call target="compile-net-1.1" />
+ </if>
+ <if test="${not framework::exists('net-1.1')}">
+ <if test="${property::exists('project.build.package') and
project.build.package}">
+ <fail message="The .NET Framework 1.1 is not available." />
+ </if>
+ <if test="${not(property::exists('project.build.package') and
project.build.package)}">
+ <echo message="The .NET Framework 1.1 is not available. Build
skipped." />
+ </if>
+ </if>
+ <!-- NET_2_0 -->
+ <if test="${framework::exists('net-2.0')}">
<call target="compile-net-2.0" />
</if>
<if test="${not framework::exists('net-2.0')}">
@@ -257,8 +257,8 @@
<echo message="The .NET Framework 2.0 is not available. Build
skipped." />
</if>
</if>
- <!-- MONO_1_0 -->
- <if test="${framework::exists('mono-1.0')}">
+ <!-- MONO_1_0 -->
+ <if test="${framework::exists('mono-1.0')}">
<call target="compile-mono-1.0" />
</if>
<if test="${not framework::exists('mono-1.0')}">
@@ -269,8 +269,8 @@
<echo message="Mono 1.0 is not available. Build skipped." />
</if>
</if>
- <!-- MONO_2_0 -->
- <if test="${framework::exists('mono-2.0')}">
+ <!-- MONO_2_0 -->
+ <if test="${framework::exists('mono-2.0')}">
<call target="compile-mono-2.0" />
</if>
<if test="${not framework::exists('mono-2.0')}">
@@ -281,8 +281,8 @@
<echo message="Mono 2.0 is not available. Build skipped." />
</if>
</if>
- <!-- SSCLI_1_0 -->
- <if test="${framework::exists('sscli-1.0')}">
+ <!-- SSCLI_1_0 -->
+ <if test="${framework::exists('sscli-1.0')}">
<call target="compile-sscli-1.0" />
</if>
<if test="${not framework::exists('sscli-1.0')}">
@@ -323,6 +323,68 @@
<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>
+ </if>
+ </target>
+ <target name="compile-netcf-2.0" description="Builds .NET Compact
Framework 2.0 version" depends="set-netcf-2.0-runtime-configuration,
check-log4net-basedir, clean-current-bin-dir">
+ <!-- initialize the temp.build.skip property to false -->
+ <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="${property::exists('project.build.package') and
project.build.package}">
+ <fail message="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." />
+ <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>
+ </if>
+ <if test="${not temp.build.skip}">
+ <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" />
+ </sources>
+ <resources failonempty="true">
+ <include name="${log4net.basedir}/NOTICE" />
+ <include name="${log4net.basedir}/LICENSE" />
+ </resources>
<references>
<include name="mscorlib.dll" />
<include name="System.dll" />
@@ -334,57 +396,7 @@
</csc>
</if>
</target>
- <target name="compile-netcf-2.0" description="Builds .NET Compact
Framework 2.0 version" depends="set-netcf-2.0-runtime-configuration,
check-log4net-basedir, clean-current-bin-dir">
- <!-- initialize the temp.build.skip property to false -->
- <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="${property::exists('project.build.package') and project.build.package}">
- <fail message="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." />
- <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>
- </if>
- <if test="${not temp.build.skip}">
- <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-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" />
- </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-target-framework())}/${current.build.config}/*.dll"
/>
- </references>
- </csc>
- </if>
- </target>
- <target name="compile-net-1.0" description="Builds .NET Framework 1.0
version" depends="set-net-1.0-runtime-configuration, check-log4net-basedir,
clean-current-bin-dir">
+ <target name="compile-net-1.0" description="Builds .NET Framework 1.0
version" depends="set-net-1.0-runtime-configuration, check-log4net-basedir,
clean-current-bin-dir">
<!-- initialize the temp.build.skip property to false -->
<property name="temp.build.skip" value="false" />
<if test="${current.build.config.release}">
@@ -410,6 +422,10 @@
<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" />
@@ -448,6 +464,10 @@
<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" />
@@ -486,6 +506,10 @@
<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" />
@@ -505,6 +529,10 @@
<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" />
@@ -546,6 +574,10 @@
<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="System.dll" />
<include name="System.Data.dll" />
@@ -565,6 +597,10 @@
<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="System.dll" />
<include name="System.Data.dll" />
@@ -604,6 +640,10 @@
<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="System.dll" />
<include name="System.Data.dll" />
@@ -623,6 +663,10 @@
<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="System.dll" />
<include name="System.Data.dll" />
@@ -660,6 +704,10 @@
<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" />
@@ -714,6 +762,10 @@
<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" />
@@ -934,8 +986,8 @@
<include name="log4net.build" />
<include name="log4net.include" />
<!-- <include name="releasenotes.html" /> -->
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
+ <include name="LICENSE" />
+ <include name="NOTICE" />
<include name="README.txt" />
<include name="log4net.snk" />
<include name="log4net.snk.readme" />
