svn: /pear/pear-core/trunk/ PEAR/ChannelFile.php make-gopear-phar.php make-installpear-nozlib-phar.php

dufuz Sun, 02 Aug 2009 20:01:19 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286692 Log: Add required packages for the phar generators as svn externals and update the README part of the make scripts Changed paths: _U pear/pear-core/trunk/ U pear/pear-core/trunk/PEAR/ChannelFile.php U pear/pear-core/trunk/make-gopear-phar.php U pear/pear-core/trunk/make-installpear-nozlib-phar.php Property changes on: pear/pear-core/trunk ___________________________________________________________________ Added: svn:externals + XML_Util http://svn.php.net/repository/pear/packages/XML_Util/trunk/ Structures_Graph http://svn.php.net/repository/pear/packages/Structures_Graph/trunk/ Console http://svn.php.net/repository/pear/packages/Console_Getopt/trunk/Console/ Archive http://svn.php.net/repository/pear/packages/Archive_Tar/trunk/Archive/ Modified: pear/pear-core/trunk/PEAR/ChannelFile.php =================================================================== --- pear/pear-core/trunk/PEAR/ChannelFile.php 2009-08-02 20:00:06 UTC (rev 286691) +++ pear/pear-core/trunk/PEAR/ChannelFile.php 2009-08-02 20:01:19 UTC (rev 286692) @@ -501,6 +501,7 @@ if (!isset($info['baseurl'][0])) { $info['baseurl'] = array($info['baseurl']); } + foreach ($info['baseurl'] as $url) { $ret .= "$indent <baseurl type=\"" . $url['attribs']['type'] . "\""; $ret .= ">" . $url['_content'] . "</baseurl>\n"; @@ -687,15 +688,17 @@ if (!isset($functions[0])) { $functions = array($functions); } + foreach ($functions as $function) { if (!isset($function['_content']) || empty($function['_content'])) { $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_FUNCTIONNAME, array('parent' => $parent, 'protocol' => $protocol)); } + if ($protocol == 'rest') { if (!isset($function['attribs']['type']) || empty($function['attribs']['type'])) { - $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_BASEURLTYPE, + $this->_validateError(PEAR_CHANNELFILE_ERROR_NOBASEURLTYPE, array('parent' => $parent, 'protocol' => $protocol)); } } else { Modified: pear/pear-core/trunk/make-gopear-phar.php =================================================================== --- pear/pear-core/trunk/make-gopear-phar.php 2009-08-02 20:00:06 UTC (rev 286691) +++ pear/pear-core/trunk/make-gopear-phar.php 2009-08-02 20:01:19 UTC (rev 286692) @@ -8,19 +8,9 @@ * named go-pear-tarballs, and run these commands in the directory * * <pre> - * $ pear download -Z PEAR - * $ pear download -Z Archive_Tar - * $ pear download -Z Console_Getopt - * $ pear download -Z Structures_Graph - * $ pear download -Z XML_Util + * $ pear download -Z PEAR Archive_Tar Console_Getopt Structures_Graph XML_Util * </pre> * - * Next, check out pear/Structure_Graph and copy it into pear-core/ - * - * Next, check out pear/Console_Getopt and copy it into pear-core/ - * - * Next, check out pear/XML_Util and copy it into pear-core/ - * * finally, run this script using PHP 5.1's cli php * Modified: pear/pear-core/trunk/make-installpear-nozlib-phar.php =================================================================== --- pear/pear-core/trunk/make-installpear-nozlib-phar.php 2009-08-02 20:00:06 UTC (rev 286691) +++ pear/pear-core/trunk/make-installpear-nozlib-phar.php 2009-08-02 20:01:19 UTC (rev 286692) @@ -8,20 +8,9 @@ * named go-pear-tarballs, and run these commands in the directory * * <pre> - * $ pear download -Z PEAR - * $ pear download -Z Archive_Tar - * $ pear download -Z Console_Getopt - * $ pear download -Z Structures_Graph - * $ pear download -Z XML_Util + * $ pear download -Z PEAR Archive_Tar Console_Getopt Structures_Graph XML_Util * </pre> * - * Next, check out pear/Structure_Graph and copy it into pear-core/ - * - * Next, check out pear/Console_Getopt and copy it into pear-core/ - * - * Next, check out pear/XML_Util and copy it into pear-core/ - * - * * finally, run this script using PHP 5.1's cli php *