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

Possibility to introduce a delta (not in a module) at compile time

Browse Source 
SVN:trunk[2817]
This commit is contained in:
Romain Quetiez
2013-08-09 15:47:05 +00:00
parent 98a1242050
commit 58af5528be
4 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup/applicationinstaller.class.inc.php
View File

@@ -214,7 +214,7 @@ class ApplicationInstaller
}
}
self::DoCompile($aSelectedModules, $sSourceDir, $sExtensionDir, $sTargetDir, $sWorkspaceDir, $bUseSymbolicLinks);
self::DoCompile($aSelectedModules, $sSourceDir, $sExtensionDir, $sTargetDir, $sTargetEnvironment, $bUseSymbolicLinks);
$aResult = array(
'status' => self::OK,
@@ -424,7 +424,7 @@ class ApplicationInstaller
}
protected static function DoCompile($aSelectedModules, $sSourceDir, $sExtensionDir, $sTargetDir, $sWorkspaceDir = '', $bUseSymbolicLinks = false)
protected static function DoCompile($aSelectedModules, $sSourceDir, $sExtensionDir, $sTargetDir, $sEnvironment, $bUseSymbolicLinks = false)
{
SetupPage::log_info("Compiling data model.");
@@ -480,13 +480,11 @@ class ApplicationInstaller
$oFactory->LoadModule($oModule);
}
}
if (strlen($sWorkspaceDir) > 0)
$sDeltaFile = APPROOT.'data/'.$sEnvironment.'.delta.xml';
if (file_exists($sDeltaFile))
{
$oWorkspace = new MFWorkspace(APPROOT.$sWorkspaceDir);
if (file_exists($oWorkspace->GetWorkspacePath()))
{
$oFactory->LoadModule($oWorkspace);
}
$oDelta = new MFDeltaModule($sDeltaFile);
$oFactory->LoadModule($oDelta);
}
//$oFactory->Dump();
if ($oFactory->HasLoadErrors())