svn commit: r1131008 - in /logging/log4php/trunk: package-config.php package.php

[ih...@apache.org]

Author: ihabunek
Date: Fri Jun  3 12:15:51 2011
New Revision: 1131008

URL: http://svn.apache.org/viewvc?rev=1131008&view=rev
Log:
Updates to the pear package build:
* Updated "Installation tips" for PackageFileManager2
* Simplified parsing of version from pom.xml (no longer looks for "incubation")
* Fixed description to remove references to log4j.
* Added myself to contributors list.

Modified:
    logging/log4php/trunk/package-config.php
    logging/log4php/trunk/package.php

Modified: logging/log4php/trunk/package-config.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/package-config.php?rev=1131008&r1=1131007&r2=1131008&view=diff
==============================================================================
--- logging/log4php/trunk/package-config.php (original)
+++ logging/log4php/trunk/package-config.php Fri Jun  3 12:15:51 2011
@@ -17,20 +17,18 @@
  */
 
 // parse pom.xml to get version in sync
-preg_match("/<version>(.+?)(-(incubating))?(-SNAPSHOT)?<\/version>/", file_get_contents("../../pom.xml"), $pom_version);
+$xml = simplexml_load_file('../../pom.xml');
+$pom_version = (string) $xml->version;
+
+preg_match("/^([^-]+)(-SNAPSHOT)?$/", $pom_version, $matches);
+$version = $matches[1];
+$stability = empty($matches[2]) ? 'stable' : 'devel';
 
 $name = 'Apache_log4php';
-$summary = 'log4php is a PHP port of log4j framework';
-$version = $pom_version[1].(empty($pom_version[3]) ? '' : $pom_version[3]);
-$versionBuild = 'b1';
-$apiVersion = '2.0.0';
-$state = empty($pom_version[4]) ? 'stable' : 'snapshot';
-$apiStability = 'stable';
+$summary = 'Apache log4php is a logging framework for PHP.';
 
 $description = <<<EOT
-log4php is a PHP port of log4j framework. It supports XML configuration, 
-logging to files, stdout/err, syslog, socket, configurable output layouts 
-and logging levels.
+Apache log4php is a logging framework for PHP at the Apache Software Foundation (ASF).
 EOT;
 
 $notes = 'Please see CHANGELOG and changes.xml!';
@@ -81,6 +79,13 @@ $maintainer[]   =   array(
     'email' => 'chammers@apache.org',
     'active' => 'yes'
 );
+$maintainer[]   =   array(
+    'role' => 'developer',
+    'handle' => 'ihabunek',
+    'name' => 'Ivan Habunek',
+    'email' => 'ihabunek@apache.org',
+    'active' => 'yes'
+);
 
 $dependency = array();
 

Modified: logging/log4php/trunk/package.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/package.php?rev=1131008&r1=1131007&r2=1131008&view=diff
==============================================================================
--- logging/log4php/trunk/package.php (original)
+++ logging/log4php/trunk/package.php Fri Jun  3 12:15:51 2011
@@ -21,9 +21,10 @@ date_default_timezone_set('Europe/Berlin
 if(!class_exists('PEAR_PackageFileManager2')) {
 	echo "\nYou need to install PEAR_PackageFileManager2 in order to run this script\n\n";
 	echo "Installation tips:\n\n";
-	echo "  $ sudo pear upgrade PEAR\n";
-	echo "  $ sudo pear install XML_Serializer-0.19.2\n";
-	echo "  $ sudo pear install --alldeps PEAR_PackageFileManager2\n\n";
+	echo "  $ pear upgrade PEAR\n";
+	echo "  $ pear install XML_Serializer-0.20.2\n";
+	echo "  $ pear install Console_ProgressBar-0.5.2beta\n";
+	echo "  $ pear install --alldeps PEAR_PackageFileManager2\n\n";
 	exit(0);
 }
 
@@ -41,10 +42,10 @@ $package->setSummary($summary);
 $package->setDescription($description);
 
 $package->setChannel($channel);
-$package->setAPIVersion($apiVersion);
+$package->setAPIVersion($version);
 $package->setReleaseVersion($version);
-$package->setReleaseStability($state);
-$package->setAPIStability($apiStability);
+$package->setReleaseStability($stability);
+$package->setAPIStability($stability);
 $package->setNotes($notes);
 $package->setPackageType('php'); // this is a PEAR-style php script package
 $package->setLicense($license['name'], $license['url']);