Nosial/ncc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 11 Packages Wiki Activity Actions

Refactor project constants handling in NccCompiler

Browse source
This commit is contained in:
netkas 2024-09-19 14:17:16 -04:00
parent 272fc8524e
commit c7b007c704
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ncc/Classes/NccExtension/NccCompiler.php
View file

@ -333,8 +333,7 @@
$metadata->addOptions($this->project_manager->getProjectConfiguration()->getBuild()->getOptions($build_configuration));
$metadata->addOptions($this->project_manager->getProjectConfiguration()->getProject()->getOptions());
$metadata->addConstants($this->project_manager->getRuntimeConstants($build_configuration));
$metadata->addConstants($this->project_manager->getRuntimeConstants());
$metadata->addConstants($this->project_manager->getConstants($build_configuration));
$metadata->setUpdateSource($this->project_manager->getProjectConfiguration()->getProject()->getUpdateSource());
$metadata->setMainExecutionPolicy($this->project_manager->getProjectConfiguration()->getBuild()->getMain());
$metadata->setInstaller($this->project_manager->getProjectConfiguration()->getInstaller());
@ -352,6 +351,13 @@
$metadata->removeOption(BuildConfigurationOptions::STATIC_DEPENDENCIES->value);
}
$compiled_constants = [];
foreach($this->project_manager->getConstants() as $constant => $value)
{
$compiled_constants[$constant] = ConstantCompiler::compileConstants($this->project_manager->getProjectConfiguration(), $value);
}
$metadata->addConstants($compiled_constants);
/** @noinspection UnusedFunctionResultInspection */
$package_writer->setMetadata($metadata);

2
src/ncc/Managers/ProjectManager.php
View file

@ -327,7 +327,7 @@
* @param string $build_configuration
* @return array
*/
public function getRuntimeConstants(string $build_configuration=BuildConfigurationValues::DEFAULT->value): array
public function getConstants(string $build_configuration=BuildConfigurationValues::DEFAULT->value): array
{
$configuration = $this->project_configuration->getBuild()->getBuildConfiguration($build_configuration);
return array_merge($configuration->getDefineConstants(), $this->project_configuration->getBuild()->getDefineConstants());