cvs: php-src(PHP_5_1) / NEWS configure.in /pear go-pear-list.php package-PEAR.xml /pear/PEAR Remote.php /pear/packages XML_RPC-1.3.1.tar
/pear/tests PEAR_test_mock_pearweb.php.inc download_test_classes.php.inc package-PEARtests.xml

rasmus Thu Aug 11 12:43:26 2005 EDT Removed files: (Branch: PHP_5_1) /php-src/pear/packages XML_RPC-1.3.1.tar Modified files: /php-src NEWS configure.in /php-src/pear go-pear-list.php package-PEAR.xml /php-src/pear/PEAR Remote.php /php-src/pear/tests PEAR_test_mock_pearweb.php.inc download_test_classes.php.inc package-PEARtests.xml Log: Remove pear/XML_RPC dependency for the pear installer PEAR guys, please doublecheck this. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.10&r2=1.2027.2.11&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.10 php-src/NEWS:1.2027.2.11 --- php-src/NEWS:1.2027.2.10 Wed Aug 10 18:45:30 2005 +++ php-src/NEWS Thu Aug 11 12:43:23 2005 @@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Aug 2005, PHP 5.1 Release Candidate 1 +- Unbundled XML_RPC pear class and force ext/xmlrpc dependency on pear (Rasmus) - Updated bundled libraries in Windows distribution. (Edin) . zlib 1.2.3 . curl 7.14.0 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.2&r2=1.579.2.3&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.2 php-src/configure.in:1.579.2.3 --- php-src/configure.in:1.579.2.2 Tue Aug 9 01:40:55 2005 +++ php-src/configure.in Thu Aug 11 12:43:24 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.2 2005/08/09 05:40:55 andi Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.3 2005/08/11 16:43:24 rasmus Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -874,15 +874,10 @@ pear_error_msg="$pear_error_msg PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" fi - -dnl -dnl ext/xmlrpc is not really there yet to be a requirement.. -dnl -dnl if test "$PHP_XMLRPC" = "no"; then -dnl pear_error_msg="$pear_error_msg -dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)" -dnl fi -dnl + if test "$PHP_XMLRPC" = "no"; then + pear_error_msg="$pear_error_msg + PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)" + fi if test "$pear_error_msg"; then AC_MSG_ERROR([$pear_error_msg]) http://cvs.php.net/diff.php/php-src/pear/go-pear-list.php?r1=1.15&r2=1.15.2.1&ty=u Index: php-src/pear/go-pear-list.php diff -u php-src/pear/go-pear-list.php:1.15 php-src/pear/go-pear-list.php:1.15.2.1 --- php-src/pear/go-pear-list.php:1.15 Fri Jul 1 05:20:28 2005 +++ php-src/pear/go-pear-list.php Thu Aug 11 12:43:25 2005 @@ -3,12 +3,11 @@ * that will be used to create the PEAR folder * in the windows snapshot. * See win32/build/mkdist.php for more details - * $Id: go-pear-list.php,v 1.15 2005/07/01 09:20:28 pajoye Exp $ + * $Id: go-pear-list.php,v 1.15.2.1 2005/08/11 16:43:25 rasmus Exp $ */ $packages = array( // required packages for the installer "PEAR" => "1.3.5", -"XML_RPC" => "1.3.1", "Console_Getopt" => "1.2", "Archive_Tar" => "1.3.1", http://cvs.php.net/diff.php/php-src/pear/package-PEAR.xml?r1=1.108&r2=1.108.2.1&ty=u Index: php-src/pear/package-PEAR.xml diff -u php-src/pear/package-PEAR.xml:1.108 php-src/pear/package-PEAR.xml:1.108.2.1 --- php-src/pear/package-PEAR.xml:1.108 Sat Apr 2 18:47:54 2005 +++ php-src/pear/package-PEAR.xml Thu Aug 11 12:43:25 2005 @@ -124,7 +124,7 @@ <dep type="php" rel="ge" version="4.2"/> <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep> <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep> - <dep type="pkg" rel="ge" version="1.0.4">XML_RPC</dep> + <dep type="ext" rel="has">xmlrpc</dep> <dep type="ext" rel="has">xml</dep> <dep type="ext" rel="has">pcre</dep> </deps> http://cvs.php.net/diff.php/php-src/pear/PEAR/Remote.php?r1=1.50&r2=1.50.4.1&ty=u Index: php-src/pear/PEAR/Remote.php diff -u php-src/pear/PEAR/Remote.php:1.50 php-src/pear/PEAR/Remote.php:1.50.4.1 --- php-src/pear/PEAR/Remote.php:1.50 Tue Jun 8 14:03:46 2004 +++ php-src/pear/PEAR/Remote.php Thu Aug 11 12:43:25 2005 @@ -16,7 +16,7 @@ // | Author: Stig Bakken <ssb@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Remote.php,v 1.50 2004/06/08 18:03:46 cellog Exp $ +// $Id: Remote.php,v 1.50.4.1 2005/08/11 16:43:25 rasmus Exp $ require_once 'PEAR.php'; require_once 'PEAR/Config.php'; @@ -115,9 +115,8 @@ $this->saveCache($_args, $result); }; return $result; - } - if (!@include_once("XML/RPC.php")) { - return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package"); + } else { + return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension"); } array_shift($args); $server_host = $this->config->get('master_server'); http://cvs.php.net/diff.php/php-src/pear/tests/PEAR_test_mock_pearweb.php.inc?r1=1.4&r2=1.4.4.1&ty=u Index: php-src/pear/tests/PEAR_test_mock_pearweb.php.inc diff -u php-src/pear/tests/PEAR_test_mock_pearweb.php.inc:1.4 php-src/pear/tests/PEAR_test_mock_pearweb.php.inc:1.4.4.1 --- php-src/pear/tests/PEAR_test_mock_pearweb.php.inc:1.4 Sun Jun 6 12:05:30 2004 +++ php-src/pear/tests/PEAR_test_mock_pearweb.php.inc Thu Aug 11 12:43:26 2005 @@ -1,5 +1,4 @@ <?php -require_once 'XML/RPC/Server.php'; class PEAR_test_mock_pearweb { var $_config; @@ -231,4 +230,4 @@ return $newval; } } -?> \ No newline at end of file +?> http://cvs.php.net/diff.php/php-src/pear/tests/download_test_classes.php.inc?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/pear/tests/download_test_classes.php.inc diff -u php-src/pear/tests/download_test_classes.php.inc:1.1 php-src/pear/tests/download_test_classes.php.inc:1.1.4.1 --- php-src/pear/tests/download_test_classes.php.inc:1.1 Sat May 29 04:51:59 2004 +++ php-src/pear/tests/download_test_classes.php.inc Thu Aug 11 12:43:26 2005 @@ -1,5 +1,4 @@ <?php -require_once 'XML/RPC.php'; require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'PEAR_test_mock_pearweb.php.inc'; $GLOBALS['pearweb'] = new PEAR_test_mock_pearweb; class test_XML_RPC_Client extends XML_RPC_Client { @@ -94,8 +93,8 @@ }; return $result; } - if (!@include_once("XML/RPC.php")) { - return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package"); + if (!extension_loaded("xmlrpc")) { + return $this->raiseError("For this remote PEAR operation you need to install the xmlrpc extension"); } array_shift($args); $server_host = $this->_registry->channelInfo($server_channel, 'server'); @@ -401,4 +400,4 @@ return $dest_file; } } -?> \ No newline at end of file +?> http://cvs.php.net/diff.php/php-src/pear/tests/package-PEARtests.xml?r1=1.6&r2=1.6.4.1&ty=u Index: php-src/pear/tests/package-PEARtests.xml diff -u php-src/pear/tests/package-PEARtests.xml:1.6 php-src/pear/tests/package-PEARtests.xml:1.6.4.1 --- php-src/pear/tests/package-PEARtests.xml:1.6 Sun Jun 6 12:05:30 2004 +++ php-src/pear/tests/package-PEARtests.xml Thu Aug 11 12:43:26 2005 @@ -22,7 +22,7 @@ <dep type="pkg" rel="ge" version="1.4.0dev6">PEAR</dep> <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep> <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep> - <dep type="pkg" rel="ge" version="1.1.0">XML_RPC</dep> + <dep type="ext" rel="has">xmlrpc</dep> <dep type="ext" rel="has">xml</dep> <dep type="ext" rel="has">pcre</dep> </deps>