Labels Milestones

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 3 years ago

Conversation 0 Commits 3 Files Changed 1

SlavekB commented 3 years 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 3 years ago

52001b9069

tde_create_translated_desktop: Use find_file instead of find_program ...

to find tde_l10n_merge.pl because it does not have the executable
bit set.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

a5baa2c1ab

tde_create_translated_desktop: Avoid confusing paths when processing ...

a desktop file in a binary folder.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1686d0e64e

tde_create_translated_desktop: Instead of preprocessing the desktop ...

file for use with intltool-merge already in the configuration phase,
prepare the file during the custom command call just before calling
intltool-merge. This will allow the natural use of the macro with
the generated files.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

SlavekB referenced this pull request from TDE/tdetoys 3 years ago

Generate kweather station information files during the build phase #11

SlavekB added a new dependency 3 years ago

TDE/tdetoys#11 - Generate kweather station information files during the build phase

MicheleC approved these changes 3 years ago

MicheleC left a comment

Owner

LGTM

LGTM

SlavekB merged commit 1686d0e64e into master 3 years ago

SlavekB added this to the R14.0.10 release milestone 3 years ago

Reviewers

MicheleC approved these changes 3 years ago

The pull request has been merged as 1686d0e64e.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

MicheleC

Labels

Apply labels

Clear labels

GE/need-info
General - need additional info from contributor PR/keep-branch
Pull request - do not delete branch after merging PR/not-ok
Pull request - need fixing PR/rfc
Pull request - request for comments PR/update-trans
Pull request - update to translation files needed PR/wip
Pull request - work in progress RS/R14.0.x
Related to R14.0.x series RS/R14.1.x
Related to R14.1.x series SL/critical
Severity level - critical SL/major
Severity level - major SL/minor
Severity level - minor SL/normal
Severity level - normal SL/regression
Severity level - regression from previous version SL/trivial
Severity level - trivial SL/wishlist
Severity level - wishlist request ST/duplicate
Status - duplicate of another issue ST/invalid
Status - invalid report ST/notourproblem
Status - not our problem ST/rejected
Status - rejected ST/wontfix
Status - won't fix ST/worksforme
Status - works for me, unable to reproduce

No Label GE/need-info PR/keep-branch PR/not-ok PR/rfc PR/update-trans PR/wip RS/R14.0.x RS/R14.1.x SL/critical SL/major SL/minor SL/normal SL/regression SL/trivial SL/wishlist ST/duplicate ST/invalid ST/notourproblem ST/rejected ST/wontfix ST/worksforme

Milestone

Set milestone

Clear milestone

No items

No Milestone

R14.0.10 release

Assignees

Assign users

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Blocks

#11 Generate kweather station information files during the build phase

TDE/tdetoys

Reference: TDE/tde-cmake#68

Write Preview

Loading…

Cancel

Save

There is no content yet.