diff --git a/packaging/release.sh b/packaging/release.sh index 58f69589d831f51604a67d54942520cb41700bc2..08edce249e3d81a24fb189692bf95dbd8e9ad9be 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -109,6 +109,7 @@ build_time=$(date +"%F %R") echo "char version[64] = \"${version}\";" > ${versioninfo} echo "char compatible_version[64] = \"${compatible_version}\";" >> ${versioninfo} echo "char gitinfo[128] = \"$(git rev-parse --verify HEAD)\";" >> ${versioninfo} +echo "char gitinfoOfInternal[128] = \"\";" >> ${versioninfo} echo "char buildinfo[512] = \"Built by ${USER} at ${build_time}\";" >> ${versioninfo} # 2. cmake executable file diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh index 019e614e0b8333a55a8bdf8318aa5a865032cbd3..e1bcce401d419ce7a97c4110161777cfeea4f0e5 100755 --- a/packaging/tools/install.sh +++ b/packaging/tools/install.sh @@ -313,9 +313,9 @@ vercomp () { function is_version_compatible() { - curr_version=$(${bin_dir}/taosd -V | head -1 | cut -d ' ' -f 2) + curr_version=$(${bin_dir}/taosd -V | head -1 | cut -d ' ' -f 3) - min_compatible_version=$(${script_dir}/bin/taosd -V | head -1 | cut -d ' ' -f 4) + min_compatible_version=$(${script_dir}/bin/taosd -V | head -1 | cut -d ' ' -f 5) vercomp $curr_version $min_compatible_version case $? in diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh index b4948bb3a7ffa1f2fd80cf5fd7313ae8bdea2a37..f8d21e202b8649c03d40d33d1c43c6338b12f790 100755 --- a/packaging/tools/makeclient.sh +++ b/packaging/tools/makeclient.sh @@ -17,7 +17,6 @@ top_dir="$(readlink -m ${script_dir}/../..)" build_dir="${compile_dir}/build" code_dir="${top_dir}/src" release_dir="${top_dir}/release" -community_dir="${script_dir}/../../../community/src" #package_name='linux' install_dir="${release_dir}/TDengine-client-${version}" @@ -25,7 +24,7 @@ install_dir="${release_dir}/TDengine-client-${version}" # Directories and files. bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdump ${script_dir}/remove_client.sh" lib_files="${build_dir}/lib/libtaos.so.${version}" -header_files="${community_dir}/inc/taos.h ${community_dir}/inc/taoserror.h" +header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h" cfg_dir="${top_dir}/packaging/cfg" install_files="${script_dir}/install_client.sh" @@ -55,7 +54,7 @@ mkdir -p ${install_dir}/driver cp ${lib_files} ${install_dir}/driver # Copy connector -connector_dir="${community_dir}/connector" +connector_dir="${code_dir}/connector" mkdir -p ${install_dir}/connector cp ${build_dir}/lib/*.jar ${install_dir}/connector cp -r ${connector_dir}/grafana ${install_dir}/connector/ diff --git a/src/inc/tglobalcfg.h b/src/inc/tglobalcfg.h index ede3c97ce9f874152e8b81d78b6b1b19adc49b49..63cff06e83f61103350fc752c113a026da296710 100644 --- a/src/inc/tglobalcfg.h +++ b/src/inc/tglobalcfg.h @@ -179,6 +179,7 @@ extern int tsUdpDelay; extern char version[]; extern char compatible_version[]; extern char gitinfo[]; +extern char gitinfoOfInternal[]; extern char buildinfo[]; extern char tsTimezone[64]; diff --git a/src/system/detail/src/dnodeService.c b/src/system/detail/src/dnodeService.c index f03bd5f3bbcd4ef8daefbcb223dc6592156f3a9f..2de60bda91f2fb172c2741cac6d15932b93e7d55 100644 --- a/src/system/detail/src/dnodeService.c +++ b/src/system/detail/src/dnodeService.c @@ -62,6 +62,7 @@ int main(int argc, char *argv[]) { #endif printf("gitinfo: %s\n", gitinfo); + printf("gitinfoI: %s\n", gitinfoOfInternal); printf("buildinfo: %s\n", buildinfo); return 0; } else if (strcmp(argv[i], "-k") == 0) { diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c index cef11d30cba8fe4488a0cc6adcad7b4143f4fe8d..00da094d5fadae31c7dd34def8de42296b62d7ac 100644 --- a/src/util/src/tglobalcfg.c +++ b/src/util/src/tglobalcfg.c @@ -783,6 +783,9 @@ static void doInitGlobalConfig() { tsInitConfigOption(cfg++, "gitinfo", gitinfo, TSDB_CFG_VTYPE_STRING, TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT, 0, 0, 0, TSDB_CFG_UTYPE_NONE); + tsInitConfigOption(cfg++, "gitinfoOfInternal", gitinfoOfInternal, TSDB_CFG_VTYPE_STRING, + TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT, + 0, 0, 0, TSDB_CFG_UTYPE_NONE); tsInitConfigOption(cfg++, "buildinfo", buildinfo, TSDB_CFG_VTYPE_STRING, TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT, 0, 0, 0, TSDB_CFG_UTYPE_NONE); diff --git a/src/util/src/version.c b/src/util/src/version.c index df490eb0aa92b5d5529b76026b078cba3310790d..4f88d6170c672925f20d2bb009f2b5b0dfa0b594 100644 --- a/src/util/src/version.c +++ b/src/util/src/version.c @@ -1,4 +1,5 @@ char version[64] = "1.6.4.2"; char compatible_version[64] = "1.6.1.0"; -char gitinfo[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7"; -char buildinfo[512] = "Built by ubuntu at 2019-12-06 13:59"; +char gitinfo[128] = "b9a62d60dc1d4a41452a9bc94e3a0924485c3a75"; +char gitinfoOfInternal[128] = "e6445addc77e8c96dcb57221fa6ab5dcde0458f7"; +char buildinfo[512] = "Built by root at 2019-12-10 10:31";