Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3297: Depend on zendframework and php-pear as external packages 

-DB dependency should now be externalized
This commit is contained in:
Martin Konecny 2012-02-06 14:18:03 -05:00
parent 62d1d56fd2
commit 58b4576ae1
11 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/models/tests/AllTests.php
View File

@ -1,5 +1,4 @@
<?php
$path = dirname(__FILE__).'/../../../library/pear';
set_include_path(get_include_path() . PATH_SEPARATOR . $path);
$WHITE_SCREEN_OF_DEATH = false;

2
install_full/ubuntu/airtime-full-install
View File

@ -39,7 +39,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
libvorbis-ocaml libpulse0 vorbis-tools lsb-release
libvorbis-ocaml libpulse0 vorbis-tools lsb-release php-db zendframework
#install packages with --force-yes option (this is useful in the case
#of Debian, where these packages are unauthorized)

2
install_full/ubuntu/airtime-full-install-nginx
View File

@ -42,7 +42,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
libvorbis-ocaml libpulse0 vorbis-tools lsb-release
libvorbis-ocaml libpulse0 vorbis-tools lsb-release php-db zendframework
#install packages with --force-yes option (this is useful in the case
#of Debian, where these packages are unauthorized)

4
install_minimal/include/AirtimeInstall.php
View File

@ -1,9 +1,7 @@
<?php
set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
require_once('Zend/Loader/Autoloader.php');
//Pear classes.
set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
require_once('pear/DB.php');
require_once('DB.php');
class AirtimeInstall
{

3
install_minimal/include/airtime-upgrade.php
View File

@ -6,9 +6,6 @@
* @license http://www.gnu.org/licenses/gpl.txt
*/
//Pear classes.
set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
require_once('DB.php');
require_once(__DIR__.'/airtime-constants.php');
require_once(dirname(__FILE__).'/AirtimeIni.php');

1
install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
View File

@ -7,7 +7,6 @@
*/
set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
set_include_path(__DIR__.'/../../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
require_once 'conf.php';
require_once 'DB.php';

1
install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
View File

@ -1,6 +1,5 @@
<?php
set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
require_once('DB.php');
/* These are helper functions that are common to each upgrade such as

1
install_minimal/upgrades/upgrade-template/UpgradeCommon.php
View File

@ -1,6 +1,5 @@
<?php
set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
require_once('DB.php');
/* These are helper functions that are common to each upgrade such as

3
python_apps/pypo/test/airtime-schedule-insert.php
View File

@ -10,9 +10,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . realpath(APPLICATION_PATH
set_include_path(get_include_path() . PATH_SEPARATOR . APPLICATION_PATH . '/models');
echo get_include_path().PHP_EOL;
//Pear classes.
set_include_path(APPLICATION_PATH . get_include_path() . PATH_SEPARATOR . '/../library/pear');
//Controller plugins.
set_include_path(APPLICATION_PATH . get_include_path() . PATH_SEPARATOR . '/controllers/plugins');

2
utils/phone_home_stat.php
View File

@ -38,8 +38,6 @@ require_once($CC_CONFIG['phpDir'].'/application/models/ShowInstance.php');
require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php');
require_once($CC_CONFIG['phpDir'].'/application/models/StreamSetting.php');
//Pear classes.
set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path());
require_once('DB.php');
$CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
if (PEAR::isError($CC_DBC)) {

2
utils/soundcloud-uploader.php
View File

@ -35,8 +35,6 @@ set_include_path($CC_CONFIG['phpDir']."/application/models" . PATH_SEPARATOR . g
require_once($CC_CONFIG['phpDir']."/library/propel/runtime/lib/Propel.php");
Propel::init($CC_CONFIG['phpDir']."/application/configs/airtime-conf.php");
//Pear classes.
set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path());
require_once('DB.php');
$CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
if (PEAR::isError($CC_DBC)) {