composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 00:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Toolkit : compile only installed modules (in database)

Browse Source 
SVN:trunk[2231]
This commit is contained in:
Romain Quetiez
2012-10-04 15:47:31 +00:00
parent c69eb2e5d7
commit eab09c5e17
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
setup/runtimeenv.class.inc.php
View File

@@ -130,6 +130,15 @@ class RunTimeEnvironment
foreach($aModules as $sModuleId => $aModuleInfo)
{
list($sModuleName, $sModuleVersion) = ModuleDiscovery::GetModuleName($sModuleId);
if ($sModuleName == '')
{
throw new Exception("Missing name for the module: '$sModuleId'");
}
if ($sModuleVersion == '')
{
// The version must not be empty (it will be used as a criteria to determine wether a module has been installed or not)
throw new Exception("Missing version for the module: '$sModuleId'");
}
$sModuleAppVersion = $aModuleInfo['itop_version'];
$aModuleInfo['version_db'] = '';
@@ -181,6 +190,13 @@ class RunTimeEnvironment
$iInstalled = strtotime($aInstall['installed']);
$sModuleName = $aInstall['name'];
$sModuleVersion = $aInstall['version'];
if ($sModuleVersion == '')
{
// Though the version cannot be empty in iTop 2.0, it used to be possible
// therefore we have to put something here or the module will not be considered
// as being installed
$sModuleVersion = '0.0.0';
}
if ($aInstall['parent_id'] == 0)
{
@@ -251,6 +267,9 @@ class RunTimeEnvironment
@chmod($sTargetConfigFile, 0440); // Read-only for owner and group, nothing for others
}
/**
* Get the installed modules (only the installed ones)
*/
protected function GetMFModulesToCompile($sSourceEnv, $sSourceDir)
{
$sSourceDirFull = APPROOT.$sSourceDir;
@@ -265,7 +284,7 @@ class RunTimeEnvironment
//
$oSourceConfig = new Config(APPCONF.$sSourceEnv.'/'.ITOP_CONFIG_FILE);
$oSourceEnv = new RunTimeEnvironment($sSourceEnv);
$aInstalledModules = $oSourceEnv->AnalyzeInstallation($oSourceConfig, $sSourceDir);
$aAvailableModules = $oSourceEnv->AnalyzeInstallation($oSourceConfig, $sSourceDir);
// Do load the required modules
//
@@ -274,9 +293,12 @@ class RunTimeEnvironment
foreach($aModules as $foo => $oModule)
{
$sModule = $oModule->GetName();
if (array_key_exists($sModule, $aInstalledModules))
if (array_key_exists($sModule, $aAvailableModules))
{
$aRet[] = $oModule;
if ($aAvailableModules[$sModule]['version_db'] != '')
{
$aRet[] = $oModule;
}
}
}
return $aRet;