Add CMakeL10n rules. #8
Samengevoegd
SlavekB
heeft 1 commits samengevoegd van feat/CMakeL10n naar master 5 jaren geleden
Geen beoordelaars
Geen label
Niet toegewezen
2 deelnemers
Notificaties
Vervaldatum
Geen vervaldatum ingesteld.
Afhankelijkheden
Geen afhankelijkheden ingesteld.
Referentie: TDE/tdelibs#8
Laden…
Verwijs in nieuw issue
Er is nog geen inhoud.
Verwijder branch 'feat/CMakeL10n'
Het verwijderen van een branch is permanent. Het KAN NIET ongedaan gemaakt worden. Wil je toch doorgaan?
The attached rules should work well enough. However, it would be useful to add support to
tde_create_l10n_templatemacro forEXCLUDESto be an easy way to exclude some nested directories or files. For example, to avoid repeating string from the nested directory in the catalog from the parent directory. Or to exclude directories, such as tests performed during building.The rules contain some useful things and some hacks:
qt-messages.pot, which is not regularly updated, strings are extracted directly from../dependencies/tqt3/src. As a result, the TQt3 strings will be up to date. Andqt-messages.potwill no longer be needed.tqt3/src/xml/qxml.cppfile properly,#defineis hidden before extracting. After extracting, the original file is restored.tdeui/colors/rgb.txtfile is modified to format as C source before extracting strings with color names. After extracting, the original file is restored.tdeprint/cups/cupsdconf2/cupsd.conf.templatefile is modified to format as C source before extracting strings for CUPS configuration. After extracting, the original file is restored.Thanks to editing files in place, POT files point to the correct lines in existing files.
Added commits already use
EXCLUDES– see TDE/tde-common-cmake#4.mostly ok, some point to discuss together
##### verify tqt3 sources #######################if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src )Is it possible to look for tqt3 module path rather than using a relative path? This is because with relative path, the functionality would stop working if we move tqt3 so a different place.
This is a general observation, which is probably applicable in other parts/modules as well.
file( RENAME${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.cpp${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.orig)as for cmake #5, renaming of files could cause problems when the process is halted half way. Suggest we consider copy and work on the copied file instead of the original, if this does not cause problem with POT pointing to wrong files.
Or is there a way to get POT to point to original file even when working on a copy?
##### restore tqt3/src/xml/qxml.cpp #############if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.orig )do we need to delete "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.cpp" before the rename is done?
tde_l10n_create_template(CATALOG "kmcop"DESTINATION "../../../../tde-i18n/template/messages/tdelibs"as above, finding the location of tde-i18n would be preferred over using a relative location.
Same comment applies in various other files in this PR, I will not comment on those cases.
We should consider the idea of modifying "tde_l10n_create_template" so that we specify destination module and relative destination path. then the macro will search for the module (most of the time it would be tde-i18n but sometimes it could be an application module, like koffice-i18n).
Subproject commit 451ca41345a5fea5539f95829026cee9cb3ad118cmake submodule commit hash change should not be part of this PR, IMO.
set( _conf_context "Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, etc.)" )file( STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/cupsd.conf.template _conf_template )file( RENAMEsame comment as for "tqt3/src/xml/qxml.cpp" applies here on modifying existing file and then write back
##### restore original cupsd.conf.template ######file( RENAMEas above, do we need to delete original file before renaming from .orig ?
##### change rgb.txt to format as C source ######file( READ "${CMAKE_CURRENT_SOURCE_DIR}/rgb.txt" _colorsRC )file( RENAME "${CMAKE_CURRENT_SOURCE_DIR}/rgb.txt" "${CMAKE_CURRENT_SOURCE_DIR}/rgb.orig" )same comment as for “tqt3/src/xml/qxml.cpp” applies here on modifying existing file and then write back
##### restore original rgb.txt ##################file( RENAME "${CMAKE_CURRENT_SOURCE_DIR}/rgb.orig" "${CMAKE_CURRENT_SOURCE_DIR}/rgb.txt" )as above, do we need to delete original file before renaming from .orig ?
Commits squashed to one and updated to the current TDEL10n module options.
looks ok now
e532d9345d.