Update TDEL10n module - add excludes #4

Fusionnée

SlavekB a fusionné 1 révision(s) à partir de feat/CMakeL10n-excludes vers master

SlavekB a commenté

Propriétaire

As mentioned in TDE/tdelibs#8, it would be useful to have a way to determine EXCLUDES. The patch contained here adds this option.

MicheleC révisé

MicheleC laisser un commentaire

Propriétaire

need to review exclude modification loop

modules/TDEL10n.cmake

													
					    foreach( _src ${_files} )

					      foreach( _exclude ${_excludes} )

					        if( ${_src} MATCHES ${_exclude} )

					          list( REMOVE_ITEM _files ${_src} )

MicheleC a commenté

Propriétaire

I am not sure how cmake handles that, but usually modifying a list that is also being iterated with a foreach at the same time, is a mistake. See line 283 and 285.

You should either

make a copy of the list to iterate, then iterate over the copy and modify the original
or iterate the original list, make a list of items to remove, then iterate the second list and remove items from the original list
or iterate the original list backward from back to front. In this case it is usually safe to modify the list as you iterate

SlavekB a commenté

Éditeur

Propriétaire

I have already tested this procedure several times and it works successfully. I think CMake will evaluate items for the foreach at the beginning of the cycle and then the changes in the list will have no undue impact on the cycle.

SlavekB a commenté

Éditeur

Propriétaire

By the way, the same procedure is used also in loops for pick resource files (line 305) and desktop files (line 353).

MicheleC a commenté

Propriétaire

cmake documentation does not add anything that helps. it may work fine, but still it is not best practice because we are relying on cmake to save/copy the list initially and then iterate over all items. Should this behavior change in future versions of cmake, we would have new bugs to fix.

If you believe it is safe enough due to previous testing, then ok.

MicheleC a commenté

Propriétaire

you could do something like this (not sure about the exact cmake syntax):

copy listA to listAA
foreach over listAA
  remove item from listA
empty listAA

SlavekB a commenté

Éditeur

Propriétaire

I researched it again. Passing ${_files} to foreach(…) means, that the value of _files list is expanded to its current content and passed as unquoted argument – see Unquoted Argument and Variable References in CMake documentation.

Because the value of list is expanded into arguments before the foreach(…) starts then such use is and will be safe.

SlavekB a commenté

Éditeur

Propriétaire

In any case, I have now found the solution that will be the best: list(FILTER …)

This could serve for all the cases we have now used. Because this is a change that applies not only to this PR but also to the existing code, I will probably prepare a separate patch => another commit and PR in this series.

MicheleC a commenté

Propriétaire

Great, list (FILTER... ) looks good and it is even simpler to code 😄

SlavekB a commenté

Éditeur

Propriétaire

Bad news: The list( FILTER … ) is new in CMake 3.6, while we hold CMake 2.8 support. So I leave the existing code with foreach( … ) as it is now.

MicheleC a commenté

Propriétaire

ok. suggest we add a comment to make clear the modifying foreach look is safe 😄

MicheleC révisé

modules/TDEL10n.cmake

MicheleC a commenté

Propriétaire

empty lines could be better places to separate different foreach sections in files. I sae the problem in a few points.

SlavekB a fermé cette pull request

SlavekB a supprimé la branche feat/CMakeL10n-excludes

SlavekB a ajouté cela au jalon R14.0.6 release

La demande d'ajout a été fusionnée en 13a14899d5.

Connectez-vous pour rejoindre cette conversation.

Aucune évaluation

Pas d'assignataires

2 participants

Notifications

Échéance

Aucune échéance n'a été définie.

Dépendances

No dependencies set.

Reference: TDE/tde-cmake#4