From 51b8248ac8043f920ecb54529e9066371c73f518 Mon Sep 17 00:00:00 2001 From: Myaamori Date: Tue, 27 Oct 2020 19:31:58 +0000 Subject: [PATCH] meson: create git_version.h in build directory in version.sh --- meson.build | 2 +- tools/version.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index bbdc86a72..b1fdc0ae9 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ else endif version_inc = include_directories('.') version_h = custom_target('git_version.h', - command: [version_sh, meson.current_build_dir()], + command: [version_sh, meson.current_build_dir(), meson.current_source_dir()], build_by_default: true, build_always_stale: true, # has internal check whether target file will be refreshed output: ['git_version.h', 'git_version.xml']) diff --git a/tools/version.sh b/tools/version.sh index a950bae2f..a2d3c7b39 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -1,7 +1,8 @@ -srcdir="$1" +builddir="$1" +srcdir="$2" # If no git repo try to read from the existing git_version.h, for building from tarballs -version_h_path="${srcdir}/git_version.h" +version_h_path="${builddir}/git_version.h" if ! test -d "${srcdir}/.git"; then if test -f "${version_h_path}"; then while read line; do @@ -65,7 +66,7 @@ export BUILD_GIT_VERSION_NUMBER="${git_revision}" export BUILD_GIT_VERSION_STRING="${git_version_str}" export VERSION_SOURCE="from git" -cat << EOF > "${srcdir}/git_version.xml" +cat << EOF > "${builddir}/git_version.xml"