You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2013/11/20 06:42:23 UTC
svn commit: r1543712 - in /logging/log4net/trunk: lib/ lib/README.txt
lib/main/ lib/test/ lib/test/nunit.framework.dll log4net.build
src/buildsupport/compilation.include src/log4net.Tests/
tests/lib/nunit.framework.dll tests/nant.build tests/src/
Author: bodewig
Date: Wed Nov 20 05:42:22 2013
New Revision: 1543712
URL: http://svn.apache.org/r1543712
Log:
Move test sources and use commom compilation target
Added:
logging/log4net/trunk/lib/
logging/log4net/trunk/lib/README.txt
logging/log4net/trunk/lib/main/
logging/log4net/trunk/lib/test/
logging/log4net/trunk/lib/test/nunit.framework.dll
- copied unchanged from r1543708, logging/log4net/trunk/tests/lib/nunit.framework.dll
logging/log4net/trunk/src/log4net.Tests/
- copied from r1543708, logging/log4net/trunk/tests/src/
Removed:
logging/log4net/trunk/tests/lib/nunit.framework.dll
logging/log4net/trunk/tests/src/
Modified:
logging/log4net/trunk/log4net.build
logging/log4net/trunk/src/buildsupport/compilation.include
logging/log4net/trunk/tests/nant.build
Added: logging/log4net/trunk/lib/README.txt
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/lib/README.txt?rev=1543712&view=auto
==============================================================================
--- logging/log4net/trunk/lib/README.txt (added)
+++ logging/log4net/trunk/lib/README.txt Wed Nov 20 05:42:22 2013
@@ -0,0 +1,15 @@
+Assemblies placed into the main subdirectory will be used when
+compiling log4net itself, assemblies in the test directory will be
+used when compiling the tests.
+
+The only assembly required is nunit.framework.dll when compiling the
+tests.
+
+In each subdirectory it is possible to create a structure that mirrors
+lognet's output directory to contain assemblies that are only used
+when compiling for the matching target framework, i.e.
+
+lib\main\net\2.0\foo.dll
+
+would be used when targeting .NET 2.0 but not when targeting .NET 4.0
+or Mono 2.0.
Modified: logging/log4net/trunk/log4net.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1543712&r1=1543711&r2=1543712&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Wed Nov 20 05:42:22 2013
@@ -211,6 +211,7 @@ limitations under the License.
<property name="current.keyfile" value="log4net.snk"/>
<property name="current.bin.subdir" value=""/>
<property name="current.assembly" value="log4net"/>
+ <property name="warnaserror" value="true"/>
<call target="parameterized-compilation" />
Modified: logging/log4net/trunk/src/buildsupport/compilation.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/compilation.include?rev=1543712&r1=1543711&r2=1543712&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/compilation.include (original)
+++ logging/log4net/trunk/src/buildsupport/compilation.include Wed Nov 20 05:42:22 2013
@@ -30,9 +30,17 @@ limitations under the License.
<include name="System.Data.dll" />
<include name="System.Web.dll" if="${current.build.has.systemweb}"/>
<include name="System.Xml.dll" />
+ <include name="System.Runtime.Remoting.dll" />
<include name="System.Configuration.dll" if="${current.build.has.systemconfiguration}"/>
- <!-- 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" />
+ <include name="${log4net.basedir}/lib/main/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll" />
+ <include name="${log4net.basedir}/lib/main/*.dll" />
+ <include
+ name="${log4net.basedir}/lib/test/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
+ if="${property::exists('with.test.assemblies') and with.test.assemblies}"/>
+ <include name="${log4net.basedir}lib/test/*.dll"
+ if="${property::exists('with.test.assemblies') and with.test.assemblies}"/>
+ <include name="${log4net.basedir}/${current.bin.dir}/log4net.dll" frompath="false"
+ if="${property::exists('with.log4net') and with.log4net}"/>
</assemblyfileset>
<fileset id="sources" basedir="${log4net.basedir}">
<include name="src/${current.sources}/**/*.cs" />
@@ -51,7 +59,9 @@ limitations under the License.
<references refid="references"/>
</csc>
<csc if="${current.build.config.debug}"
- nostdlib="true" noconfig="true" warnaserror="true" target="library"
+ nostdlib="true" noconfig="true"
+ warnaserror="${property::exists('warnaserror') and warnaserror}"
+ target="library"
debug="${current.build.debug}"
define="${current.build.defines.csc}"
output="${current.bin.dir}/${current.assembly}.dll"
Modified: logging/log4net/trunk/tests/nant.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/nant.build?rev=1543712&r1=1543711&r2=1543712&view=diff
==============================================================================
--- logging/log4net/trunk/tests/nant.build (original)
+++ logging/log4net/trunk/tests/nant.build Wed Nov 20 05:42:22 2013
@@ -69,11 +69,8 @@ limitations under the License.
<!-- copy log4net build output -->
<include name="${log4net.basedir}/${current.bin.dir}"/>
<!-- copy referenced libraries to build output -->
- <include name="lib"/>
- <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
- <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
- <include name="lib/${framework::get-family(framework::get-target-framework())}/${current.build.config}"/>
- <include name="${log4net.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+ <include name="${log4net.basedir}/lib/test"/>
+ <include name="${log4net.basedir}/lib/test/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
</items>
</in>
<do>
@@ -85,30 +82,14 @@ limitations under the License.
</do>
</foreach>
- <fileset id="sources" basedir="src">
- <include name="**/*.cs" />
- </fileset>
- <assemblyfileset id="references">
- <include name="mscorlib.dll"/>
- <include name="System.dll" />
- <include name="System.Core.dll" if="${current.build.has.systemcore}"/>
- <include name="System.Data.dll" />
- <include name="System.Web.dll" if="${current.build.has.systemweb}"/>
- <include name="System.Xml.dll" />
- <include name="System.Configuration.dll" if="${current.build.has.systemconfiguration}"/>
- <include name="System.Runtime.Remoting.dll" />
- <include name="${current.bin.dir}/log4net.dll" frompath="false" />
- <!-- 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/*.dll" frompath="false" />
- <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll" />
- <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll" />
- <include name="lib/${framework::get-family(framework::get-target-framework())}/${current.build.config}/*.dll" />
- </assemblyfileset>
-
- <csc nostdlib="true" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}" define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.Tests.dll">
- <sources refid="sources"/>
- <references refid="references"/>
- </csc>
+ <property name="current.sources" value="log4net.Tests"/>
+ <property name="current.keyfile" value="log4net.snk"/>
+ <property name="current.bin.subdir" value=""/>
+ <property name="current.assembly" value="log4net.Tests"/>
+ <property name="with.test.assemblies" value="true"/>
+ <property name="with.log4net" value="true"/>
+
+ <call target="parameterized-compilation" />
</target>
<!-- Currently we cannot run the tests in the environment of the target framework only in the host framework -->