Final fix for #2074 - make it easier to change the version number. You can now set the version number for PHP code in src/modules/storageServer/var/campcaster_version.php - all components look at this file to get the version number.
This commit is contained in:
parent
314ff9eeb0
commit
c66be911e6
|
@ -3,7 +3,7 @@
|
||||||
* ArchiveServer configuration file
|
* ArchiveServer configuration file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define('CAMPCASTER_VERSION', '1.1.1');
|
include(dirname(__FILE__)."/../../storageServer/var/campcaster_version.php");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* configuration structure:
|
* configuration structure:
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* ArchiveServer configuration file
|
* ArchiveServer configuration file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define('CAMPCASTER_VERSION', '1.1.1');
|
include(dirname(__FILE__)."/../../storageServer/var/campcaster_version.php");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* configuration structure:
|
* configuration structure:
|
||||||
|
|
|
@ -11,7 +11,6 @@ if (UI_DEBUG) {
|
||||||
error_reporting(E_ALL);
|
error_reporting(E_ALL);
|
||||||
}
|
}
|
||||||
|
|
||||||
define('UI_VERSION', 'Campcaster 1.1.1');
|
|
||||||
define('UI_VERSION_FULLNAME', 'Campcaster 1.1.1');
|
define('UI_VERSION_FULLNAME', 'Campcaster 1.1.1');
|
||||||
define('UI_TESTSTREAM_MU3_TMP', 'img/listen.m3u');
|
define('UI_TESTSTREAM_MU3_TMP', 'img/listen.m3u');
|
||||||
|
|
||||||
|
@ -118,6 +117,7 @@ define('UI_RESTORETOKEN_KEY', 'restoreToken');
|
||||||
|
|
||||||
//require_once('PEAR.php');
|
//require_once('PEAR.php');
|
||||||
require_once('../../../storageServer/var/conf.php');
|
require_once('../../../storageServer/var/conf.php');
|
||||||
|
define('UI_VERSION', CAMPCASTER_VERSION);
|
||||||
|
|
||||||
// extent config
|
// extent config
|
||||||
$CC_CONFIG = array_merge($CC_CONFIG,
|
$CC_CONFIG = array_merge($CC_CONFIG,
|
||||||
|
|
|
@ -11,7 +11,6 @@ if (UI_DEBUG) {
|
||||||
error_reporting(E_ALL);
|
error_reporting(E_ALL);
|
||||||
}
|
}
|
||||||
|
|
||||||
define('UI_VERSION', 'Campcaster 1.1.1');
|
|
||||||
define('UI_VERSION_FULLNAME', 'Campcaster 1.1.1');
|
define('UI_VERSION_FULLNAME', 'Campcaster 1.1.1');
|
||||||
define('UI_TESTSTREAM_MU3_TMP', 'img/listen.m3u');
|
define('UI_TESTSTREAM_MU3_TMP', 'img/listen.m3u');
|
||||||
|
|
||||||
|
@ -121,6 +120,8 @@ define('UI_BACKUPTOKEN_KEY', 'backupToken');
|
||||||
define('UI_RESTORETOKEN_KEY', 'restoreToken');
|
define('UI_RESTORETOKEN_KEY', 'restoreToken');
|
||||||
|
|
||||||
require_once('storage_server/var/conf.php');
|
require_once('storage_server/var/conf.php');
|
||||||
|
define('UI_VERSION', CAMPCASTER_VERSION);
|
||||||
|
|
||||||
// extent config
|
// extent config
|
||||||
$CC_CONFIG = array_merge($CC_CONFIG,
|
$CC_CONFIG = array_merge($CC_CONFIG,
|
||||||
array(
|
array(
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
<?php
|
||||||
|
define('CAMPCASTER_VERSION', '1.2.0');
|
||||||
|
?>
|
|
@ -31,7 +31,7 @@
|
||||||
* </dl>
|
* </dl>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define('CAMPCASTER_VERSION', '1.1.1');
|
include("campcaster_version.php");
|
||||||
|
|
||||||
// these are the default values for the config
|
// these are the default values for the config
|
||||||
global $CC_CONFIG;
|
global $CC_CONFIG;
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
* </dl>
|
* </dl>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define('CAMPCASTER_VERSION', '1.1.1');
|
include("campcaster_version.php");
|
||||||
|
|
||||||
// these are the default values for the config
|
// these are the default values for the config
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue