Update TDEL10n module - add excludes #4

Sammanfogat
SlavekB sammanfogade 1 incheckningar från feat/CMakeL10n-excludes in i master 5 år sedan
SlavekB kommenterad 5 år sedan
Ägare

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

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 granskad av 5 år sedan
MicheleC lämnade en kommentar
Ägare

need to review exclude modification loop

need to review exclude modification loop
foreach( _src ${_files} )
foreach( _exclude ${_excludes} )
if( ${_src} MATCHES ${_exclude} )
list( REMOVE_ITEM _files ${_src} )
MicheleC kommenterad 5 år sedan
Ägare

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

  1. make a copy of the list to iterate, then iterate over the copy and modify the original
  2. or iterate the original list, make a list of items to remove, then iterate the second list and remove items from the original list
  3. or iterate the original list backward from back to front. In this case it is usually safe to modify the list as you iterate
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 1. make a copy of the list to iterate, then iterate over the copy and modify the original 2. or iterate the original list, make a list of items to remove, then iterate the second list and remove items from the original list 3. 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 kommenterad 5 år sedan
Skapare
Ägare

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.

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 kommenterad 5 år sedan
Skapare
Ägare

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

By the way, the same procedure is used also in loops for pick resource files (line 305) and desktop files (line 353).
MicheleC kommenterad 5 år sedan
Ägare

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.

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 kommenterad 5 år sedan
Ägare

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
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 kommenterad 5 år sedan
Skapare
Ägare

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.

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](https://cmake.org/cmake/help/v3.0/manual/cmake-language.7.html#unquoted-argument) and [Variable References](https://cmake.org/cmake/help/v3.0/manual/cmake-language.7.html#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 kommenterad 5 år sedan
Skapare
Ägare

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.

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 kommenterad 5 år sedan
Ägare

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

Great, list (FILTER... ) looks good and it is even simpler to code :smile:
SlavekB kommenterad 5 år sedan
Skapare
Ägare

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.

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 kommenterad 5 år sedan
Ägare

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

ok. suggest we add a comment to make clear the modifying foreach look is safe :smile:
MicheleC granskad av 5 år sedan
MicheleC kommenterad 5 år sedan
Ägare

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

empty lines could be better places to separate different foreach sections in files. I sae the problem in a few points.
SlavekB closed this pull request 5 år sedan
SlavekB tog bort grenen feat/CMakeL10n-excludes 5 år sedan
SlavekB lade till denna till milstolpe R14.0.6 release 5 år sedan
Pull-förfrågan har sammanfogats som 13a14899d5.
Logga in för att delta i denna konversation.
Inga granskare
Ingen Milsten
Ingen tilldelad
2 Deltagare
Notiser
Förfallodatum

Inget förfallodatum satt.

Beroenden

No dependencies set.

Reference: TDE/tde-cmake#4
Laddar…
Det finns inget innehåll än.