Merge branch '2.7' into 2.8
* 2.7: [travis] fix passing $INI to tpecl()
This commit is contained in:
commit
5627b48b3a
@ -107,6 +107,7 @@ before_install:
|
|||||||
tpecl () {
|
tpecl () {
|
||||||
local ext_name=$1
|
local ext_name=$1
|
||||||
local ext_so=$2
|
local ext_so=$2
|
||||||
|
local INI=$3
|
||||||
local ext_dir=$(php -r "echo ini_get('extension_dir');")
|
local ext_dir=$(php -r "echo ini_get('extension_dir');")
|
||||||
local ext_cache=php-ext/$(basename $ext_dir)/$ext_name
|
local ext_cache=php-ext/$(basename $ext_dir)/$ext_name
|
||||||
|
|
||||||
@ -139,11 +140,11 @@ before_install:
|
|||||||
# Install extra PHP extensions
|
# Install extra PHP extensions
|
||||||
if [[ ! $skip && $PHP = 5.* ]]; then
|
if [[ ! $skip && $PHP = 5.* ]]; then
|
||||||
([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI")
|
([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI")
|
||||||
tfold ext.memcached tpecl memcached-2.1.0 memcached.so
|
tfold ext.memcached tpecl memcached-2.1.0 memcached.so $INI
|
||||||
tfold ext.apcu tpecl apcu-4.0.11 apcu.so
|
tfold ext.apcu tpecl apcu-4.0.11 apcu.so $INI
|
||||||
elif [[ ! $skip && $PHP = 7.* ]]; then
|
elif [[ ! $skip && $PHP = 7.* ]]; then
|
||||||
tfold ext.apcu tpecl apcu-5.1.6 apcu.so
|
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
|
||||||
tfold ext.mongodb tpecl mongodb-1.4.0RC1 mongodb.so
|
tfold ext.mongodb tpecl mongodb-1.4.0RC1 mongodb.so $INI
|
||||||
fi
|
fi
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
Reference in New Issue
Block a user