logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1177240 - in /logging/log4net/trunk: log4net.build log4net.include
Date Thu, 29 Sep 2011 09:40:25 GMT
Author: bodewig
Date: Thu Sep 29 09:40:25 2011
New Revision: 1177240

URL: http://svn.apache.org/viewvc?rev=1177240&view=rev
Log:
remove .NET 3.0 build

Modified:
    logging/log4net/trunk/log4net.build
    logging/log4net/trunk/log4net.include

Modified: logging/log4net/trunk/log4net.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1177240&r1=1177239&r2=1177240&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Thu Sep 29 09:40:25 2011
@@ -75,14 +75,6 @@ limitations under the License.
     <if test="${not framework::exists('net-2.0')}">
       <echo message=".NET Framework 2.0 runtime is not available." />
     </if>
-    <!-- .NET Framework 3.0 -->
-    <if test="${framework::exists('net-3.0')}">
-      <property name="nant.settings.currentframework" value="net-3.0" />
-      <call target="display-target-framework" />
-    </if>
-    <if test="${not framework::exists('net-3.0')}">
-      <echo message=".NET Framework 3.0 runtime is not available." />
-    </if> 
     <!-- .NET Framework 3.5 -->
     <if test="${framework::exists('net-3.5')}">
       <property name="nant.settings.currentframework" value="net-3.5" />
@@ -259,18 +251,6 @@ limitations under the License.
         <echo message="The .NET Framework 2.0 is not available. Build skipped." />
       </if>
     </if>
-    <!-- NET_3_0 -->
-    <if test="${framework::exists('net-3.0')}">
-      <call target="compile-net-3.0" />
-    </if>
-    <if test="${not framework::exists('net-3.0')}">
-      <if test="${property::exists('project.build.package') and project.build.package}">
-        <fail message="The .NET Framework 3.0 is not available." />
-      </if>
-      <if test="${not(property::exists('project.build.package') and project.build.package)}">
-        <echo message="The .NET Framework 3.0 is not available. Build skipped." />
-      </if>
-    </if>
     <!-- NET_3_5 -->
     <if test="${framework::exists('net-3.5')}">
       <call target="compile-net-3.5" />
@@ -654,82 +634,6 @@ limitations under the License.
       </references>
     </csc>
   </target>
-  <target name="compile-net-3.0" description="Builds .NET Framework 3.0 version" depends="set-net-3.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 old log4net key file is available -->
-      <if test="${not file::exists(log4net.basedir + '/old-log4net.snk')}">
-        <if test="${property::exists('project.build.package') and project.build.package}">
-          <fail message="Old key file not found." />
-        </if>
-        <if test="${not(property::exists('project.build.package') and project.build.package)}">
-          <echo message="Old key file not found."/>
-          <echo message="The release build using the old key will be skipped." />
-          <property name="temp.build.skip" value="true" />
-        </if>
-      </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 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.Web.dll" />
-          <include name="System.Xml.dll" />
-          <include name="System.Configuration.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>
-    <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 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.Web.dll" />
-        <include name="System.Xml.dll" />
-        <include name="System.Configuration.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}" 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 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.Web.dll" />
-        <include name="System.Xml.dll" />
-        <include name="System.Configuration.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>
-  </target>
   <target name="compile-net-3.5" description="Builds .NET Framework 3.5 version" depends="set-net-3.5-runtime-configuration,
check-log4net-basedir, clean-current-bin-dir">
     <!-- initialize the temp.build.skip property to false -->
     <property name="temp.build.skip" value="false" />

Modified: logging/log4net/trunk/log4net.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.include?rev=1177240&r1=1177239&r2=1177240&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.include (original)
+++ logging/log4net/trunk/log4net.include Thu Sep 29 09:40:25 2011
@@ -228,19 +228,6 @@ limitations under the License.
         <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />
     </target>
     <!-- uses NET_2_0 defines -->
-    <target name="set-net-3.0-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.0" />
-      <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.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 -->
     <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" />



Mime
View raw message