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 09:12:14 UTC
svn commit: r828947 - in /incubator/log4php/trunk: pom.xml
src/assembly/pear-assembly.xml
Author: grobmeier
Date: Fri Oct 23 07:12:13 2009
New Revision: 828947
URL: http://svn.apache.org/viewvc?rev=828947&view=rev
Log:
reorderings, put executions in pom again (commented out)
Modified:
incubator/log4php/trunk/pom.xml
incubator/log4php/trunk/src/assembly/pear-assembly.xml
Modified: incubator/log4php/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/pom.xml?rev=828947&r1=828946&r2=828947&view=diff
==============================================================================
--- incubator/log4php/trunk/pom.xml (original)
+++ incubator/log4php/trunk/pom.xml Fri Oct 23 07:12:13 2009
@@ -159,6 +159,27 @@
</tasks>
</configuration>
</execution>
+ <!--
+ <execution>
+ <id>pear-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="target/pear"/>
+ <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>
+ </tasks>
+ </configuration>
+ </execution>
+ -->
+
<!--+
| PHPDoc must be installed for this execution
+-->
@@ -240,6 +261,8 @@
</configuration>
<executions>
<execution>
+ <id>make-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- append to the packaging phase. -->
<goals>
<goal>assembly</goal>
</goals>
Modified: incubator/log4php/trunk/src/assembly/pear-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/assembly/pear-assembly.xml?rev=828947&r1=828946&r2=828947&view=diff
==============================================================================
--- incubator/log4php/trunk/src/assembly/pear-assembly.xml (original)
+++ incubator/log4php/trunk/src/assembly/pear-assembly.xml Fri Oct 23 07:12:13 2009
@@ -26,25 +26,15 @@
<fileSets>
<fileSet>
<includes>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>CHANGELOG</include>
<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