mirror of
https://github.com/curl/curl.git
synced 2026-07-10 02:07:15 +03:00
cmake: replace deprecated remove command with rm and pass arg safely
All curl-supported CMake versions support the modern method, along with the `--` marker. Also: - make sure to pass `-f` to not fail if the file is missing, as before this patch. - drop now redundant `OUTPUT_QUIET`, `ERROR_QUIET` and error handling in `cmake_uninstall`. - move filename to end of the error message for readability. - GHA/linux: test these two 'clean' targets in the aws-lc job. Refs: https://cmake.org/cmake/help/v4.4/manual/cmake.1.html#cmdoption-cmake-E-arg-remove https://cmake.org/cmake/help/v3.18/manual/cmake.1.html#run-a-command-line-tool Closes #22193
This commit is contained in:
parent
a7e8016fa2
commit
6d008352c6
3 changed files with 10 additions and 12 deletions
8
.github/workflows/linux.yml
vendored
8
.github/workflows/linux.yml
vendored
|
|
@ -79,7 +79,7 @@ jobs:
|
|||
|
||||
- name: 'awslc'
|
||||
install_packages: libidn2-dev
|
||||
install_steps: awslc
|
||||
install_steps: awslc clean
|
||||
generate: -DOPENSSL_ROOT_DIR=/home/runner/awslc -DUSE_ECH=ON -DCMAKE_UNITY_BUILD=OFF -DCURL_DROP_UNUSED=ON -DCURL_PATCHSTAMP=test-patch -DCURL_ENABLE_NTLM=ON
|
||||
|
||||
- name: 'boringssl'
|
||||
|
|
@ -916,6 +916,9 @@ jobs:
|
|||
run: |
|
||||
if [ "${MATRIX_BUILD}" = 'cmake' ]; then
|
||||
cmake --install bld --strip
|
||||
if [[ "${MATRIX_INSTALL_STEPS}" = *'clean'* ]]; then
|
||||
cmake --build bld --target curl_uninstall
|
||||
fi
|
||||
else
|
||||
make -C bld V=1 install
|
||||
fi
|
||||
|
|
@ -962,6 +965,9 @@ jobs:
|
|||
fi
|
||||
if [ "${MATRIX_BUILD}" = 'cmake' ]; then
|
||||
cmake --build bld --verbose --target "${TEST_TARGET}"
|
||||
if [[ "${MATRIX_INSTALL_STEPS}" = *'clean'* ]]; then
|
||||
cmake --build bld --target clean-certs
|
||||
fi
|
||||
else
|
||||
make -C bld V=1 "${TEST_TARGET}"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -35,16 +35,8 @@ string(REGEX REPLACE "\n" ";" _files "${_files}")
|
|||
foreach(_file ${_files})
|
||||
message(STATUS "Uninstalling $ENV{DESTDIR}${_file}")
|
||||
if(IS_SYMLINK "$ENV{DESTDIR}${_file}" OR EXISTS "$ENV{DESTDIR}${_file}")
|
||||
execute_process(
|
||||
COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${_file}"
|
||||
RESULT_VARIABLE rm_retval
|
||||
OUTPUT_QUIET
|
||||
ERROR_QUIET
|
||||
)
|
||||
if(NOT "${rm_retval}" STREQUAL 0)
|
||||
message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${_file}")
|
||||
endif()
|
||||
execute_process(COMMAND "@CMAKE_COMMAND@" -E rm -f -- "$ENV{DESTDIR}${_file}")
|
||||
else()
|
||||
message(STATUS "File $ENV{DESTDIR}${_file} does not exist.")
|
||||
message(STATUS "File does not exist: $ENV{DESTDIR}${_file}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ if(NOT _CURL_SKIP_BUILD_CERTS)
|
|||
endif()
|
||||
|
||||
add_custom_target(clean-certs
|
||||
COMMAND ${CMAKE_COMMAND} -E remove ${GENERATEDCERTS}
|
||||
COMMAND ${CMAKE_COMMAND} -E rm -f ${GENERATEDCERTS}
|
||||
"test-*.csr"
|
||||
"test-*.der"
|
||||
"test-*.keyenc"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue