composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-09-29 21:09:10 +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())

13
setup/compiler.class.inc.php
View File

@@ -102,11 +102,14 @@ class MFCompiler
$sModuleName = $oModule->GetName();
$sModuleVersion = $oModule->GetVersion();
$sModuleRootDir = realpath($oModule->GetRootDir());
$sRelativeDir = basename($sModuleRootDir);
// Push the other module files
SetupUtils::copydir($sModuleRootDir, $sTargetDir.'/'.$sRelativeDir, $bUseSymbolicLinks);
$sModuleRootDir = $oModule->GetRootDir();
if ($sModuleRootDir != '')
{
$sModuleRootDir = realpath($sModuleRootDir);
$sRelativeDir = basename($sModuleRootDir);
// Push the other module files
SetupUtils::copydir($sModuleRootDir, $sTargetDir.'/'.$sRelativeDir, $bUseSymbolicLinks);
}
$sCompiledCode = '';

39
setup/modelfactory.class.inc.php
View File

@@ -131,6 +131,45 @@ class MFModule
}
}
/**
* MFDeltaModule: an optional module, made of a single file
* @package ModelFactory
*/
class MFDeltaModule extends MFModule
{
public function __construct($sDeltaFile)
{
$this->sId = 'datamodel-delta';
$this->sName = 'delta';
$this->sVersion = '1.0';
$this->sRootDir = '';
$this->sLabel = 'Additional Delta';
$this->aDataModels = array($sDeltaFile);
}
public function GetName()
{
return ''; // Objects created inside this pseudo module retain their original module's name
}
public function GetRootDir()
{
return '';
}
public function GetModuleDir()
{
return '';
}
public function GetDictionaryFiles()
{
return array();
}
}
/**
* ModelFactory: the class that manages the in-memory representation of the XML MetaModel
* @package ModelFactory

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

@@ -35,6 +35,8 @@ define ('MODULE_ACTION_IMPOSSIBLE', 3);
define ('ROOT_MODULE', '_Root_'); // Convention to store IN MEMORY the name/version of the root module i.e. application
define ('DATAMODEL_MODULE', 'datamodel'); // Convention to store the version of the datamodel
class RunTimeEnvironment
{
protected $sTargetEnv;
@@ -313,6 +315,14 @@ class RunTimeEnvironment
}
}
}
$sDeltaFile = APPROOT.'data/'.$sSourceEnv.'.delta.xml';
if (file_exists($sDeltaFile))
{
$oDelta = new MFDeltaModule($sDeltaFile);
$aRet[] = $oDelta;
}
return $aRet;
}