-
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from phalcon/1.2.1
1.2.1
- Loading branch information
Showing
478 changed files
with
277,962 additions
and
226,451 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,47 +4,35 @@ php: | |
| - 5.3 | ||
| - 5.3.3 | ||
| - 5.4 | ||
| - 5.5 | ||
|
|
||
| services: | ||
| - mongodb | ||
| - memcached | ||
|
|
||
| before_install: | ||
| - chmod +x unit-tests/ci/install_memcached | ||
| - chmod +x unit-tests/ci/install_apc | ||
| - chmod +x unit-tests/ci/install_mongo | ||
| - ./unit-tests/ci/install_memcached | ||
| - ./unit-tests/ci/install_apc | ||
| - ./unit-tests/ci/install_mongo | ||
| - phpenv config-add ./unit-tests/ci/memcache.ini | ||
| - phpenv config-add ./unit-tests/ci/mongo.ini | ||
| - ./unit-tests/ci/install_prereqs.sh | ||
| - ./unit-tests/ci/setup_dbs.sh | ||
|
|
||
| before_script: | ||
| - git submodule init | ||
| - git submodule update | ||
| - cd php-tests/library/Mustache | ||
| - git checkout master | ||
| - cd ../../.. | ||
| - cd php-tests/library/Twig | ||
| - git checkout master | ||
| - cd ../../.. | ||
| - mkdir -p unit-tests/engines | ||
| - cd unit-tests/engines/ | ||
| - git clone https://github.com/bobthecow/mustache.php.git | ||
| - git clone git://github.com/fabpot/Twig.git | ||
| - cd ../.. | ||
| - cd ext/ | ||
| - export CFLAGS="-g -O2 -fno-delete-null-pointer-checks" | ||
| - sh -c "phpize && ./configure --enable-phalcon && make && sudo make install" | ||
| - echo "extension=phalcon.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` | ||
| - cd .. | ||
| - mysql -uroot -e 'create database phalcon_test charset=utf8 collate=utf8_unicode_ci;' | ||
| - mysql -uroot phalcon_test < unit-tests/schemas/mysql/phalcon_test.sql | ||
| - psql -c 'create database phalcon_test;' -U postgres | ||
| - psql -U postgres phalcon_test -q -f unit-tests/schemas/postgresql/phalcon_test.sql | ||
| - sqlite3 /tmp/phalcon_test.sqlite < unit-tests/schemas/sqlite/phalcon_test.sql | ||
| - chmod +x unit-tests/ci/run_script.sh | ||
| - git submodule --quiet update --init --recursive | ||
| - (cd php-tests/library/Mustache; git checkout master ) | ||
| - (cd php-tests/library/Twig; git checkout master ) | ||
| - (cd unit-tests/engines/; git clone -q git://github.com/bobthecow/mustache.php.git & git clone -q git://github.com/fabpot/Twig.git & wait) | ||
| - (cd ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j2 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini) | ||
| - ulimit -c unlimited || true | ||
|
|
||
| script: ./unit-tests/ci/run_script.sh | ||
| script: | ||
| - $(phpenv which php) ./unit-tests/ci/phpunit.php --debug -c unit-tests/phpunit.xml | ||
|
|
||
| after_failure: | ||
| - sudo apt-get -qq install gdb | ||
| - ./unit-tests/ci/after_failure.sh | ||
|
|
||
| notifications: | ||
| email: | ||
| - [email protected] | ||
| - [email protected] | ||
| - [email protected] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,84 @@ | ||
| PHP_ARG_ENABLE(phalcon, whether to enable phalcon framework, [ --enable-phalcon Enable phalcon framework]) | ||
|
|
||
| if test "$PHP_PHALCON" = "yes"; then | ||
| AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon Framework]) | ||
| PHP_NEW_EXTENSION(phalcon, phalcon.c, $ext_shared) | ||
| fi | ||
| AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon Framework]) | ||
| PHP_NEW_EXTENSION(phalcon, phalcon.c, $ext_shared) | ||
|
|
||
| PHP_ADD_EXTENSION_DEP([phalcon], [spl]) | ||
|
|
||
| old_CPPFLAGS=$CPPFLAGS | ||
| CPPFLAGS="$CPPFLAGS $INCLUDES" | ||
|
|
||
| AC_CHECK_HEADERS( | ||
| [ext/filter/php_filter.h], | ||
| [ | ||
| PHP_ADD_EXTENSION_DEP([phalcon], [filter]) | ||
| AC_DEFINE([PHALCON_USE_PHP_FILTER], [1], [Whether PHP filter extension is present at compile time]) | ||
| ], | ||
| , | ||
| [[#include "main/php.h"]] | ||
| ) | ||
|
|
||
| AC_CHECK_HEADERS( | ||
| [ext/igbinary/igbinary.h], | ||
| [ | ||
| PHP_ADD_EXTENSION_DEP([phalcon], [igbinary]) | ||
| AC_DEFINE([PHALCON_USE_PHP_IGBINARY], [1], [Whether PHP igbinary extension is present at compile time]) | ||
| ], | ||
| , | ||
| [[#include "main/php.h"]] | ||
| ) | ||
|
|
||
| AC_CHECK_DECL( | ||
| [HAVE_BUNDLED_PCRE], | ||
| [ | ||
| AC_CHECK_HEADERS( | ||
| [ext/pcre/php_pcre.h], | ||
| [ | ||
| PHP_ADD_EXTENSION_DEP([phalcon], [pcre]) | ||
| AC_DEFINE([PHALCON_USE_PHP_PCRE], [1], [Whether PHP pcre extension is present at compile time]) | ||
| ], | ||
| , | ||
| [[#include "main/php.h"]] | ||
| ) | ||
| ], | ||
| , | ||
| [[#include "php_config.h"]] | ||
| ) | ||
|
|
||
| AC_CHECK_DECL( | ||
| [HAVE_JSON], | ||
| [ | ||
| AC_CHECK_HEADERS( | ||
| [ext/json/php_json.h], | ||
| [ | ||
| PHP_ADD_EXTENSION_DEP([phalcon], [json]) | ||
| AC_DEFINE([PHALCON_USE_PHP_JSON], [1], [Whether PHP json extension is present at compile time]) | ||
| ], | ||
| , | ||
| [[#include "main/php.h"]] | ||
| ) | ||
| ], | ||
| , | ||
| [[#include "php_config.h"]] | ||
| ) | ||
|
|
||
| AC_CHECK_DECL( | ||
| [HAVE_PHP_SESSION], | ||
| [ | ||
| AC_CHECK_HEADERS( | ||
| [ext/session/php_session.h], | ||
| [ | ||
| PHP_ADD_EXTENSION_DEP([phalcon], [session]) | ||
| AC_DEFINE([PHALCON_USE_PHP_SESSION], [1], [Whether PHP session extension is present at compile time]) | ||
| ], | ||
| , | ||
| [[#include "main/php.h"]] | ||
| ) | ||
| ], | ||
| , | ||
| [[#include "php_config.h"]] | ||
| ) | ||
|
|
||
| CPPFLAGS=$old_CPPFLAGS | ||
| fi |
Oops, something went wrong.