logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1538346 - in /logging/log4net/trunk: LICENSE NOTICE tests/lib/nunit.framework.dll tests/lib/prerequisites.txt tests/nant.build
Date Sun, 03 Nov 2013 12:11:08 GMT
Author: bodewig
Date: Sun Nov  3 12:11:07 2013
New Revision: 1538346

URL: http://svn.apache.org/r1538346
Log:
NUnit's license should be compatible, so stop copying around stuff and just check it in

Added:
    logging/log4net/trunk/tests/lib/nunit.framework.dll   (with props)
Modified:
    logging/log4net/trunk/LICENSE
    logging/log4net/trunk/NOTICE
    logging/log4net/trunk/tests/lib/prerequisites.txt
    logging/log4net/trunk/tests/nant.build

Modified: logging/log4net/trunk/LICENSE
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/LICENSE?rev=1538346&r1=1538345&r2=1538346&view=diff
==============================================================================
--- logging/log4net/trunk/LICENSE (original)
+++ logging/log4net/trunk/LICENSE Sun Nov  3 12:11:07 2013
@@ -199,3 +199,33 @@
    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.
+
+NUnit License
+
+Copyright © 2002-2013 Charlie Poole
+Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
+Copyright © 2000-2002 Philip A. Craig
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1.  The origin of this software must not be misrepresented; you must
+    not claim that you wrote the original software. If you use this
+    software in a product, an acknowledgment (see the following) in
+    the product documentation is required.
+
+2.  Portions Copyright © 2002-2009 Charlie Poole or
+    Copyright © 2002-2004 James W. Newkirk, Michael C. Two,
+    Alexei A. Vorontsov or
+    Copyright © 2000-2002 Philip A. Craig
+
+    Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+3.  This notice may not be removed or altered from any source
+    distribution. 

Modified: logging/log4net/trunk/NOTICE
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/NOTICE?rev=1538346&r1=1538345&r2=1538346&view=diff
==============================================================================
--- logging/log4net/trunk/NOTICE (original)
+++ logging/log4net/trunk/NOTICE Sun Nov  3 12:11:07 2013
@@ -3,3 +3,7 @@
 
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).
+
+The source distribution of log4net contains nunit.framework.dll from
+NUnit <http://nunit.org/> which is distributed under the NUnit license
+<http://nunit.org/index.php?p=license&r=2.6.3>

Added: logging/log4net/trunk/tests/lib/nunit.framework.dll
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/lib/nunit.framework.dll?rev=1538346&view=auto
==============================================================================
Binary file - no diff available.

Propchange: logging/log4net/trunk/tests/lib/nunit.framework.dll
------------------------------------------------------------------------------
    svn:executable = *

Propchange: logging/log4net/trunk/tests/lib/nunit.framework.dll
------------------------------------------------------------------------------
    svn:mime-type = application/x-dosexec

Modified: logging/log4net/trunk/tests/lib/prerequisites.txt
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/lib/prerequisites.txt?rev=1538346&r1=1538345&r2=1538346&view=diff
==============================================================================
--- logging/log4net/trunk/tests/lib/prerequisites.txt (original)
+++ logging/log4net/trunk/tests/lib/prerequisites.txt Sun Nov  3 12:11:07 2013
@@ -1,37 +1,21 @@
 Prerequisites for log4net tests
 ===============================
 
-
-The nunit.framework.dll assembly version 2.2.7 is required to build 
-the log4net tests.
-
-NAnt 0.85 includes the 2.2.7 version of the nunit.framework.dll.
-
-The nunit.framework.dll is available as different builds for each 
-version of the .net runtime. To build multiple versions of the
-log4net tests you will need several different copies of the
-nunit.framework.dll.
-
-The log4net tests are currently built for the following runtimes:
-
-Microsoft .NET Framework 1.0
-Microsoft .NET Framework 1.1
-Microsoft .NET Framework 2.0
-Mono Framework 2.0
-
-Under the tests/lib directory you must create the following directory
-structure containing the nunit.framework.dll assembly built for the
-appropriate version of the runtime:
+log4net uses NUnit 2.x for its testsuite, the included version is
+NUnit 2.6.3.  You can replace it with a more recent version of you
+need to.
+
+In addition it is possible to include more libraries when compiling or
+running the tests by putting them into a structure that mirrors your
+target framework beneath this folder, e.g.
 
 lib\
   net\
-    1.0\
-      nunit.framework.dll
-    1.1\
-      nunit.framework.dll
     2.0\
       nunit.framework.dll
   mono\
     2.0\
       nunit.framework.dll
     
+This should not be necessary to run the tests that are part of
+log4net, though.

Modified: logging/log4net/trunk/tests/nant.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/nant.build?rev=1538346&r1=1538345&r2=1538346&view=diff
==============================================================================
--- logging/log4net/trunk/tests/nant.build (original)
+++ logging/log4net/trunk/tests/nant.build Sun Nov  3 12:11:07 2013
@@ -90,7 +90,7 @@ limitations under the License.
         </copy>
         <!-- copy referenced libraries to build output -->
         <copy todir="${current.bin.dir}">
-            <fileset basedir="${log4net.basedir}/tests/lib">
+            <fileset basedir="lib">
                 <include name="/*.dll" />
             </fileset>
         </copy>
@@ -115,7 +115,7 @@ limitations under the License.
             </fileset>
         </copy>
         <csc nostdlib="true" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}"
define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.Tests.dll">
-            <sources basedir="${log4net.basedir}/tests/src">
+            <sources basedir="src">
                 <include name="**/*.cs" />
                 <include name="../../src/AssemblyVersionInfo.cs" />
             </sources>
