This is an automated email from the ASF dual-hosted git repository. masaori pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push: new f180ea2b6f CMake: use --git-common-dir to find the git dir (#11015) f180ea2b6f is described below commit f180ea2b6f25f6922c881b60d70cef68db1acac5 Author: Masaori Koshiba <masa...@apache.org> AuthorDate: Tue Jan 30 10:01:34 2024 +0900 CMake: use --git-common-dir to find the git dir (#11015) --- CMakeLists.txt | 4 +++- tools/autopep8.sh | 6 ++++-- tools/clang-format.sh | 7 +++++-- tools/cmake-format.sh | 6 ++++-- tools/yapf.sh | 6 ++++-- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a790c65377..3049bbada3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -649,11 +649,13 @@ if(ENABLE_BENCHMARKS) add_subdirectory(tools/benchmark) endif() +set(GIT_COMMON_DIR git rev-parse --git-common-dir) + add_custom_target( clang-format-install COMMAND ${CMAKE_SOURCE_DIR}/tools/clang-format.sh --install WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - BYPRODUCTS ${CMAKE_SOURCE_DIR}/.git/fmt/.clang-format-installed + BYPRODUCTS ${GIT_COMMON_DIR}/fmt/.clang-format-installed COMMENT "Installing clang-format" VERBATIM ) diff --git a/tools/autopep8.sh b/tools/autopep8.sh index 46ad7879a1..614ec93718 100755 --- a/tools/autopep8.sh +++ b/tools/autopep8.sh @@ -39,7 +39,8 @@ function main() { pip install -q virtualenv fi - AUTOPEP8_VENV=${AUTOPEP8_VENV:-$(cd $(dirname $0) && git rev-parse --show-toplevel)/.git/fmt/autopep8_${AUTOPEP8_VERSION}_venv} + GIT_COMMON_DIR=$(cd $(dirname $0) && git rev-parse --path-format=absolute --git-common-dir) + AUTOPEP8_VENV=${AUTOPEP8_VENV:-${GIT_COMMON_DIR}/fmt/autopep8_${AUTOPEP8_VERSION}_venv} if [ ! -e ${AUTOPEP8_VENV} ] then virtualenv ${AUTOPEP8_VENV} @@ -101,5 +102,6 @@ function main() { if [[ "$(basename -- "$0")" == 'autopep8.sh' ]]; then main "$@" else - AUTOPEP8_VENV=${AUTOPEP8_VENV:-$(git rev-parse --show-toplevel)/.git/fmt/autopep8_${AUTOPEP8_VERSION}_venv} + GIT_COMMON_DIR=$(git rev-parse --path-format=absolute --git-common-dir) + AUTOPEP8_VENV=${AUTOPEP8_VENV:-${GIT_COMMON_DIR}/fmt/autopep8_${AUTOPEP8_VERSION}_venv} fi diff --git a/tools/clang-format.sh b/tools/clang-format.sh index 86bb698af4..866c1fde46 100755 --- a/tools/clang-format.sh +++ b/tools/clang-format.sh @@ -23,7 +23,9 @@ PKGDATE="20230928" function main() { set -e # exit on error - ROOT=${ROOT:-$(cd $(dirname $0) && git rev-parse --show-toplevel)/.git/fmt/${PKGDATE}} + + GIT_COMMON_DIR=$(cd $(dirname $0) && git rev-parse --path-format=absolute --git-common-dir) + ROOT=${ROOT:-${GIT_COMMON_DIR}/fmt/${PKGDATE}} # The presence of this file indicates clang-format was successfully installed. INSTALLED_SENTINEL=${ROOT}/.clang-format-installed @@ -117,5 +119,6 @@ EOF if [[ "$(basename -- "$0")" == 'clang-format.sh' ]]; then main "$@" else - ROOT=${ROOT:-$(git rev-parse --show-toplevel)/.git/fmt/${PKGDATE}} + GIT_COMMON_DIR=$(git rev-parse --path-format=absolute --git-common-dir) + ROOT=${ROOT:-${GIT_COMMON_DIR}/fmt/${PKGDATE}} fi diff --git a/tools/cmake-format.sh b/tools/cmake-format.sh index c662d9aa4d..2b8ee00ba4 100755 --- a/tools/cmake-format.sh +++ b/tools/cmake-format.sh @@ -33,7 +33,8 @@ function main() { pip install -q virtualenv fi - CMAKE_FORMAT_VENV=${CMAKE_FORMAT_VENV:-$(cd $(dirname $0) && git rev-parse --show-toplevel)/.git/fmt/cmake_format_${CMAKE_FORMAT_VERSION}_venv} + GIT_COMMON_DIR=$(cd $(dirname $0) && git rev-parse --path-format=absolute --git-common-dir) + CMAKE_FORMAT_VENV=${CMAKE_FORMAT_VENV:-${GIT_COMMON_DIR}/fmt/cmake_format_${CMAKE_FORMAT_VERSION}_venv} if [ ! -e ${CMAKE_FORMAT_VENV} ] then virtualenv ${CMAKE_FORMAT_VENV} @@ -85,5 +86,6 @@ function main() { if [[ "$(basename -- "$0")" == 'cmake-format.sh' ]]; then main "$@" else - CMAKE_FORMAT_VENV=${CMAKE_FORMAT_VENV:-$(git rev-parse --show-toplevel)/.git/fmt/cmake_format_${CMAKE_FORMAT_VERSION}_venv} + GIT_COMMON_DIR=$(git rev-parse --path-format=absolute --git-common-dir) + CMAKE_FORMAT_VENV=${CMAKE_FORMAT_VENV:-${GIT_COMMON_DIR}/fmt/cmake_format_${CMAKE_FORMAT_VERSION}_venv} fi diff --git a/tools/yapf.sh b/tools/yapf.sh index 7a429eba4a..2a163c3fc8 100755 --- a/tools/yapf.sh +++ b/tools/yapf.sh @@ -47,7 +47,8 @@ _END_ fi REPO_ROOT=$(cd $(dirname $0) && git rev-parse --show-toplevel) - YAPF_VENV=${YAPF_VENV:-${REPO_ROOT}/.git/fmt/yapf_${YAPF_VERSION}_venv} + GIT_COMMON_DIR=$(cd $(dirname $0) && git rev-parse --path-format=absolute --git-common-dir) + YAPF_VENV=${YAPF_VENV:-${GIT_COMMON_DIR}/fmt/yapf_${YAPF_VERSION}_venv} if [ ! -e ${YAPF_VENV} ] then python3 -m virtualenv ${YAPF_VENV} @@ -105,5 +106,6 @@ _END_ if [[ "$(basename -- "$0")" == 'yapf.sh' ]]; then main "$@" else - YAPF_VENV=${YAPF_VENV:-$(git rev-parse --show-toplevel)/.git/fmt/yapf_${YAPF_VERSION}_venv} + GIT_COMMON_DIR=$(git rev-parse --path-format=absolute --git-common-dir) + YAPF_VENV=${YAPF_VENV:-${GIT_COMMON_DIR}/fmt/yapf_${YAPF_VERSION}_venv} fi