Conversion to cmake building system
#13
Merged
MicheleC
merged 1 commits from feat/cmake-conversion
into master
12 months ago
Loading…
Reference in New Issue
There is no content yet.
Delete Branch 'feat/cmake-conversion'
Deleting a branch is permanent. It CANNOT be undone. Continue?
MicheleC referenced this pull request from TDE/tde-packaging 1 year ago5448f4d01e
tof5e2964bc2
1 year agoIt looks good. There are some notes to consider.
Originally I hesitated that if we want to change shebang to python3, but it is true that it does not matter – probably other supported distributions also provide such a binary name.
@ -0,0 +53,4 @@
OUTPUT_VARIABLE PYTHON_SETUP_TOOLS_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string( REGEX REPLACE "\\['(.*)'\\]" "\\1" PYTHON_SETUP_TOOLS_DIR2 ${PYTHON_SETUP_TOOLS_DIR} )
Can it be easier to have the processing already done on the python side?
Yes, I also wanted to do the same update after the work we did for python 3.12.
@ -0,0 +31,4 @@
unset( _MODULEDIR_ )
unset( _EXTRAMODULE_ )
unset( _MODULENAME_ )
unset( _FACTORYFUNCTION_ )
This seems unnecessary. The variables have the validity scope just the current level and below, so they will disappear automatically.
@ -0,0 +60,4 @@
##### other files
tde_create_translated_desktop(
SOURCE mountconfig.desktop
Another place to use
${MODULE_NAME}
?@ -0,0 +82,4 @@
link_${MODULE_NAME} ALL COMMAND ${CMAKE_COMMAND} -E create_symlink
${TDE_GUIDANCE_DIST_PKG_PATH}/${MODULE_NAME}.py ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}
)
install(
This could be replaced by using the macro
tde_install_symlink(...)
?@ -0,0 +30,4 @@
unset( _MODULEDIR_ )
unset( _EXTRAMODULE_ )
unset( _MODULENAME_ )
unset( _FACTORYFUNCTION_ )
This seems unnecessary. The variables have the validity scope just the current level and below, so they will disappear automatically.
@ -0,0 +45,4 @@
##### other files
tde_create_translated_desktop(
SOURCE serviceconfig.desktop
Another place to use
${MODULE_NAME}
?@ -0,0 +50,4 @@
)
install(
PROGRAMS serviceconfig.py
Another place to use
${MODULE_NAME}
?@ -0,0 +58,4 @@
link_${MODULE_NAME} ALL COMMAND ${CMAKE_COMMAND} -E create_symlink
${TDE_GUIDANCE_DIST_PKG_PATH}/${MODULE_NAME}.py ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}
)
install(
This could be replaced by using the macro
tde_install_symlink(...)
?@ -0,0 +30,4 @@
unset( _MODULEDIR_ )
unset( _EXTRAMODULE_ )
unset( _MODULENAME_ )
unset( _FACTORYFUNCTION_ )
This seems unnecessary. The variables have the validity scope just the current level and below, so they will disappear automatically.
@ -0,0 +45,4 @@
##### other files
tde_create_translated_desktop(
SOURCE userconfig.desktop
Another place to use
${MODULE_NAME}
?@ -0,0 +58,4 @@
link_${MODULE_NAME} ALL COMMAND ${CMAKE_COMMAND} -E create_symlink
${TDE_GUIDANCE_DIST_PKG_PATH}/${MODULE_NAME}.py ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}
)
install(
This could be replaced by using the macro
tde_install_symlink(...)
?f5e2964bc2
toa8bb561e77
1 year agoPR updated as per feedback and rebased.
I did a test on Debian 10 (Buster) and because I got FTBFS, I added a second commit to solve the problem. At the same time, I modified the detection of pythonize library to be detected as a library, instead of detection as a file. If you are satisfied with it, you can do squash because there is no need to be merged as two separate commits.
1cbc95e47f
tocc7bc3c507
1 year agoOne more additional adjustment: Auxiliary python modules that are used as
import <module>
and are not called as separate commands do not need executable permission. That's why I moved the installation fromPROGRAMS
toFILES
.cc7bc3c507
to1d721906e5
12 months ago1d721906e5
to95f2a2d8b5
12 months agoAll looks good.
95f2a2d8b5
into master 12 months agoReviewers
95f2a2d8b5
.