@@ -128,6 +128,7 @@ limitations under the License.
                 <include name="System.Runtime.Remoting.dll" />
                 <include name="${current.bin.dir}/log4net.dll" frompath="false" />
                 <!-- allow for third party assemblies to be referenced by just storing
them in the lib/<framework>/<framework version>/<build configuration> directory
-->
+                <include name="lib/*.dll" frompath="false" />
                 <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
frompath="false" />
                 <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
frompath="false" />
                 <include name="${log4net.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
frompath="false" />
@@ -145,7 +146,7 @@ limitations under the License.
         </copy>
         <!-- copy referenced libraries to build output -->
         <copy todir="${current.bin.dir}">
-            <fileset basedir="${log4net.basedir}/tests/lib">
+            <fileset basedir="lib">
                 <include name="/*.dll" />
             </fileset>
         </copy>
@@ -170,7 +171,7 @@ limitations under the License.
             </fileset>
         </copy>
         <csc noconfig="true" warnaserror="false" target="library" debug="${current.build.debug}"
define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.Tests.dll">
-            <sources basedir="${log4net.basedir}/tests/src">
+            <sources basedir="src">
                 <include name="**/*.cs" />
                 <include name="../../src/AssemblyVersionInfo.cs" />
             </sources>
@@ -183,6 +184,7 @@ limitations under the License.
                 <include name="System.Runtime.Remoting.dll" />
                 <include name="${current.bin.dir}/log4net.dll" frompath="false" />
                 <!-- allow for third party assemblies to be referenced by just storing
them in the lib/<framework>/<framework version>/<build configuration> directory
-->
+                <include name="lib/*.dll" frompath="false" />
                 <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
frompath="false" />
                 <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
frompath="false" />
                 <include name="${log4net.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
frompath="false" />
@@ -200,7 +202,7 @@ limitations under the License.
         </copy>
         <!-- copy referenced libraries to build output -->
         <copy todir="${current.bin.dir}">
-            <fileset basedir="${log4net.basedir}/tests/lib">
+            <fileset basedir="lib">
                 <include name="/*.dll" />
             </fileset>
         </copy>
@@ -225,7 +227,7 @@ limitations under the License.
             </fileset>
         </copy>
         <csc nostdlib="true" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}"
define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.Tests.dll">
-            <sources basedir="${log4net.basedir}/tests/src">
+            <sources basedir="src">
                 <include name="**/*.cs" />
                 <include name="../../src/AssemblyVersionInfo.cs" />
             </sources>
@@ -238,6 +240,7 @@ limitations under the License.
                 <include name="System.Runtime.Remoting.dll" />
                 <include name="${current.bin.dir}/log4net.dll" frompath="false" />
                 <!-- allow for third party assemblies to be referenced by just storing
them in the lib/<framework>/<framework version>/<build configuration> directory
-->
+                <include name="lib/*.dll" frompath="false" />
                 <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
frompath="false" />
                 <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
frompath="false" />
                 <include name="${log4net.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
frompath="false" />
@@ -255,7 +258,7 @@ limitations under the License.
         </copy>
         <!-- copy referenced libraries to build output -->
         <copy todir="${current.bin.dir}">
-            <fileset basedir="${log4net.basedir}/tests/lib">
+            <fileset basedir="lib">
                 <include name="/*.dll" />
             </fileset>
         </copy>
@@ -280,7 +283,7 @@ limitations under the License.
             </fileset>
         </copy>
         <csc nostdlib="true" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}"
define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.Tests.dll">
-            <sources basedir="${log4net.basedir}/tests/src">
+            <sources basedir="src">
                 <include name="**/*.cs" />
                 <include name="../../src/AssemblyVersionInfo.cs" />
             </sources>
@@ -309,7 +312,7 @@ limitations under the License.
         </copy>
         <!-- copy referenced libraries to build output -->
         <copy todir="${current.bin.dir}">
-            <fileset basedir="${log4net.basedir}/tests/lib">
+            <fileset basedir="lib">
                 <include name="/*.dll" />
             </fileset>
         </copy>
@@ -334,7 +337,7 @@ limitations under the License.
             </fileset>
         </copy>
         <csc nostdlib="true" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}"
define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.Tests.dll">
-            <sources basedir="${log4net.basedir}/tests/src">
+            <sources basedir="src">
                 <include name="**/*.cs" />
                 <include name="../../src/AssemblyVersionInfo.cs" />
             </sources>
@@ -348,6 +351,7 @@ limitations under the License.
                 <include name="System.Runtime.Remoting.dll" />
                 <include name="${current.bin.dir}/log4net.dll" frompath="false" />
                 <!-- allow for third party assemblies to be referenced by just storing
them in the lib/<framework>/<framework version>/<build configuration> directory
-->
+                <include name="lib/*.dll" frompath="false" />
                 <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
frompath="false" />
                 <include name="lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/*.dll"
frompath="false" />
                 <include name="${log4net.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}/*.dll"
frompath="false" />
@@ -365,7 +369,7 @@ limitations under the License.
         </copy>
         <!-- copy referenced libraries to build output -->
         <copy todir="${current.bin.dir}">
-            <fileset basedir="${log4net.basedir}/tests/lib">
+            <fileset basedir="lib">
                 <include name="/*.dll" />
             </fileset>
         </copy>
@@ -390,7 +394,7 @@ limitations under the License.
             </fileset>
         </copy>
         <csc nostdlib="true" noconfig="true" warnaserror="true" target="library" debug="${current.build.debug}"
define="${current.build.defines.csc}" output="${current.bin.dir}/log4net.Tests.dll">
-            <sources basedir="${log4net.basedir}/tests/src">
+            <sources basedir="src">
                 <include name="**/*.cs" />
                 <include name="../../src/AssemblyVersionInfo.cs" />
             </sources>



Mime
View raw message