Improve tde-create-translated-desktop for generated source files #68

Merged
SlavekB merged 3 commits from feat/create-translate-desktop-from-generated-source into master 1 year ago
SlavekB commented 1 year ago
Owner

This PR solves several things:

  1. Newer versions of CMake may display a warning when find_program is used for a script that does not have the executable bit set. This relates to incorporated intltool-merge, see commit 53c7e28984.

  2. When used on a generated desktop file – a file located in CMAKE_BINARY_DIR – this caused the working files to be generated in a confusing folder structure. Although it did not affect functionality, it is better if they are generated in the right place.

  3. To use intltool-merge, desktop file preprocessing was performed there already in the configuration phase. This made it impossible to use macro for generated desktop files. Respectively, such desktop files also had to be generated already in the configuration phase. This causes warning messages when using ninja-build. Therefore, it is better that everything can take place naturally in the build phase.

This PR solves several things: 1. Newer versions of CMake may display a warning when `find_program` is used for a script that does not have the executable bit set. This relates to incorporated `intltool-merge`, see commit 53c7e28984. 2. When used on a generated desktop file – a file located in `CMAKE_BINARY_DIR` – this caused the working files to be generated in a confusing folder structure. Although it did not affect functionality, it is better if they are generated in the right place. 3. To use `intltool-merge`, desktop file preprocessing was performed there already in the configuration phase. This made it impossible to use macro for generated desktop files. Respectively, such desktop files also had to be generated already in the configuration phase. This causes warning messages when using `ninja-build`. Therefore, it is better that everything can take place naturally in the build phase.
SlavekB added 3 commits 1 year ago
52001b9069
tde_create_translated_desktop: Use find_file instead of find_program
a5baa2c1ab
tde_create_translated_desktop: Avoid confusing paths when processing
1686d0e64e
tde_create_translated_desktop: Instead of preprocessing the desktop
MicheleC approved these changes 1 year ago
MicheleC left a comment
Owner

LGTM

LGTM
SlavekB merged commit 1686d0e64e into master 1 year ago
SlavekB added this to the R14.0.10 release milestone 1 year ago

Reviewers

MicheleC approved these changes 1 year ago
The pull request has been merged as 1686d0e64e.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Loading…
There is no content yet.