com web/rmtools: fixes for name/version determination: client/bin/pecl.bat client/data/config/pecl/exts.ini client/include/PeclExt.php

Commit: 4568f9d033cbe379b69a36ea31d5bd29f9f77e8f Author: Anatol Belski <ab@php.net> Fri, 13 Sep 2013 17:10:37 +0200 Parents: 635de6cbd5a5f21f5f446371ce567338c9dbb11c Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=4568f9d033cbe379b69a36ea31d5bd29f9f77e8f Log: fixes for name/version determination Changed paths: M client/bin/pecl.bat M client/data/config/pecl/exts.ini M client/include/PeclExt.php Diff: diff --git a/client/bin/pecl.bat b/client/bin/pecl.bat index 4004fd6..4c96a78 100644 --- a/client/bin/pecl.bat +++ b/client/bin/pecl.bat @@ -72,7 +72,7 @@ SET VC11_X64_LIBPATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\ SET VC11_X64_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"" amd64 REM Run pecl.php -set PECL_PHP_CMD=c:\php-sdk\php\php.exe -d extension_dir=c:\php-sdk\php\ext -d extension=php_openssl.dll -d extension=php_curl.dll +set PECL_PHP_CMD=c:\php-sdk\php\php.exe -d extension_dir=c:\php-sdk\php\ext -d extension=php_openssl.dll -d extension=php_curl.dll -d date.timezone=UTC SET BISON_SIMPLE=c:\php-sdk\bin\bison.simple rem XXX iterate the c:\pecl_in_pkg here and delete the packages after successful build @ECHO ON diff --git a/client/data/config/pecl/exts.ini b/client/data/config/pecl/exts.ini index d7e93c2..9691246 100644 --- a/client/data/config/pecl/exts.ini +++ b/client/data/config/pecl/exts.ini @@ -207,4 +207,11 @@ libs[]= exts[]=apc opts[]= +[amfext] +real_name=amf +type=with +libs[]= +exts[]= +opts[]= + diff --git a/client/include/PeclExt.php b/client/include/PeclExt.php index b369c14...7ecd764 100644 --- a/client/include/PeclExt.php +++ b/client/include/PeclExt.php @@ -51,8 +51,8 @@ class PeclExt /* Setup some stuff */ if ($this->package_xml) { - $this->name = $this->getPackageXmlProperty("name"); - $this->version = $this->getPackageXmlProperty("version", "release"); + $this->name = (string)$this->getPackageXmlProperty("name"); + $this->version = (string)$this->getPackageXmlProperty("version", "release"); } if (!$this->name || !$this->version) { @@ -491,8 +491,8 @@ class PeclExt } if ($this->package_xml) { - $min_php_ver = $this->getPackageXmlProperty("dependencies", "required", "php", "min"); - $max_php_ver = $this->getPackageXmlProperty("dependencies", "required", "php", "max"); + $min_php_ver = (string)$this->getPackageXmlProperty("dependencies", "required", "php", "min"); + $max_php_ver = (string)$this->getPackageXmlProperty("dependencies", "required", "php", "max"); $php_ver = ''; $ver_hdr = $this->build->getSourceDir() . '/main/php_version.h';