From ec63e588139038f3e5e6b0d11b1f4917c233d1c3 Mon Sep 17 00:00:00 2001 From: slguan Date: Thu, 7 Nov 2019 22:34:08 +0800 Subject: [PATCH] fix package script error --- packaging/deb/makedeb.sh | 2 +- packaging/release.sh | 2 +- packaging/rpm/tdengine.spec | 2 +- packaging/tools/make_install.sh | 2 +- packaging/tools/makepkg.sh | 2 +- src/util/src/version.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh index 797a5ba824..d54953113a 100755 --- a/packaging/deb/makedeb.sh +++ b/packaging/deb/makedeb.sh @@ -24,7 +24,7 @@ fi mkdir -p ${pkg_dir} cd ${pkg_dir} -versioninfo=$(${script_dir}/../tools/get_version.sh ${script_dir}/../../src/util/lite/src/version.c) +versioninfo=$(${script_dir}/../tools/get_version.sh ${script_dir}/../../src/util/src/version.c) libfile="libtaos.so.${versioninfo}" # create install dir diff --git a/packaging/release.sh b/packaging/release.sh index a1baa76ff8..2091bed220 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -8,7 +8,7 @@ set -e curr_dir=$(pwd) script_dir="$(dirname $(readlink -f $0))" top_dir="$(readlink -m ${script_dir}/..)" -versioninfo="${top_dir}/src/util/lite/src/version.c" +versioninfo="${top_dir}/src/util/src/version.c" csudo="" if command -v sudo > /dev/null; then diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec index 1186485747..6e9e5e6f87 100644 --- a/packaging/rpm/tdengine.spec +++ b/packaging/rpm/tdengine.spec @@ -39,7 +39,7 @@ echo topdir: %{_topdir} echo version: %{_version} echo buildroot: %{buildroot} -versioninfo=$(%{_compiledir}/../packaging/tools/get_version.sh ../../src/util/lite/src/version.c) +versioninfo=$(%{_compiledir}/../packaging/tools/get_version.sh ../../src/util/src/version.c) libfile="libtaos.so.${versioninfo}" # create install path, and cp file diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh index ab632e6870..4660ba5b2a 100755 --- a/packaging/tools/make_install.sh +++ b/packaging/tools/make_install.sh @@ -101,7 +101,7 @@ function install_lib() { # Remove links ${csudo} rm -f ${lib_link_dir}/libtaos.* || : - versioninfo=$(${script_dir}/get_version.sh ${source_dir}/src/util/lite/src/version.c) + versioninfo=$(${script_dir}/get_version.sh ${source_dir}/src/util/src/version.c) ${csudo} cp ${binary_dir}/build/lib/libtaos.so.${versioninfo} ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* ${csudo} ln -sf ${install_main_dir}/driver/libtaos.so.${versioninfo} ${lib_link_dir}/libtaos.so.1 ${csudo} ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh index d7e9503e55..1a24ae8a1f 100755 --- a/packaging/tools/makepkg.sh +++ b/packaging/tools/makepkg.sh @@ -20,7 +20,7 @@ install_dir="${release_dir}/taos-${version}-${package_name}-$(echo ${build_time} # Directories and files. bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/taosdump ${script_dir}/remove.sh" -versioninfo=$(${script_dir}/get_version.sh ${code_dir}/util/lite/src/version.c) +versioninfo=$(${script_dir}/get_version.sh ${code_dir}/util/src/version.c) lib_files="${build_dir}/lib/libtaos.so.${versioninfo}" header_files="${code_dir}/inc/taos.h" cfg_files="${top_dir}/packaging/cfg/*.cfg" diff --git a/src/util/src/version.c b/src/util/src/version.c index ea077c951e..dc2c3c5480 100644 --- a/src/util/src/version.c +++ b/src/util/src/version.c @@ -1,4 +1,4 @@ char version[64] = "1.6.4.0"; char compatible_version[64] = "1.6.1.0"; -char gitinfo[128] = "a5754d4218b3f01d49e62f53190e861120ca0aba"; -char buildinfo[512] = "Built by ubuntu at 2019-11-06 18:24"; +char gitinfo[128] = "869171d2331eb25ba0901e88d33ae627bf5a9d91"; +char buildinfo[512] = "Built by ubuntu at 2019-11-07 22:31"; -- GitLab