mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'rpm-quoting'

Browse Source 
5123e9e160 ci: unmask RPM tests on Fedora 39
bf22ac5263 CPack/RPM: Quote paths in rpm spec only if they have whitespace
75ea6207b7 CPack/RPM: Factor out helper to quote paths in generated rpm spec

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9005
This commit is contained in:
Brad King
2023-11-30 14:05:38 +00:00
committed by Kitware Robot
parent fb0fe889a5 5123e9e160
commit a1dcc36f65
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab/ci/ctest_exclusions.cmake
View File

@@ -34,15 +34,6 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "nvhpc_")
)
endif()
if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "fedora39_makefiles")
list(APPEND test_exclusions
# FIXME(#25421): CPack/RPM needs an update for Fedora 39.
"^CPackComponentsForAll-RPM-default$"
"^CPackComponentsForAll-RPM-AllInOne$"
"^CPackComponentsForAll-RPM-OnePackPerGroup$"
)
endif()
string(REPLACE ";" "|" test_exclusions "${test_exclusions}")
if (test_exclusions)
set(test_exclusions "(${test_exclusions})")

24
Modules/Internal/CPack/CPackRPM.cmake
View File

@@ -54,6 +54,15 @@ macro(set_spec_scripts PACKAGE_NAME)
"${CPACK_RPM_SPEC_PREUNINSTALL}")
endmacro()
function(make_rpm_spec_path var path)
# RPM supports either whitespace with quoting or globbing without quoting.
if(path MATCHES "[ \t]")
set("${var}" "\"${path}\"" PARENT_SCOPE)
else()
set("${var}" "${path}" PARENT_SCOPE)
endif()
endfunction()
function(get_file_permissions FILE RETURN_VAR)
execute_process(COMMAND ls -l ${FILE}
OUTPUT_VARIABLE permissions_
@@ -596,7 +605,8 @@ function(cpack_rpm_prepare_install_files INSTALL_FILES_LIST WDIR PACKAGE_PREFIXE
set(DIRECTIVE "%dir ")
endif()
string(APPEND INSTALL_FILES "${DIRECTIVE}\"${F}\"\n")
make_rpm_spec_path(F_SPEC "${F}")
string(APPEND INSTALL_FILES "${DIRECTIVE}${F_SPEC}\n")
endforeach()
if(REQUIRES_SYMLINK_RELOCATION_SCRIPT)
@@ -1317,7 +1327,8 @@ function(cpack_rpm_generate_package)
string(APPEND F_PREFIX " ")
endif()
# 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
list(REMOVE_ITEM CPACK_RPM_INSTALL_FILES_LIST ${F_PATH})
@@ -1330,7 +1341,8 @@ function(cpack_rpm_generate_package)
# Rebuild CPACK_RPM_INSTALL_FILES
set(CPACK_RPM_INSTALL_FILES "")
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()
else()
set(CPACK_RPM_USER_INSTALL_FILES "")
@@ -1351,12 +1363,14 @@ function(cpack_rpm_generate_package)
# Rebuild INSTALL_FILES
set(CPACK_RPM_INSTALL_FILES "")
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()
# Build ABSOLUTE_INSTALL_FILES
set(CPACK_RPM_ABSOLUTE_INSTALL_FILES "")
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()
if(CPACK_RPM_PACKAGE_DEBUG)
message("CPackRPM:Debug: CPACK_RPM_ABSOLUTE_INSTALL_FILES=${CPACK_RPM_ABSOLUTE_INSTALL_FILES}")