You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4php-dev@logging.apache.org by gr...@apache.org on 2009/10/23 08:58:47 UTC
svn commit: r828945 - in /incubator/log4php/trunk: pom.xml
src/assembly/pear-assembly.xml
Author: grobmeier
Date: Fri Oct 23 06:58:46 2009
New Revision: 828945
URL: http://svn.apache.org/viewvc?rev=828945&view=rev
Log:
added pear assembly file
change phpunits deprecated log-xml to log-junit
Added:
incubator/log4php/trunk/src/assembly/pear-assembly.xml
Modified:
incubator/log4php/trunk/pom.xml
Modified: incubator/log4php/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/pom.xml?rev=828945&r1=828944&r2=828945&view=diff
==============================================================================
--- incubator/log4php/trunk/pom.xml (original)
+++ incubator/log4php/trunk/pom.xml Fri Oct 23 06:58:46 2009
@@ -159,51 +159,7 @@
</tasks>
</configuration>
</execution>
- <execution>
- <id>pear-package</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete dir="target/pear"/>
- <mkdir dir="target/pear/log4php"/>
- <copy file="package.php" todir="target/pear"/>
- <copy file="package-config.php" todir="target/pear"/>
- <copy file="src/changes/changes.xml" todir="target/pear"/>
- <copy file="CHANGELOG" todir="target/pear"/>
- <copy file="LICENSE" todir="target/pear"/>
- <copy file="README" todir="target/pear"/>
- <copy todir="target/pear">
- <fileset dir="src">
- <include name="examples/**/*"/>
- </fileset>
- </copy>
- <copy todir="target/pear/log4php">
- <fileset dir="src/main/php">
- <include name="**/*.php"/>
- </fileset>
- </copy>
- <!-- when using strict standards package.php is getting noisy -->
- <exec executable="php" dir="target/pear" output="target/package.php.stdout">
- <arg line="package.php"/>
- </exec>
- <exec executable="pear" dir="target/pear">
- <arg line="package"/>
- </exec>
- <!-- Create zip archive with identical contents as the .tgz -->
- <!-- The version number of the pear package does never contain -SNAPSHOT. -->
- <untar dest="target/zip">
- <gzipresource>
- <file file="target/pear/log4php-${pear.version}.tgz"/>
- </gzipresource>
- </untar>
- <zip destfile="target/pear/log4php-${pear.version}.zip" basedir="target/zip/" />
- </tasks>
- </configuration>
- </execution>
- <!--+
+ <!--+
| PHPDoc must be installed for this execution
+-->
<execution>
@@ -240,7 +196,7 @@
<mkdir dir="${surefire.reports}" />
<exec executable="phpunit" dir="src/test/php">
<arg
- line=" --log-xml ../../../${surefire.reports}/phpunit-testresults.xml ." />
+ line=" --log-junit ../../../${surefire.reports}/phpunit-testresults.xml ." />
</exec>
<xslt in="${surefire.reports}/phpunit-testresults.xml" out="${surefire.reports}/xslt.info"
@@ -278,6 +234,7 @@
<configuration>
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/pear-assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
Added: incubator/log4php/trunk/src/assembly/pear-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/assembly/pear-assembly.xml?rev=828945&view=auto
==============================================================================
--- incubator/log4php/trunk/src/assembly/pear-assembly.xml (added)
+++ incubator/log4php/trunk/src/assembly/pear-assembly.xml Fri Oct 23 06:58:46 2009
@@ -0,0 +1,50 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
+
+-->
+<assembly>
+ <id>pear-package</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <baseDirectory>apache-log4php-${project.version}-pear-incubating</baseDirectory>
+ <includeSiteDirectory>true</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>package.php</include>
+ <include>package-config.php</include>
+ <include>src/changes/changes.xml</include>
+ <include>CHANGELOG</include>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>src/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
+
+ <!-- when using strict standards package.php is getting noisy -->
+<!--
+ <exec executable="php" dir="target/pear" output="target/package.php.stdout">
+ <arg line="package.php"/>
+ </exec>
+ <exec executable="pear" dir="target/pear">
+ <arg line="package"/>
+ </exec>
+-->
\ No newline at end of file
Re: svn commit: r828945 - in /incubator/log4php/trunk: pom.xml
src/assembly/pear-assembly.xml
Posted by Christian Grobmeier <gr...@gmail.com>.
>> --log-xml ../../../${surefire.reports}/phpunit-testresults.xml ." />
>> + line="
>> --log-junit ../../../${surefire.reports}/phpunit-testresults.xml ." />
>
> I hope the phpunit on ci.apache.org is recent enough, I got an error:
> [exec] unrecognized option --log-junit
with 3.4 log-xml is deprecated - but it seems to work on the buildbot
Cheers,
Christian
Re: svn commit: r828945 - in /incubator/log4php/trunk: pom.xml
src/assembly/pear-assembly.xml
Posted by Christian Hammers <ch...@lathspell.de>.
Am Fri, 23 Oct 2009 06:58:47 -0000
schrieb grobmeier@apache.org:
> URL: http://svn.apache.org/viewvc?rev=828945&view=rev
> Log:
> added pear assembly file
> change phpunits deprecated log-xml to log-junit
>
> @@ -240,7 +196,7 @@
> <mkdir dir="${surefire.reports}" />
> <exec executable="phpunit"
> dir="src/test/php"> <arg
> - line="
> --log-xml ../../../${surefire.reports}/phpunit-testresults.xml ." />
> + line="
> --log-junit ../../../${surefire.reports}/phpunit-testresults.xml ." />
I hope the phpunit on ci.apache.org is recent enough, I got an error:
[exec] PHPUnit 3.3.17 by Sebastian Bergmann.
[exec]
[exec] unrecognized option --log-junit
But with phpunit 3.4 it seems to work.
bye,
-christian-