#1 cmake conversion

Merged
SlavekB merged 2 commits from feat/cmakeConv into master 8 months ago
cethyel commented 8 months ago

Tell me what you think… Cheers. @+

Tell me what you think... Cheers. @+
SlavekB self-assigned this 8 months ago
MicheleC commented 8 months ago
Owner

Hi Greg,
I just tried a build in buster of the cmake version.
As is, it won’t build. It will fail with a

make[1]: Entering directory '/build/kcpuload-trinity-14.1.0~s15'
make[1]: admin/Makefile.common: No such file or directory
make[1]: *** No rule to make target 'admin/Makefile.common'.  Stop.

error message.
I have not investigated further, will leave that to you and Slavek, while I prefer to work on other things.
I will be happy to test further if required.
If anything is required on the tde-packaging side, please create a PR also on that repository with reference to this PR.

Hi Greg,<br> I just tried a build in buster of the cmake version. <br> As is, it won't build. It will fail with a <br> ~~~ make[1]: Entering directory '/build/kcpuload-trinity-14.1.0~s15' make[1]: admin/Makefile.common: No such file or directory make[1]: *** No rule to make target 'admin/Makefile.common'. Stop. ~~~ error message.<br> I have not investigated further, will leave that to you and Slavek, while I prefer to work on other things.<br> I will be happy to test further if required.<br> If anything is required on the tde-packaging side, please create a PR also on that repository with reference to this PR.
SlavekB commented 8 months ago
Owner

@MicheleC this result is as expected because it is necessary to modify the files for Debian packaging. I’m already working on it. That’s why I assigned this PR to myself :)

@MicheleC this result is *as expected* because it is necessary to modify the files for Debian packaging. I'm already working on it. That's why I assigned this PR to myself :)
cethyel commented 8 months ago
Poster

Hello my good man :-)

Here is how to test things on Slackware:

git clone gitea@mirror.git.trinitydesktop.org:TDE/kcpuload.git

cd kcpuload

git checkout feat/cmakeConv

git clone gitea@mirror.git.trinitydesktop.org:TDE/tde-common-cmake.git

cp -R tde-common-cmake/* cmake/

mkdir -p build && cd build

cmake ../ && make

Gosh! Didn’t have the time to finish this, slavek is already on It!

Hello my good man :-) Here is how to test things on Slackware: git clone gitea@mirror.git.trinitydesktop.org:TDE/kcpuload.git cd kcpuload git checkout feat/cmakeConv git clone gitea@mirror.git.trinitydesktop.org:TDE/tde-common-cmake.git cp -R tde-common-cmake/* cmake/ mkdir -p build && cd build cmake ../ && make Gosh! Didn't have the time to finish this, slavek is already on It!
SlavekB commented 8 months ago
Owner

I’ve done one small patch about installing the icons used inside the application - see commit 16a6ddcdd4. Otherwise your patch looks fine and I do not see any obstacle to merging.

Note: You can use a simpler procedure to get submodules:

sed -i "s|https\?://\(system@\)\?scm.trinitydesktop.org/scm/git/|gitea@mirror.git.trinitydesktop.org:TDE/|" .gitmodules
git submodule update
git submodule init
I've done one small patch about installing the icons used inside the application - see commit 16a6ddcdd4. Otherwise your patch looks fine and I do not see any obstacle to merging. Note: You can use a simpler procedure to get submodules: ``` sed -i "s|https\?://\(system@\)\?scm.trinitydesktop.org/scm/git/|gitea@mirror.git.trinitydesktop.org:TDE/|" .gitmodules git submodule update git submodule init ```
cethyel commented 8 months ago
Poster

I didn’t build It yet, but from what I see, you must have followed the same path that the autotools do.

I’ve had this question since yesterday, so I’ll ask.

What about xdg compliance? Shouldn’t all the icons go into /usr/share/icons ?

I didn't build It yet, but from what I see, you must have followed the same path that the autotools do. I've had this question since yesterday, so I'll ask. What about xdg compliance? Shouldn't all the icons go into /usr/share/icons ?
cethyel commented 8 months ago
Poster

I’ve planed to add a man page for kcpuload (retrieved from an ubuntu source package).

What cmake command should I use?

At the moment, I’ve tested It like this:

INSTALL(

FILES ${PROJECT_NAME}.1
DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1

)

I've planed to add a man page for kcpuload (retrieved from an ubuntu source package). What cmake command should I use? At the moment, I've tested It like this: INSTALL( FILES ${PROJECT_NAME}.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1 )
SlavekB commented 8 months ago
Owner

About comment 212: These are icons for application-specific actions. Therefore, I consider the location in ${PREFIX}/share/apps/<application>/icons to be reasonable.

About comment 213: Yes, it looks right. Only minor edits - here it is more appropriate to use a variable for installing man pages:

INSTALL(
  FILES ${PROJECT_NAME}.1
  DESTINATION ${MAN_INSTALL_DIR}/man1
  COMPONENT doc
)
About comment [212](pulls/1#issuecomment-212): These are icons for application-specific actions. Therefore, I consider the location in ${PREFIX}/share/apps/\<application\>/icons to be reasonable. About comment [213](pulls/1#issuecomment-213): Yes, it looks right. Only minor edits - here it is more appropriate to use a variable for installing man pages: ``` INSTALL( FILES ${PROJECT_NAME}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc ) ```
cethyel commented 8 months ago
Poster

Gotcha! I’m off for today…I’ll submit tomorrow for the man page.

Maybe, I should wait for you to merge and then submit a new PR.

I’ll probably add the page in kcpuload/doc/man

See you, but later!

Gotcha! I'm off for today...I'll submit tomorrow for the man page. Maybe, I should wait for you to merge and then submit a new PR. I'll probably add the page in kcpuload/doc/man See you, but later!
SlavekB commented 8 months ago
Owner

Merged and pushed upstream.

Merged and pushed upstream.
SlavekB deleted branch feat/cmakeConv 8 months ago
SlavekB added this to the R14.0.6 release milestone 8 months ago
MicheleC commented 8 months ago
Owner

Sorry guys, went to bed and couldn’t follow up yesterday :-)
I suggest all cmake conversions to go only to R14.1 series, no R14.0.
cmake conversions are not minor changes IMO and should not be part of a maintenance release.
What do you think?

Sorry guys, went to bed and couldn't follow up yesterday :-)<br> I suggest all cmake conversions to go only to R14.1 series, no R14.0.<br> cmake conversions are not minor changes IMO and should not be part of a maintenance release.<br> What do you think?
MicheleC commented 8 months ago
Owner

Discussed with Slavek. Ok to add to R14.0.x series :smile:

Discussed with Slavek. Ok to add to R14.0.x series :smile:
The pull request has been merged.
Sign in to join this conversation.
Loading…
Cancel
Save
There is no content yet.