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:16:55 UTC
svn commit: r1543708 - in /logging/log4net/trunk: log4net.build
src/buildsupport/check-environment.include
src/buildsupport/compilation.include
src/buildsupport/configure-framework.include src/buildsupport/log4net.include
Author: bodewig
Date: Wed Nov 20 05:16:54 2013
New Revision: 1543708
URL: http://svn.apache.org/r1543708
Log:
farm out compilation logic
Added:
logging/log4net/trunk/src/buildsupport/compilation.include
Modified:
logging/log4net/trunk/log4net.build
logging/log4net/trunk/src/buildsupport/check-environment.include
logging/log4net/trunk/src/buildsupport/configure-framework.include
logging/log4net/trunk/src/buildsupport/log4net.include
Modified: logging/log4net/trunk/log4net.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1543708&r1=1543707&r2=1543708&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Wed Nov 20 05:16:54 2013
@@ -207,25 +207,12 @@ limitations under the License.
<target name="compile-mono-2.0" description="Builds Mono 2.0 version" depends="set-mono-2.0-runtime-configuration,-compile-specific-build"/>
<target name="-compile-specific-build" depends="check-log4net-basedir, clean-current-bin-dir">
- <resourcefileset id="nl-files" failonempty="true">
- <include name="${log4net.basedir}/NOTICE" />
- <include name="${log4net.basedir}/LICENSE" />
- </resourcefileset>
- <fileset id="sources" basedir="${log4net.basedir}">
- <include name="src/log4net/**/*.cs" />
- <include name="${generated.src.dir}/**/*.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}"/>
- <!-- 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" />
- </assemblyfileset>
+ <property name="current.sources" value="log4net"/>
+ <property name="current.keyfile" value="log4net.snk"/>
+ <property name="current.bin.subdir" value=""/>
+ <property name="current.assembly" value="log4net"/>
+
+ <call target="parameterized-compilation" />
<!-- initialize the temp.build.skip property to false -->
<property name="temp.build.skip" value="false" />
@@ -243,22 +230,10 @@ limitations under the License.
</if>
</if>
<if test="${not temp.build.skip}">
- <csc if="${current.build.config.release}" keyfile="${path::combine(log4net.basedir, 'old-log4net.snk')}" 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 refid="sources"/>
- <resources refid="nl-files"/>
- <references refid="references"/>
- </csc>
+ <property name="current.keyfile" value="old-log4net.snk"/>
+ <property name="current.bin.subdir" value="../oldkey/"/>
+ <call target="parameterized-compilation" />
</if>
- <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">
- <sources refid="sources"/>
- <resources refid="nl-files"/>
- <references refid="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">
- <sources refid="sources"/>
- <resources refid="nl-files"/>
- <references refid="references"/>
- </csc>
</target>
<!-- Target for generating docs for all runtime configurations -->
Modified: logging/log4net/trunk/src/buildsupport/check-environment.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/check-environment.include?rev=1543708&r1=1543707&r2=1543708&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/check-environment.include (original)
+++ logging/log4net/trunk/src/buildsupport/check-environment.include Wed Nov 20 05:16:54 2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="log4net-helpers" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-checkss" xmlnds="http://tempuri.org/nant-vs.xsd">
<!-- ========================================================
Targets that check various proprties and create directories
Added: logging/log4net/trunk/src/buildsupport/compilation.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/compilation.include?rev=1543708&view=auto
==============================================================================
--- logging/log4net/trunk/src/buildsupport/compilation.include (added)
+++ logging/log4net/trunk/src/buildsupport/compilation.include Wed Nov 20 05:16:54 2013
@@ -0,0 +1,65 @@
+<?xml version="1.0" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project name="log4net-compilation" xmlnds="http://tempuri.org/nant-vs.xsd">
+
+ <resourcefileset id="nl-files" failonempty="true">
+ <include name="${log4net.basedir}/NOTICE" />
+ <include name="${log4net.basedir}/LICENSE" />
+ </resourcefileset>
+
+ <target name="parameterized-compilation">
+ <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}"/>
+ <!-- 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" />
+ </assemblyfileset>
+ <fileset id="sources" basedir="${log4net.basedir}">
+ <include name="src/${current.sources}/**/*.cs" />
+ <include name="${generated.src.dir}/**/*.cs" />
+ </fileset>
+
+ <csc if="${current.build.config.release}"
+ keyfile="${path::combine(log4net.basedir, current.keyfile)}"
+ nostdlib="true" noconfig="true" warnaserror="true" target="library"
+ debug="${current.build.debug}"
+ define="${current.build.defines.csc}"
+ output="${current.bin.dir}/${current.bin.subdir}${current.assembly}.dll"
+ doc="${current.bin.dir}/${current.bin.subdir}${current.assembly}.xml">
+ <sources refid="sources"/>
+ <resources refid="nl-files"/>
+ <references refid="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}/${current.assembly}.dll"
+ doc="${current.bin.dir}/${current.assembly}.xml">
+ <sources refid="sources"/>
+ <resources refid="nl-files"/>
+ <references refid="references"/>
+ </csc>
+ </target>
+
+</project>
Modified: logging/log4net/trunk/src/buildsupport/configure-framework.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/configure-framework.include?rev=1543708&r1=1543707&r2=1543708&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/configure-framework.include (original)
+++ logging/log4net/trunk/src/buildsupport/configure-framework.include Wed Nov 20 05:16:54 2013
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="log4net-helpers" xmlnds="http://tempuri.org/nant-vs.xsd">
+<project name="log4net-framework-config" xmlnds="http://tempuri.org/nant-vs.xsd">
<target name="set-framework-configuration" depends="check-current-build-config">
<if test="${not target::exists('set-' + framework::get-target-framework() + '-runtime-configuration')}">
<fail message="The current target framework (${framework::get-description(framework::get-target-framework())}) is not supported by log4net." />
Modified: logging/log4net/trunk/src/buildsupport/log4net.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/log4net.include?rev=1543708&r1=1543707&r2=1543708&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/log4net.include (original)
+++ logging/log4net/trunk/src/buildsupport/log4net.include Wed Nov 20 05:16:54 2013
@@ -84,5 +84,6 @@ limitations under the License.
</target>
<include buildfile="configure-framework.include" />
+ <include buildfile="compilation.include" />
</project>