From 30ad9ca62d3e47f6f806538d7b733dbab67710f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Thu, 5 Jan 2023 08:01:48 +0100 Subject: [PATCH] core: rename script git-version.sh to set_git_version.sh --- CMakeLists.txt | 2 +- ChangeLog.adoc | 1 + Makefile.am | 4 ++-- tools/{git-version.sh => set_git_version.sh} | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) rename tools/{git-version.sh => set_git_version.sh} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d0fa1fdc..c477a8869 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -247,7 +247,7 @@ configure_file(config.h.cmake config.h @ONLY) # set the git version in "config-git.h" add_custom_target(version_git ALL - COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h" + COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/set_git_version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index d6698b95f..672289d68 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -65,6 +65,7 @@ Tests:: Build:: + * core: rename script git-version.sh to set_git_version.sh * debian: change dependency guile-2.2-dev to guile-3.0-dev * python: remove support of Python 2.x * ruby: add detection of Ruby 3.2 diff --git a/Makefile.am b/Makefile.am index 972ef4502..b02ee948c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ # (if needed, and only for a devel/rc version). BUILT_SOURCES = build-config-git.h build-config-git.h: - -$(abs_top_srcdir)/tools/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h + -$(abs_top_srcdir)/tools/set_git_version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h if TESTS tests_dir = tests @@ -61,7 +61,7 @@ EXTRA_DIST = AUTHORS.adoc \ po/CMakeLists.txt \ po/srcfiles.cmake \ tools/build-test.sh \ - tools/git-version.sh \ + tools/set_git_version.sh \ tools/makedist.sh \ version.sh \ weechat.desktop \ diff --git a/tools/git-version.sh b/tools/set_git_version.sh similarity index 97% rename from tools/git-version.sh rename to tools/set_git_version.sh index a983a5dac..fb2293be0 100755 --- a/tools/git-version.sh +++ b/tools/set_git_version.sh @@ -22,7 +22,7 @@ # Updates git version in config-git.h if the output of "git describe" has changed. # # Syntax: -# git-version.sh +# set_git_version.sh # # rootdir : root directory with WeeChat files (to search .git/ directory) # version : WeeChat version, for example 0.3.9 or 0.4.0-dev