logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1167040 - in /logging/log4net/trunk: log4net.build log4net.include
Date Fri, 09 Sep 2011 08:35:26 GMT
Author: bodewig
Date: Fri Sep  9 08:35:26 2011
New Revision: 1167040

URL: http://svn.apache.org/viewvc?rev=1167040&view=rev
Log:
release build signing with old key for .NET (CF) 2.0+ and Mono, the other platforms don't
use the keyfile attribute of the csc task, need to read up on how they locate the key to use.
 Make copy-paste hell worse.

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=1167040&r1=1167039&r2=1167040&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Fri Sep  9 08:35:26 2011
@@ -411,25 +411,24 @@ limitations under the License.
         <!-- initialize the temp.build.skip property to false -->
         <property name="temp.build.skip" value="false" />
         <if test="${current.build.config.release}">
-            <!-- check if the log4net key file is available -->
-            <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+            <!-- 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="Key file not found." />
+                    <fail message="Old key file not found." />
                 </if>
                 <if test="${not(property::exists('project.build.package') and project.build.package)}">
-                    <echo message="Key file not found. You can generate a key file by
running 'sn -k log4net.snk'." />
-                    <echo message="The generated key file should be stored in the log4net
base directory." />
-                    <echo message="The release build will be skipped." />
+                    <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 test="${file::exists(log4net.basedir + '/log4net.snk')}">
+            <if test="${file::exists(log4net.basedir + '/old-log4net.snk')}">
                 <!-- copy the log4net key file to the location where the compiler expects
it to be -->
-                <copy file="${log4net.basedir}/log4net.snk" todir="${current.bin.dir}/../../../"
/>
+                <copy file="${log4net.basedir}/old-log4net.snk" todir="${current.bin.dir}/../../../"
/>
             </if>
         </if>
         <if test="${not temp.build.skip}">
-            <csc if="${current.build.config.release}" keyfile="${path::combine(log4net.basedir,
'log4net.snk')}" 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">
+            <csc if="${current.build.config.release}" keyfile="${path::combine(log4net.basedir,
'old-log4net.snk')}" 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>
@@ -446,6 +445,7 @@ limitations under the License.
                     <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.debug}" 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" />
@@ -463,7 +463,6 @@ limitations under the License.
                     <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
                 </references>
             </csc>
-        </if>
     </target>
     <target name="compile-net-1.0" description="Builds .NET Framework 1.0 version" depends="set-net-1.0-runtime-configuration,
check-log4net-basedir, clean-current-bin-dir">
         <!-- initialize the temp.build.skip property to false -->
@@ -553,20 +552,43 @@ limitations under the License.
         <!-- initialize the temp.build.skip property to false -->
         <property name="temp.build.skip" value="false" />
         <if test="${current.build.config.release}">
-            <!-- check if the log4net key file is available -->
-            <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+            <!-- 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="Key file not found." />
+                    <fail message="Old key file not found." />
                 </if>
                 <if test="${not(property::exists('project.build.package') and project.build.package)}">
-                    <echo message="Key file not found. You can generate a key file by
running 'sn -k log4net.snk'." />
-                    <echo message="The generated key file should be stored in the log4net
base directory." />
-                    <echo message="The release build will be skipped." />
+                    <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">
+                <nowarn>
+                    <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
+                    <warning number="1058" />
+                </nowarn>
+                <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">
                 <nowarn>
                     <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
@@ -613,26 +635,48 @@ limitations under the License.
                     <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
                 </references>
             </csc>
-        </if>
     </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 log4net key file is available -->
-      <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+      <!-- 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="Key file not found." />
+          <fail message="Old key file not found." />
         </if>
         <if test="${not(property::exists('project.build.package') and project.build.package)}">
-          <echo message="Key file not found. You can generate a key file by running 'sn
-k log4net.snk'." />
-          <echo message="The generated key file should be stored in the log4net base directory."
/>
-          <echo message="The release build will be skipped." />
+          <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">
+        <nowarn>
+          <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
+          <warning number="1058" />
+        </nowarn>
+        <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">
         <nowarn>
           <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
@@ -679,26 +723,48 @@ limitations under the License.
           <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
         </references>
       </csc>
-    </if>
   </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" />
     <if test="${current.build.config.release}">
-      <!-- check if the log4net key file is available -->
-      <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+      <!-- 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="Key file not found." />
+          <fail message="Old key file not found." />
         </if>
         <if test="${not(property::exists('project.build.package') and project.build.package)}">
-          <echo message="Key file not found. You can generate a key file by running 'sn
-k log4net.snk'." />
-          <echo message="The generated key file should be stored in the log4net base directory."
/>
-          <echo message="The release build will be skipped." />
+          <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">
+        <nowarn>
+          <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
+          <warning number="1058" />
+        </nowarn>
+        <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">
         <nowarn>
           <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
@@ -745,26 +811,47 @@ limitations under the License.
           <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
         </references>
       </csc>
-    </if>
   </target>
   <target name="compile-net-3.5-cp" description="Builds .NET Framework 3.5 Client Profile
version" depends="set-net-3.5-cp-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 log4net key file is available -->
-      <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+      <!-- 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="Key file not found." />
+          <fail message="Old key file not found." />
         </if>
         <if test="${not(property::exists('project.build.package') and project.build.package)}">
-          <echo message="Key file not found. You can generate a key file by running 'sn
-k log4net.snk'." />
-          <echo message="The generated key file should be stored in the log4net base directory."
/>
-          <echo message="The release build will be skipped." />
+          <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">
+        <nowarn>
+          <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
+          <warning number="1058" />
+        </nowarn>
+        <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.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">
         <nowarn>
           <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
