mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 02:59:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

CPack/RPM: Factor out helper to quote paths in generated rpm spec

Browse Source
This commit is contained in:
Brad King
2023-11-29 12:24:21 -05:00
parent 66149dd1a9
commit 75ea6207b7
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Internal/CPack/CPackRPM.cmake
+14 -5
View File
@@ -54,6 +54,10 @@ macro(set_spec_scripts PACKAGE_NAME)
"${CPACK_RPM_SPEC_PREUNINSTALL}") "${CPACK_RPM_SPEC_PREUNINSTALL}")
endmacro() endmacro()
function(make_rpm_spec_path var path)
set("${var}" "\"${path}\"" PARENT_SCOPE)
endfunction()
function(get_file_permissions FILE RETURN_VAR) function(get_file_permissions FILE RETURN_VAR)
execute_process(COMMAND ls -l ${FILE} execute_process(COMMAND ls -l ${FILE}
OUTPUT_VARIABLE permissions_ OUTPUT_VARIABLE permissions_
@@ -596,7 +600,8 @@ function(cpack_rpm_prepare_install_files INSTALL_FILES_LIST WDIR PACKAGE_PREFIXE
set(DIRECTIVE "%dir ") set(DIRECTIVE "%dir ")
endif() endif()
string(APPEND INSTALL_FILES "${DIRECTIVE}\"${F}\"\n") make_rpm_spec_path(F_SPEC "${F}")
string(APPEND INSTALL_FILES "${DIRECTIVE}${F_SPEC}\n")
endforeach() endforeach()
if(REQUIRES_SYMLINK_RELOCATION_SCRIPT) if(REQUIRES_SYMLINK_RELOCATION_SCRIPT)
@@ -1317,7 +1322,8 @@ function(cpack_rpm_generate_package)
string(APPEND F_PREFIX " ") string(APPEND F_PREFIX " ")
endif() endif()
# Rebuild the user list file # Rebuild the user list file
string(APPEND CPACK_RPM_USER_INSTALL_FILES "${F_PREFIX}\"${F_PATH}\"\n") make_rpm_spec_path(F_SPEC "${F_PATH}")
string(APPEND CPACK_RPM_USER_INSTALL_FILES "${F_PREFIX}${F_SPEC}\n")
# Remove from CPACK_RPM_INSTALL_FILES and CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL # Remove from CPACK_RPM_INSTALL_FILES and CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL
list(REMOVE_ITEM CPACK_RPM_INSTALL_FILES_LIST ${F_PATH}) list(REMOVE_ITEM CPACK_RPM_INSTALL_FILES_LIST ${F_PATH})
@@ -1330,7 +1336,8 @@ function(cpack_rpm_generate_package)
# Rebuild CPACK_RPM_INSTALL_FILES # Rebuild CPACK_RPM_INSTALL_FILES
set(CPACK_RPM_INSTALL_FILES "") set(CPACK_RPM_INSTALL_FILES "")
foreach(F IN LISTS CPACK_RPM_INSTALL_FILES_LIST) foreach(F IN LISTS CPACK_RPM_INSTALL_FILES_LIST)
string(APPEND CPACK_RPM_INSTALL_FILES "\"${F}\"\n") make_rpm_spec_path(F_SPEC "${F}")
string(APPEND CPACK_RPM_INSTALL_FILES "${F_SPEC}\n")
endforeach() endforeach()
else() else()
set(CPACK_RPM_USER_INSTALL_FILES "") set(CPACK_RPM_USER_INSTALL_FILES "")
@@ -1351,12 +1358,14 @@ function(cpack_rpm_generate_package)
# Rebuild INSTALL_FILES # Rebuild INSTALL_FILES
set(CPACK_RPM_INSTALL_FILES "") set(CPACK_RPM_INSTALL_FILES "")
foreach(F IN LISTS CPACK_RPM_INSTALL_FILES_LIST) foreach(F IN LISTS CPACK_RPM_INSTALL_FILES_LIST)
string(APPEND CPACK_RPM_INSTALL_FILES "\"${F}\"\n") make_rpm_spec_path(F_SPEC "${F}")
string(APPEND CPACK_RPM_INSTALL_FILES "${F_SPEC}\n")
endforeach() endforeach()
# Build ABSOLUTE_INSTALL_FILES # Build ABSOLUTE_INSTALL_FILES
set(CPACK_RPM_ABSOLUTE_INSTALL_FILES "") set(CPACK_RPM_ABSOLUTE_INSTALL_FILES "")
foreach(F IN LISTS CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL) foreach(F IN LISTS CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL)
string(APPEND CPACK_RPM_ABSOLUTE_INSTALL_FILES "%config \"${F}\"\n") make_rpm_spec_path(F_SPEC "${F}")
string(APPEND CPACK_RPM_ABSOLUTE_INSTALL_FILES "%config ${F_SPEC}\n")
endforeach() endforeach()
if(CPACK_RPM_PACKAGE_DEBUG) if(CPACK_RPM_PACKAGE_DEBUG)
message("CPackRPM:Debug: CPACK_RPM_ABSOLUTE_INSTALL_FILES=${CPACK_RPM_ABSOLUTE_INSTALL_FILES}") message("CPackRPM:Debug: CPACK_RPM_ABSOLUTE_INSTALL_FILES=${CPACK_RPM_ABSOLUTE_INSTALL_FILES}")