Polishing packaging related files.

Author: boenrobot

extrasetup.php

@@ -1,28 +1,28 @@
 <?php
 $extrafiles = array();
-
-$phpDir = Pyrus\Config::current()->php_dir . DIRECTORY_SEPARATOR;
+$phpDir = Pyrus\Config::current()->php_dir;
 $packages = array('PEAR2/Autoload', 'PEAR2/Cache/SHM', 'PEAR2/Net/Transmitter');
 
+$oldCwd = getcwd();
+chdir($phpDir);
 foreach ($packages as $pkg) {
-    $prefix = $phpDir . $pkg;
-    
-    if (is_dir($prefix)) {
+    if (is_dir($pkg)) {
         foreach (
             new RecursiveIteratorIterator(
                 new RecursiveDirectoryIterator(
-                    $prefix,
+                    $pkg,
                     RecursiveDirectoryIterator::UNIX_PATHS
                 ),
                 RecursiveIteratorIterator::LEAVES_ONLY
             ) as $path
         ) {
-            $pathname = $path->getPathname();
-            $extrafiles['src/' . $pathname] = $pathname;
+            $extrafiles['src/' . $path->getPathname()] = $path->getRealPath();
         }
     }
 
-    if (is_file($prefix . '.php')) {
-        $extrafiles['src/' . $pkg . '.php'] = $prefix . '.php';
+    if (is_file($pkg . '.php')) {
+        $extrafiles['src/' . $pkg . '.php']
+            = $phpDir . DIRECTORY_SEPARATOR . $pkg . '.php';
     }
-}
+}
+chdir($oldCwd);

package.xml

@@ -11,8 +11,8 @@
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2012-07-11</date>
- <time>00:44:34</time>
+ <date>2012-08-03</date>
+ <time>02:50:03</time>
  <version>
   <release>1.0.0b3</release>
   <api>1.0.0</api>
@@ -24,7 +24,7 @@
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL License 2.1</license>
  <notes>Bug fixes on edge cases, and some API changes
 
-* Persistent connections are now properly supported. Added a new Registry class to facilitate this.
+* (GH #6) Persistent connections are now properly supported. Added a new Registry class to facilitate this.
 * The second and third argument of Request::__construct() have been swapped.
 * At Request::__construct(), a backslash can now be escaped in an argument value, and arguments can be spread across multiple lines.
 * Client::getStreamResponses() and Client::setStreamResponses() are now Client::isStreamingResponses() and Client::setStreamingResponses(), respectively.
@@ -177,14 +177,14 @@
   </required>
   <optional>
    <package>
-    <name>PEAR2_Cache_SHM</name>
+    <name>PEAR2_Autoload</name>
     <channel>pear2.php.net</channel>
-    <min>1.0.0a1</min>
+    <min>0.2.4</min>
    </package>
    <package>
-    <name>PEAR2_Autoload</name>
+    <name>PEAR2_Cache_SHM</name>
     <channel>pear2.php.net</channel>
-    <min>0.2.4</min>
+    <min>0.1.0</min>
    </package>
    <extension>
     <name>iconv</name>

stub.php

@@ -11,7 +11,7 @@
     if ($isNotCli) {
         header('Content-Type: text/plain;charset=UTF-8');
     }
-    echo "PEAR2_Net_RouterOS @PACKAGE_VERSION@\n";
+    echo "@PACKAGE_NAME@ @PACKAGE_VERSION@\n";
 
     if (version_compare(phpversion(), '5.3.0', '<')) {
         echo "\nThis package requires PHP 5.3.0 or later.";