@@ -809,26 +896,48 @@ limitations under the License.
           <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
         </references>
       </csc>
-    </if>
   </target>
   <target name="compile-net-4.0" description="Builds .NET Framework 4.0 version" depends="set-net-4.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 log4net key file is available -->
-      <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+      <!-- 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="Key file not found." />
+          <fail message="Old key file not found." />
         </if>
         <if test="${not(property::exists('project.build.package') and project.build.package)}">
-          <echo message="Key file not found. You can generate a key file by running 'sn
-k log4net.snk'." />
-          <echo message="The generated key file should be stored in the log4net base directory."
/>
-          <echo message="The release build will be skipped." />
+          <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">
+        <nowarn>
+          <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
+          <warning number="1058" />
+        </nowarn>
+        <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">
         <nowarn>
           <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
@@ -875,26 +984,47 @@ limitations under the License.
           <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
         </references>
       </csc>
-    </if>
   </target>
   <target name="compile-net-4.0-cp" description="Builds .NET Framework 4.0 Client Profile
version" depends="set-net-4.0-cp-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 log4net key file is available -->
-      <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+      <!-- 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="Key file not found." />
+          <fail message="Old key file not found." />
         </if>
         <if test="${not(property::exists('project.build.package') and project.build.package)}">
-          <echo message="Key file not found. You can generate a key file by running 'sn
-k log4net.snk'." />
-          <echo message="The generated key file should be stored in the log4net base directory."
/>
-          <echo message="The release build will be skipped." />
+          <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">
+        <nowarn>
+          <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
+          <warning number="1058" />
+        </nowarn>
+        <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.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">
         <nowarn>
           <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
@@ -939,26 +1069,48 @@ limitations under the License.
           <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
         </references>
       </csc>
-    </if>
   </target>
     <target name="compile-mono-1.0" description="Builds Mono 1.0 version" depends="set-mono-1.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 log4net key file is available -->
-            <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+            <!-- 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="Key file not found." />
+                    <fail message="Old key file not found." />
                 </if>
                 <if test="${not(property::exists('project.build.package') and project.build.package)}">
-                    <echo message="Key file not found. You can generate a key file by
running 'sn -k log4net.snk'." />
-                    <echo message="The generated key file should be stored in the log4net
base directory." />
-                    <echo message="The release build will be skipped." />
+                    <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="false" 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">
+                <nowarn>
+                    <!-- workaround for Mono bug #61902 -->
+                    <warning number="0618" />
+                    <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
+                    <warning number="1058" />
+                </nowarn>
+                <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="System.dll" />
+                    <include name="System.Data.dll" />
+                    <include name="System.Web.dll" />
+                    <include name="System.Xml.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="false" 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">
                 <nowarn>
                     <!-- workaround for Mono bug #61902 -->
@@ -1005,26 +1157,48 @@ limitations under the License.
                     <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
                 </references>
             </csc>
-        </if>
     </target>
     <target name="compile-mono-2.0" description="Builds Mono 2.0 version" depends="set-mono-2.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 log4net key file is available -->
-            <if test="${not file::exists(log4net.basedir + '/log4net.snk')}">
+            <!-- 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="Key file not found." />
+                    <fail message="Old key file not found." />
                 </if>
                 <if test="${not(property::exists('project.build.package') and project.build.package)}">
-                    <echo message="Key file not found. You can generate a key file by
running 'sn -k log4net.snk'." />
-                    <echo message="The generated key file should be stored in the log4net
base directory." />
-                    <echo message="The release build will be skipped." />
+                    <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="false" 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">
+                <nowarn>
+                    <!-- workaround for Mono bug #61902 -->
+                    <warning number="0618" />
+                    <!-- warning CS1058: A previous catch clause already catches all exceptions.
All non-exceptions thrown will be wrapped in a System.Runtime.CompilerServices.RuntimeWrappedException
-->
+                    <warning number="1058" />
+                </nowarn>
+                <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="System.dll" />
+                    <include name="System.Data.dll" />
+                    <include name="System.Web.dll" />
+                    <include name="System.Xml.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="false" 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">
                 <nowarn>
                     <!-- workaround for Mono bug #61902 -->
@@ -1071,7 +1245,6 @@ limitations under the License.
                     <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
/>
                 </references>
             </csc>
-        </if>
   </target>
   <target name="compile-sscli-1.0" description="Builds SSCLI 1.0 version" depends="set-sscli-1.0-runtime-configuration,
check-log4net-basedir, clean-current-bin-dir">
         <!-- initialize the temp.build.skip property to false -->

Modified: logging/log4net/trunk/log4net.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.include?rev=1167040&r1=1167039&r2=1167040&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.include (original)
+++ logging/log4net/trunk/log4net.include Fri Sep  9 08:35:26 2011
@@ -140,6 +140,7 @@ limitations under the License.
     <target name="clean-current-bin-dir" depends="check-current-bin-dir" description="Cleans
the current binaries directory">
         <echo message="Cleaning the ${current.bin.dir} binaries directory." />
         <delete dir="${current.bin.dir}" if="${directory::exists(current.bin.dir)}" />
+        <delete dir="${current.bin.dir}/../oldkey" if="${directory::exists(current.bin.dir)}"
/>
         <mkdir dir="${current.bin.dir}" />
     </target>
     <target name="clean-current-sdkdoc-dir" depends="check-current-sdkdoc-dir" description="cleaning
the current SDK documentation directory">



Mime
View raw message