Author: bodewig
Date: Sun Mar 29 07:13:05 2015
New Revision: 1669861
URL: http://svn.apache.org/r1669861
Log:
add support for Mono 3.5 and 4.0 and tentative support for .NET 4.5
Modified:
logging/log4net/trunk/default.build
logging/log4net/trunk/src/buildsupport/configure-framework.include
logging/log4net/trunk/src/buildsupport/multi-framework-compilation.include
Modified: logging/log4net/trunk/default.build
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/default.build?rev=1669861&r1=1669860&r2=1669861&view=diff
==============================================================================
--- logging/log4net/trunk/default.build (original)
+++ logging/log4net/trunk/default.build Sun Mar 29 07:13:05 2015
@@ -92,6 +92,22 @@ limitations under the License.
<if test="${not framework::exists('mono-2.0')}">
<echo message="Mono 2.0 runtime is not available." />
</if>
+ <!-- Mono 3.5 -->
+ <if test="${framework::exists('mono-3.5')}">
+ <property name="nant.settings.currentframework" value="mono-3.5" />
+ <call target="display-target-framework" />
+ </if>
+ <if test="${not framework::exists('mono-3.5')}">
+ <echo message="Mono 3.5 runtime is not available." />
+ </if>
+ <!-- Mono 4.0 -->
+ <if test="${framework::exists('mono-4.0')}">
+ <property name="nant.settings.currentframework" value="mono-4.0" />
+ <call target="display-target-framework" />
+ </if>
+ <if test="${not framework::exists('mono-4.0')}">
+ <echo message="Mono 4.0 runtime is not available." />
+ </if>
<!-- HTML Help Compiler -->
<echo message="htmlhelp.compiler: ${htmlhelp.compiler}" />
</target>
@@ -173,12 +189,25 @@ limitations under the License.
<call target="-compile-or-fail"/>
<if test="${framework::exists('net-4.0')}">
<call target="compile-net-4.0-cp" />
+ <property name="required.target.name" value=".NET Framework 4.5"/>
+ <property name="required.target.dir" value="net/4.5"/>
+ <call target="compile-net-4.5" />
</if>
<!-- MONO_2_0 -->
<property name="required.target" value="mono-2.0"/>
<property name="required.target.name" value="Mono 2.0"/>
<property name="required.target.dir" value="mono/2.0"/>
<call target="-compile-or-fail"/>
+ <!-- MONO_3_5 -->
+ <property name="required.target" value="mono-3.5"/>
+ <property name="required.target.name" value="Mono 3.5"/>
+ <property name="required.target.dir" value="mono/3.5"/>
+ <call target="-compile-or-fail"/>
+ <!-- MONO_4_0 -->
+ <property name="required.target" value="mono-4.0"/>
+ <property name="required.target.name" value="Mono 4.0"/>
+ <property name="required.target.dir" value="mono/4.0"/>
+ <call target="-compile-or-fail"/>
</target>
<!-- Oh, how I wish NAnt had macros -->
@@ -205,7 +234,10 @@ limitations under the License.
<target name="compile-net-3.5-cp" description="Builds .NET Framework 3.5
Client Profile version"
depends="set-net-3.5-cp-runtime-configuration,-compile-specific-build"/>
<target name="compile-net-4.0" description="Builds .NET Framework 4.0
version" depends="set-net-4.0-runtime-configuration,-compile-specific-build"/>
<target name="compile-net-4.0-cp" description="Builds .NET Framework 4.0
Client Profile version"
depends="set-net-4.0-cp-runtime-configuration,-compile-specific-build"/>
+ <target name="compile-net-4.5" description="Builds .NET Framework 4.5
version" depends="set-net-4.5-runtime-configuration,-compile-specific-build"/>
<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-mono-3.5" description="Builds Mono 3.5 version"
depends="set-mono-3.5-runtime-configuration,-compile-specific-build"/>
+ <target name="compile-mono-4.0" description="Builds Mono 4.0 version"
depends="set-mono-4.0-runtime-configuration,-compile-specific-build"/>
<target name="-compile-specific-build" depends="check-log4net-basedir,
clean-current-bin-dir">
<property name="current.sources" value="log4net"/>
Modified: logging/log4net/trunk/src/buildsupport/configure-framework.include
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/configure-framework.include?rev=1669861&r1=1669860&r2=1669861&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/configure-framework.include
(original)
+++ logging/log4net/trunk/src/buildsupport/configure-framework.include Sun Mar
29 07:13:05 2015
@@ -91,6 +91,20 @@ limitations under the License.
<property name="can.compile.vb" value="true"/>
<call target="-set-framework-configuration"/>
</target>
+ <!-- uses NET_4_0 plus FRAMEWORK_4_5_OR_ABOVE defines -->
+ <target name="set-net-4.5-runtime-configuration">
+ <property name="nant.settings.currentframework" value="net-4.0" />
+ <property name="current.build.platform" value="DOTNET"/>
+ <property name="current.build.api"
value=",FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE,FRAMEWORK_4_5_OR_ABOVE"/>
+ <property name="current.build.api.true"
value=",FRAMEWORK_3_5_OR_ABOVE=True,FRAMEWORK_4_0_OR_ABOVE=True,FRAMEWORK_4_5_OR_ABOVE=True"/>
+ <property name="current.build.api.slash_d" value=" /D
FRAMEWORK_3_5_OR_ABOVE /D FRAMEWORK_4_0_OR_ABOVE /D FRAMEWORK_4_0_OR_ABOVE"/>
+ <property name="current.build.has.systemcore" value="true"/>
+ <property name="current.build.has.systemweb" value="true"/>
+ <property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" value="true"/>
+ <property name="can.compile.vb" value="true"/>
+ <call target="-set-framework-configuration"/>
+ </target>
<target name="set-netcf-2.0-runtime-configuration">
<property name="nant.settings.currentframework" value="netcf-2.0" />
<property name="current.build.platform" value="NETCF"/>
@@ -114,6 +128,32 @@ limitations under the License.
<property name="current.build.has.systemweb" value="true"/>
<property name="current.build.has.systemconfiguration" value="true"/>
<property name="can.compile.js" value="false"/>
+ <property name="can.compile.vb" value="false"/>
+ <call target="-set-framework-configuration"/>
+ </target>
+ <target name="set-mono-3.5-runtime-configuration">
+ <property name="nant.settings.currentframework" value="mono-3.5" />
+ <property name="current.build.platform" value="MONO"/>
+ <property name="current.build.api" value=",FRAMEWORK_3_5_OR_ABOVE"/>
+ <property name="current.build.api.true"
value=",FRAMEWORK_3_5_OR_ABOVE=True"/>
+ <property name="current.build.api.slash_d" value=" /D
FRAMEWORK_3_5_OR_ABOVE"/>
+ <property name="current.build.has.systemcore" value="true"/>
+ <property name="current.build.has.systemweb" value="true"/>
+ <property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" value="false"/>
+ <property name="can.compile.vb" value="false"/>
+ <call target="-set-framework-configuration"/>
+ </target>
+ <target name="set-mono-4.0-runtime-configuration">
+ <property name="nant.settings.currentframework" value="mono-4.0" />
+ <property name="current.build.platform" value="MONO"/>
+ <property name="current.build.api"
value=",FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE"/>
+ <property name="current.build.api.true"
value=",FRAMEWORK_3_5_OR_ABOVE=True,FRAMEWORK_4_0_OR_ABOVE=True"/>
+ <property name="current.build.api.slash_d" value=" /D
FRAMEWORK_3_5_OR_ABOVE /D FRAMEWORK_4_0_OR_ABOVE"/>
+ <property name="current.build.has.systemcore" value="true"/>
+ <property name="current.build.has.systemweb" value="true"/>
+ <property name="current.build.has.systemconfiguration" value="true"/>
+ <property name="can.compile.js" value="false"/>
<property name="can.compile.vb" value="false"/>
<call target="-set-framework-configuration"/>
</target>
Modified:
logging/log4net/trunk/src/buildsupport/multi-framework-compilation.include
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/src/buildsupport/multi-framework-compilation.include?rev=1669861&r1=1669860&r2=1669861&view=diff
==============================================================================
--- logging/log4net/trunk/src/buildsupport/multi-framework-compilation.include
(original)
+++ logging/log4net/trunk/src/buildsupport/multi-framework-compilation.include
Sun Mar 29 07:13:05 2015
@@ -26,6 +26,14 @@ limitations under the License.
<call target="-compile-mono-2.0" />
</if>
+ <if test="${framework::exists('mono-3.5')}">
+ <call target="-compile-mono-3.5" />
+ </if>
+
+ <if test="${framework::exists('mono-4.0')}">
+ <call target="-compile-mono-4.0" />
+ </if>
+
<if test="${framework::exists('net-3.5')}">
<call target="-compile-net-3.5" />
<call target="-compile-net-3.5-cp" />
@@ -34,6 +42,7 @@ limitations under the License.
<if test="${framework::exists('net-4.0')}">
<call target="-compile-net-4.0" />
<call target="-compile-net-4.0-cp" />
+ <call target="-compile-net-4.5" />
</if>
</target>
@@ -42,6 +51,10 @@ limitations under the License.
<target name="-compile-mono-2.0" description="Builds the Mono Framework
2.0 version"
depends="set-mono-2.0-runtime-configuration,-compile-for-one-framework"/>
+ <target name="-compile-mono-3.5" description="Builds the Mono Framework
3.5 version"
depends="set-mono-3.5-runtime-configuration,-compile-for-one-framework"/>
+
+ <target name="-compile-mono-4.0" description="Builds the Mono Framework
4.0 version"
depends="set-mono-4.0-runtime-configuration,-compile-for-one-framework"/>
+
<target name="-compile-net-3.5" description="Builds the .NET Framework 3.5
version"
depends="set-net-3.5-runtime-configuration,-compile-for-one-framework"/>
<target name="-compile-net-3.5-cp" description="Builds the .NET Framework
3.5 Client Profile version"
depends="set-net-3.5-cp-runtime-configuration,-compile-for-one-framework"/>
@@ -50,4 +63,6 @@ limitations under the License.
<target name="-compile-net-4.0-cp" description="Builds the .NET Framework
4.0 Client Profile version"
depends="set-net-4.0-cp-runtime-configuration,-compile-for-one-framework"/>
+ <target name="-compile-net-4.5" description="Builds the .NET Framework 4.5
version"
depends="set-net-4.5-runtime-configuration,-compile-for-one-framework"/>
+
</project>
