TDE

/

tde-cmake

Update TDEL10n module - add excludes #4

Zusammengeführt

SlavekB hat 1 Commits von feat/CMakeL10n-excludes nach master zusammengeführt

SlavekB hat kommentiert

Besitzer

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 hat überprüft

MicheleC hat einen Kommentar hinterlassen

Besitzer

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 hat kommentiert

Besitzer

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 hat kommentiert

Ersteller

Besitzer

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 hat kommentiert

Ersteller

Besitzer

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

MicheleC hat kommentiert

Besitzer

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 hat kommentiert

Besitzer

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 hat kommentiert

Ersteller

Besitzer

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 hat kommentiert

Ersteller

Besitzer

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 hat kommentiert

Besitzer

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

SlavekB hat kommentiert

Ersteller

Besitzer

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 hat kommentiert

Besitzer

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

MicheleC hat überprüft

modules/TDEL10n.cmake

MicheleC hat kommentiert

Besitzer

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

SlavekB hat diesen Pull-Request geschlossen

SlavekB löschte die Branch feat/CMakeL10n-excludes

SlavekB hat diesen Issue zum R14.0.6 release Meilenstein hinzugefügt

Der Pull Request wurde als 13a14899d5 gemergt.

Anmelden, um an der Diskussion teilzunehmen.

Keine Reviewer

Niemand zuständig

2 Beteiligte

Nachrichten

Fällig am

Kein Fälligkeitsdatum gesetzt.

Abhängigkeiten

Keine Abhängigkeiten gesetzt.

Referenz: TDE/tde-cmake#4