Remove CMakeLists.txt in doc/ and translations/ #5

Merged
SlavekB merged 1 commits from rfc/docs_translations_macros into master 3 years ago
Ray-V commented 3 years ago
Collaborator

.desktop files generation is not implemented from a local CMakeLists.txt.
As the CMakeLists.txt for translations and docs are now one-liners, wouldn't it make sense to also remove those and incorporate the macro call in the CMakeLists.txt in the source root directory?

I've used kvpnc as the test-bed for this because it has doc/man, doc/misc, and translations/messages already set up.

  • It needs to be run with the cmake rfc/docs_translations_macros branch for the TDEMacros.cmake diffs.
  • All CMakeLists.txt in the doc and translations trees removed.
  • Made the macros/functions conditional depending on whether BUILD_DOC or BUILD_TRANSLATIONS are set.
  • Added the misc cmake rules to tde_conditional_add_project_docs().
  • I'm not familiar with the use of regex, and the REGEX REPLACE strings will probably need some tidying up.
    Just to clarify here, under these common rules, the source .po files are translations/messages/lang.po.

These additions are for testing and won't feature in any final PR:

  • I've left in my message() markers which I use to find out what cmake is up to.
  • Knemo is an example of a special case - docs are installed under kcontrol, and translations as knemod.mo and kcm_knemo.mo.
    To demonstrate that doc/en/kcontrol installs correctly, I've copied it to here so that it's included in the build.
    I also did a test build with the knemo translations added, and they installed correctly.

For kdbg, for example, the doc directory would have to be moved up a level from the kdbg subdirectory.
But then that would be a good thing, to have the doc and translations sources in the same relative positions in the source tree for all applications.

.desktop files generation is not implemented from a local CMakeLists.txt. As the CMakeLists.txt for translations and docs are now one-liners, wouldn't it make sense to also remove those and incorporate the macro call in the CMakeLists.txt in the source root directory? I've used kvpnc as the test-bed for this because it has doc/man, doc/misc, and translations/messages already set up. * It needs to be run with the cmake *rfc/docs_translations_macros* branch for the TDEMacros.cmake diffs. * All CMakeLists.txt in the doc and translations trees removed. * Made the macros/functions conditional depending on whether BUILD_DOC or BUILD_TRANSLATIONS are set. * Added the misc cmake rules to *tde_conditional_add_project_docs()*. * I'm not familiar with the use of regex, and the *REGEX REPLACE* strings will probably need some tidying up. Just to clarify here, under these common rules, the source .po files are *translations/messages/lang.po*. These additions are for testing and won't feature in any final PR: * I've left in my *message()* markers which I use to find out what cmake is up to. * Knemo is an example of a special case - docs are installed under kcontrol, and translations as knemod.mo and kcm_knemo.mo. To demonstrate that doc/en/kcontrol installs correctly, I've copied it to here so that it's included in the build. I also did a test build with the knemo translations added, and they installed correctly. For kdbg, for example, the doc directory would have to be moved up a level from the kdbg subdirectory. But then that would be a good thing, to have the doc and translations sources in the same relative positions in the source tree for all applications.
Ray-V added the PR/rfc label 3 years ago
Ray-V added 1 commit 3 years ago
0195136bda
Remove CMakeLists.txt for doc and translations
Ray-V commented 3 years ago
Poster
Collaborator

I was going to update this PR to a merge candidate now that cmake pull 72 has been merged, but I can't log in.

Expect:

Username for 'https://mirror.git.trinitydesktop.org': xxx
Password for 'https://xxx@mirror.git.trinitydesktop.org': pw

Actually get:

Username for 'https://mirror.git.trinitydesktop.org': xxx
xxx@mirror.git.trinitydesktop.org': pw
remote: invalid credentials from aa.bb.ccc.ddd:0
fatal: Authentication failed for 'https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc/'

Is the problem with me or the server?

I was going to update this PR to a merge candidate now that cmake pull 72 has been merged, but I can't log in. Expect: ``` Username for 'https://mirror.git.trinitydesktop.org': xxx Password for 'https://xxx@mirror.git.trinitydesktop.org': pw ``` Actually get: ``` Username for 'https://mirror.git.trinitydesktop.org': xxx xxx@mirror.git.trinitydesktop.org': pw remote: invalid credentials from aa.bb.ccc.ddd:0 fatal: Authentication failed for 'https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc/' ``` Is the problem with me or the server?
Owner

I don't know about any problem – I tried fetch and push (although there were no changes on my side) and everything went well.

I don't know about any problem – I tried fetch and push (although there were no changes on my side) and everything went well.
Owner

As you can see on TDE/k3b-i18n#1, I pushed committs without problems. https with authorization was also used to push it.

As you can see on TDE/k3b-i18n#1, I pushed committs without problems. https with authorization was also used to push it.
Ray-V force-pushed rfc/docs_translations_macros from 0195136bda to df31e02c1f 3 years ago
Ray-V changed title from WIP: Remove CMakeLists.txt in doc/ and translations/ to Remove CMakeLists.txt in doc/ and translations/ 3 years ago
Ray-V removed the PR/rfc label 3 years ago
Ray-V commented 3 years ago
Poster
Collaborator

Whatever the login problem was, it's cleared up now.

Removed kcontrol test case.

Changes are now:

  • Removed CMakeLists.txt in the doc/ and translations/ trees
  • Removed and added macro calls in top level CMakeLists.txt
  • Moved doc/tdeioslave/en/pcf to doc/en/tdeioslave/pcf
Whatever the login problem was, it's cleared up now. Removed kcontrol test case. Changes are now: * Removed CMakeLists.txt in the doc/ and translations/ trees * Removed and added macro calls in top level CMakeLists.txt * Moved doc/tdeioslave/en/pcf to doc/en/tdeioslave/pcf
SlavekB approved these changes 3 years ago
SlavekB left a comment
Owner

It looks good. Files from doc/misc have not previously installed, now are installed, and it seems like a good idea.

It looks good. Files from `doc/misc` have not previously installed, now are installed, and it seems like a good idea.
Owner

Well done Ray, thanks for the good work.

Well done Ray, thanks for the good work.
SlavekB merged commit df31e02c1f into master 3 years ago
SlavekB deleted branch rfc/docs_translations_macros 3 years ago
SlavekB added this to the R14.0.11 release milestone 3 years ago

Reviewers

SlavekB approved these changes 3 years ago
The pull request has been merged as df31e02c1f.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 Participants
Notifications
Due Date

No due date set.

Depends on
Reference: TDE/kvpnc#5
Loading…
There is no content yet.