Return-Path: 
 <commits-return-273-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 2F3CB91C2
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Wed, 19 Oct 2011 22:19:11 +0000 (UTC)
Received: (qmail 77787 invoked by uid 500); 19 Oct 2011 22:19:11 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 77763 invoked by uid 500); 19 Oct 2011 22:19:11 -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 77756 invoked by uid 99); 19 Oct 2011 22:19:11 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 22:19:11 +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; Wed, 19 Oct 2011 22:19:08 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B918123889EA;
	Wed, 19 Oct 2011 22:18:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1186538 - /logging/log4php/trunk/build.xml
Date: Wed, 19 Oct 2011 22:18:47 -0000
To: commits@logging.apache.org
From: ihabunek@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111019221847.B918123889EA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ihabunek
Date: Wed Oct 19 22:18:47 2011
New Revision: 1186538

URL: http://svn.apache.org/viewvc?rev=1186538&view=rev
Log:
Added conditionals so that the build process works on windows as well as unixoids.

Modified:
    logging/log4php/trunk/build.xml

Modified: logging/log4php/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/build.xml?rev=1186538&r1=1186537&r2=1186538&view=diff
==============================================================================
--- logging/log4php/trunk/build.xml (original)
+++ logging/log4php/trunk/build.xml Wed Oct 19 22:18:47 2011
@@ -112,6 +112,17 @@
 		</apply>
 	</target>
 	
+	<!-- Determine the platform-specific executables -->
+	<condition property="phpunit.exec" value="phpunit.bat" else="phpunit">
+		<os family="windows" />
+	</condition>
+	<condition property="phpdoc.exec" value="phpdoc.bat" else="phpdoc">
+		<os family="windows" />
+	</condition>
+	<condition property="pear.exec" value="pear.bat" else="pear">
+		<os family="windows" />
+	</condition>
+
 	<!-- Builds a pear package -->
 	<target name="pear-package">
 		<delete dir="target/pear" />
@@ -138,7 +149,7 @@
 			<arg line="-d error_reporting=6143" /> <!-- E_ALL & ~E_STRICT -->
 			<arg line="../../package.php" />
 		</exec>
-		<exec executable="pear" dir="target/pear">
+		<exec executable="${pear.exec}" dir="target/pear">
 			<arg line="package" />
 		</exec>
 		<move tofile="target/Apache_log4php-${project.version}.tgz">
@@ -151,7 +162,7 @@
 	<!-- Generates API documentation (requires phpdoc). -->
 	<target name="api-docs">
 		<mkdir dir="target/site/apidocs" />
-		<exec executable="phpdoc" failonerror="true">
+		<exec executable="${phpdoc.exec}" failonerror="true">
 			<arg value="-d" />
 			<arg value="src/main/php" />
 			<arg value="-t" />
@@ -160,6 +171,7 @@
 			<arg value="HTML:frames:DOM/default" />
 			<arg value="-ti" />
 			<arg value="Apache log4php ${project.version} - GENERATED FILES - License: ASL 2.0" />
+			<arg value="--parseprivate" />
 		</exec>
 	</target>
 	
@@ -167,7 +179,7 @@
 	<target name="unit-testing">
 		<mkdir dir="${surefire.report}" />
 		<mkdir dir="${coverage.report}" />
-		<exec executable="phpunit" dir="src/test/php">
+		<exec executable="${phpunit.exec}" dir="src/test/php">
 			<arg line=" --log-junit ../../../${surefire.report}/phpunit-testresults.xml" />
 			<arg line=" --coverage-html ../../../${coverage.report}" />
 		</exec>