Return-Path: 
 <commits-return-138-apmail-logging-commits-archive=logging.apache.org@logging.apache.org>
X-Original-To: apmail-logging-commits-archive@minotaur.apache.org
Delivered-To: apmail-logging-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A1FAC7C72
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Fri, 30 Sep 2011 04:25:21 +0000 (UTC)
Received: (qmail 79555 invoked by uid 500); 30 Sep 2011 04:25:20 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 79357 invoked by uid 500); 30 Sep 2011 04:25:12 -0000
Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@logging.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@logging.apache.org>
List-Post: <mailto:commits@logging.apache.org>
List-Id: <commits.logging.apache.org>
Reply-To: dev@logging.apache.org
Delivered-To: mailing list commits@logging.apache.org
Received: (qmail 79262 invoked by uid 99); 30 Sep 2011 04:25:09 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Sep 2011 04:25:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Sep 2011 04:25:07 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id AF38B23888EA;
	Fri, 30 Sep 2011 04:24:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1177504 - /logging/log4net/trunk/log4net.build
Date: Fri, 30 Sep 2011 04:24:47 -0000
To: commits@logging.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20110930042447.AF38B23888EA@eris.apache.org>

Author: bodewig
Date: Fri Sep 30 04:24:47 2011
New Revision: 1177504

URL: http://svn.apache.org/viewvc?rev=1177504&view=rev
Log:
fix test expressions for 3.5 and 4.0 frameworks

Modified:
    logging/log4net/trunk/log4net.build

Modified: logging/log4net/trunk/log4net.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1177504&r1=1177503&r2=1177504&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Fri Sep 30 04:24:47 2011
@@ -257,7 +257,7 @@ limitations under the License.
       <call target="compile-net-3.5-cp" />
     </if>
     <if test="${not framework::exists('net-3.5')}">
-      <if test="${property::exists('project.build.package') and project.build.package and not(directory::exists(path::combine(bin.dir, 'net/3.5/debug')) and directory::exists(path::combine(bin.dir, 'net/3.5/release')) and directory::exists(path::combine(bin.dir, 'net/3.5/oldkey')) and path::combine(bin.dir, 'net-cp/3.5/debug')) and directory::exists(path::combine(bin.dir, 'net-cp/3.5/release')) and directory::exists(path::combine(bin.dir, 'net-cp/3.5/oldkey')))}">
+      <if test="${property::exists('project.build.package') and project.build.package and not(directory::exists(path::combine(bin.dir, 'net/3.5/debug')) and directory::exists(path::combine(bin.dir, 'net/3.5/release')) and directory::exists(path::combine(bin.dir, 'net/3.5/oldkey')) and directory::exists(path::combine(bin.dir, 'net-cp/3.5/debug')) and directory::exists(path::combine(bin.dir, 'net-cp/3.5/release')) and directory::exists(path::combine(bin.dir, 'net-cp/3.5/oldkey')))}">
         <fail message="The .NET Framework 3.5 is not available." />
       </if>
       <if test="${not(property::exists('project.build.package') and project.build.package)}">
@@ -270,7 +270,7 @@ limitations under the License.
       <call target="compile-net-4.0-cp" />
     </if>
     <if test="${not framework::exists('net-4.0')}">
-      <if test="${property::exists('project.build.package') and project.build.package and not(directory::exists(path::combine(bin.dir, 'net/4.0/debug')) and directory::exists(path::combine(bin.dir, 'net/4.0/release')) and directory::exists(path::combine(bin.dir, 'net/4.0/oldkey')) and path::combine(bin.dir, 'net-cp/4.0/debug')) and directory::exists(path::combine(bin.dir, 'net-cp/4.0/release')) and directory::exists(path::combine(bin.dir, 'net-cp/4.0/oldkey')))}">
+      <if test="${property::exists('project.build.package') and project.build.package and not(directory::exists(path::combine(bin.dir, 'net/4.0/debug')) and directory::exists(path::combine(bin.dir, 'net/4.0/release')) and directory::exists(path::combine(bin.dir, 'net/4.0/oldkey')) and directory::exists(path::combine(bin.dir, 'net-cp/4.0/debug')) and directory::exists(path::combine(bin.dir, 'net-cp/4.0/release')) and directory::exists(path::combine(bin.dir, 'net-cp/4.0/oldkey')))}">
         <fail message="The .NET Framework 4.0 is not available." />
       </if>
       <if test="${not(property::exists('project.build.package') and project.build.package)}">