logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ihabu...@apache.org
Subject svn commit: r1186538 - /logging/log4php/trunk/build.xml
Date Wed, 19 Oct 2011 22:18:47 GMT
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>



Mime
View raw message