logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1539444 - /logging/log4net/branches/log4net-1.2.x/log4net.include
Date Wed, 06 Nov 2013 19:57:29 GMT
Author: bodewig
Date: Wed Nov  6 19:57:29 2013
New Revision: 1539444

URL: http://svn.apache.org/r1539444
Log:
define NET_3_5 so the 3.5 assemblies contain the ILogExtensions

Modified:
    logging/log4net/branches/log4net-1.2.x/log4net.include

Modified: logging/log4net/branches/log4net-1.2.x/log4net.include
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/log4net.include?rev=1539444&r1=1539443&r2=1539444&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/log4net.include (original)
+++ logging/log4net/branches/log4net-1.2.x/log4net.include Wed Nov  6 19:57:29 2013
@@ -227,28 +227,28 @@ limitations under the License.
         <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"
/>
         <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />
     </target>
-    <!-- uses NET_2_0 defines -->
+    <!-- uses NET_2_0 defines plus NET_3_5 -->
     <target name="set-net-3.5-runtime-configuration" depends="check-bin-dir, check-sdkdoc-dir,
check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
       <property name="nant.settings.currentframework" value="net-3.5" />
       <property name="current.build.debug" value="${build.debug}" dynamic="true" />
-      <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0"
dynamic="true" />
-      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0"
dynamic="true" />
-      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True"
dynamic="true" />
-      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0"
dynamic="true" />
-      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0"
dynamic="true" />
+      <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_3_5"
dynamic="true" />
+      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_3_5"
dynamic="true" />
+      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_3_5=True"
dynamic="true" />
+      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_3_5"
dynamic="true" />
+      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0
/D NET_3_5" dynamic="true" />
       <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
/>
       <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"
/>      
       <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />
     </target>
-    <!-- uses NET_2_0 defines plus CLIENT_PROFILE-->
+    <!-- uses NET_2_0 defines plus NET_3_5 and CLIENT_PROFILE-->
     <target name="set-net-3.5-cp-runtime-configuration" depends="check-bin-dir, check-sdkdoc-dir,
check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
       <property name="nant.settings.currentframework" value="net-3.5" />
       <property name="current.build.debug" value="${build.debug}" dynamic="true" />
-      <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,CLIENT_PROFILE=True"
dynamic="true" />
-      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0
/D CLIENT_PROFILE" dynamic="true" />
+      <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_3_5=True,CLIENT_PROFILE=True"
dynamic="true" />
+      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0
/D NET_3_5 /D CLIENT_PROFILE" dynamic="true" />
       <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
/>
       <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}"
/>      
       <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />



Mime
View raw message