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

CC-5895: Upgrade Propel to 1.7 

Moved composer.json to top level of repo so propel will get installed there
Updated install scripts to reflect this change
This commit is contained in:
drigato 2014-07-23 15:56:23 -04:00
parent efb2a5ea7d
commit 7490c81a8f
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,6 @@
.*
*.pyc
vendor/*
composer.phar
composer.lock

2
airtime_mvc/application/Bootstrap.php
View File

@ -3,7 +3,7 @@ require_once __DIR__."/configs/conf.php";
$CC_CONFIG = Config::getConfig();
require_once __DIR__."/configs/ACL.php";
require_once 'propel/vendor/propel/propel1/runtime/lib/Propel.php';
require_once 'vendor/propel/propel1/runtime/lib/Propel.php';
Propel::init(__DIR__."/configs/airtime-conf-production.php");

0
airtime_mvc/library/propel/composer.json → composer.json
View File

2
install_minimal/include/airtime-db-install.php
View File

@ -16,7 +16,7 @@ require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php')
set_include_path(AirtimeInstall::GetAirtimeSrcDir().'/application/models' . PATH_SEPARATOR . get_include_path());
$CC_CONFIG = Config::getConfig();
require_once 'propel/vendor/propel/propel1/runtime/lib/Propel.php';
require_once 'vendor/propel/propel1/runtime/lib/Propel.php';
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
//use this class to set new values in the cache as well.

2
install_minimal/include/airtime-install.php
View File

@ -23,7 +23,7 @@ if ($iniExists) {
//reinstall, Will ask if we should rewrite config files.
require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
$CC_CONFIG = Config::getConfig();
require_once 'propel/vendor/propel/propel1/runtime/lib/Propel.php';
require_once 'vendor/propel/propel1/runtime/lib/Propel.php';
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
$version = AirtimeInstall::GetVersionInstalled();
$newInstall = is_null($version);

2
install_minimal/include/airtime-installed-check.php
View File

@ -22,7 +22,7 @@ if (!file_exists('/etc/airtime/airtime.conf')) {
require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php");
$CC_CONFIG = Config::getConfig();
require_once('propel/vendor/propel/propel1/runtime/lib/Propel.php');
require_once('vendor/propel/propel1/runtime/lib/Propel.php');
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
$version = AirtimeInstall::GetVersionInstalled();