com web/rmtools: check for the required extensions and remove most of cli ini: client/bin/pecl.bat client/bin/pecl_rss.bat client/d ata/config.php
client/script/pecl_rss.php

Commit: 8324f35f79b4f5132d5c430ac63f2a9e3b581466 Author: Anatol Belski <ab@php.net> Thu, 16 Apr 2015 10:44:08 +0200 Parents: f2193b44e17bf72d6beb4aeed1fd803d0d12e768 Branches: master pecl_legacy Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=8324f35f79b4f5132d5c430ac63f2a9e3b581466 Log: check for the required extensions and remove most of cli ini now php.ini has to be used for the underlying php, as we'll need to run it per PHP_BINARY and there's no chance to know, which ini was passed on the command line Changed paths: M client/bin/pecl.bat M client/bin/pecl_rss.bat M client/data/config.php M client/script/pecl_rss.php Diff: diff --git a/client/bin/pecl.bat b/client/bin/pecl.bat index d6d988b..e7f03ca 100644 --- a/client/bin/pecl.bat +++ b/client/bin/pecl.bat @@ -4,7 +4,7 @@ SET BAT_DIR=%~dp0 set RMTOOLS_BASE_DIR=c:\php-sdk\rmtools-client -set PECL_PHP_CMD=c:\php-sdk\php\php.exe -d memory_limit=2G -d extension_dir=c:\php-sdk\php\ext -d extension=php_openssl.dll -d extension=php_curl.dll -d extension=php_sqlite3.dll -d date.timezone=UTC +set PECL_PHP_CMD=c:\php-sdk\php\php.exe -d memory_limit=2G if "%1"=="" goto :help if "%1"=="--help" goto :help diff --git a/client/bin/pecl_rss.bat b/client/bin/pecl_rss.bat index d73073c..4d11928 100644 --- a/client/bin/pecl_rss.bat +++ b/client/bin/pecl_rss.bat @@ -2,7 +2,7 @@ SET BAT_DIR=%~dp0 -set PECL_RSS_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 extension=php_sqlite3.dll -d date.timezone=UTC +set PECL_RSS_CMD=c:\php-sdk\php\php.exe if "%1"=="" goto :help if "%1"=="--help" goto :help diff --git a/client/data/config.php b/client/data/config.php index 7b2fbed...d3e5760 100644 --- a/client/data/config.php +++ b/client/data/config.php @@ -1,6 +1,22 @@ <?php namespace rmtools; +$required_exts = array( + 'openssl', + 'curl', + 'sqlite3', + 'simplexml', + 'dom', + 'json', + 'mbstring', + 'zlib', +); +foreach ($required_exts as $ext) { + if (!extension_loaded($ext)) { + die("'$ext' extension is not loaded but required"); + } +} + $rmtools_base = getenv('RMTOOLS_BASE_DIR'); if (!$rmtools_base) { @@ -13,4 +29,5 @@ $custom_env = array( 'INCLUDE' => "C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\Include;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Include;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Include\\gl;C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\ATLMFC\\INCLUDE;", 'LIB' => "C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\Lib;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Lib;C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\ATLMFC\\LIB;", 'BISON_SIMPLE' => 'c:\\php-sdk\\bin\\bison.simple' - ); \ No newline at end of file + ); + diff --git a/client/script/pecl_rss.php b/client/script/pecl_rss.php index 72bf1c8..3126ada 100644 --- a/client/script/pecl_rss.php +++ b/client/script/pecl_rss.php @@ -1,6 +1,6 @@ <?php - +include __DIR__ .. '/../data/config.php'; include __DIR__ . '/../include/PeclDb.php'; use rmtools as rm;