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

Merge topic 'cpackrpm-debuginfo-single-package-install-erase-scripts'

Browse Source 
31c184ad69 CPackRPM: handle scripts in debuginfo single package mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5953
This commit is contained in:
Brad King
2021-04-01 14:25:07 +00:00
committed by Kitware Robot
parent c5bd2e3b6d 31c184ad69
commit ac79fd8a0e
7 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1643,6 +1643,25 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
%description -n \@CPACK_RPM_PACKAGE_NAME\@
\@CPACK_RPM_PACKAGE_DESCRIPTION\@
%post -n \@CPACK_RPM_PACKAGE_NAME\@
\@RPM_SYMLINK_POSTINSTALL\@
\@CPACK_RPM_SPEC_POSTINSTALL\@
%posttrans -n \@CPACK_RPM_PACKAGE_NAME\@
\@CPACK_RPM_SPEC_POSTTRANS\@
%postun -n \@CPACK_RPM_PACKAGE_NAME\@
\@CPACK_RPM_SPEC_POSTUNINSTALL\@
%pre -n \@CPACK_RPM_PACKAGE_NAME\@
\@CPACK_RPM_SPEC_PREINSTALL\@
%pretrans -n \@CPACK_RPM_PACKAGE_NAME\@
\@CPACK_RPM_SPEC_PRETRANS\@
%preun -n \@CPACK_RPM_PACKAGE_NAME\@
\@CPACK_RPM_SPEC_PREUNINSTALL\@
%files -n \@CPACK_RPM_PACKAGE_NAME\@
%defattr(\@TMP_DEFAULT_FILE_PERMISSIONS\@,\@TMP_DEFAULT_USER\@,\@TMP_DEFAULT_GROUP\@,\@TMP_DEFAULT_DIR_PERMISSIONS\@)
\@CPACK_RPM_INSTALL_FILES\@

7
Tests/RunCMake/CPack/RPM/Prerequirements.cmake
View File

@@ -13,4 +13,11 @@ function(get_test_prerequirements found_var config_file)
"\nset(RPMBUILD_EXECUTABLE \"${RPMBUILD_EXECUTABLE}\")")
set(${found_var} true PARENT_SCOPE)
endif()
# optional tool for some tests
find_program(OBJDUMP_EXECUTABLE objdump)
if(OBJDUMP_EXECUTABLE)
file(APPEND "${config_file}"
"\nset(OBJDUMP_EXECUTABLE \"${OBJDUMP_EXECUTABLE}\")")
endif()
endfunction()

2
Tests/RunCMake/CPack/RunCMakeTest.cmake
View File

@@ -16,7 +16,7 @@ run_cpack_test(VERSION "RPM.VERSION;DEB.VERSION" false "MONOLITHIC;COMPONENT")
run_cpack_test(EXTRA "DEB.EXTRA" false "COMPONENT")
run_cpack_test_subtests(GENERATE_SHLIBS "soversion_not_zero;soversion_zero" "DEB.GENERATE_SHLIBS" true "COMPONENT")
run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB.GENERATE_SHLIBS_LDCONFIG" true "COMPONENT")
run_cpack_test(INSTALL_SCRIPTS "RPM.INSTALL_SCRIPTS" false "COMPONENT")
run_cpack_test_subtests(INSTALL_SCRIPTS "default;single_debug_info" "RPM.INSTALL_SCRIPTS" false "COMPONENT")
run_cpack_test(LONG_FILENAMES "DEB.LONG_FILENAMES" false "MONOLITHIC")
run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM.MAIN_COMPONENT" false "COMPONENT")
run_cpack_test(MINIMAL "RPM.MINIMAL;DEB.MINIMAL;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ;External" false "MONOLITHIC;COMPONENT")

7
Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
View File

@@ -1,5 +1,10 @@
if(RunCMake_SUBTEST_SUFFIX STREQUAL "single_debug_info")
set(EXPECTED_FILE_1 "install_scripts-0.1.1-1.*.rpm")
else()
set(EXPECTED_FILE_1_COMPONENT "foo")
endif()
set(EXPECTED_FILES_COUNT "2")
set(EXPECTED_FILE_1_COMPONENT "foo")
set(EXPECTED_FILE_CONTENT_1_LIST "/foo;/foo/CMakeLists.txt")
set(EXPECTED_FILE_2_COMPONENT "bar")
set(EXPECTED_FILE_CONTENT_2_LIST "/bar;/bar/CMakeLists.txt")

1
Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-single_debug_info-stderr.txt Normal file
View File

@@ -0,0 +1 @@
.*

11
Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake Normal file
View File

@@ -0,0 +1,11 @@
function(get_test_prerequirements found_var config_file)
if(SUBTEST_SUFFIX STREQUAL "single_debug_info")
include(${config_file})
if(OBJDUMP_EXECUTABLE)
set(${found_var} true PARENT_SCOPE)
endif()
else()
set(${found_var} true PARENT_SCOPE)
endif()
endfunction()

6
Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
View File

@@ -24,6 +24,12 @@ if(GENERATOR_TYPE STREQUAL "RPM")
"${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh")
set(CPACK_RPM_foo_POST_TRANS_SCRIPT_FILE
"${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh")
if(RunCMake_SUBTEST_SUFFIX STREQUAL "single_debug_info")
set(CPACK_RPM_MAIN_COMPONENT "foo")
set(CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE ON)
set(CPACK_RPM_FOO_FILE_NAME "RPM-DEFAULT")
endif()
endif()
set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)