Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CSDN产品汪
TDengine
提交
103b8794
T
TDengine
项目概览
CSDN产品汪
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
103b8794
编写于
12月 10, 2019
作者:
L
lihui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TBASE-1142/1319]
上级
b9a62d60
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
13 addition
and
7 deletion
+13
-7
packaging/release.sh
packaging/release.sh
+1
-0
packaging/tools/install.sh
packaging/tools/install.sh
+2
-2
packaging/tools/makeclient.sh
packaging/tools/makeclient.sh
+2
-3
src/inc/tglobalcfg.h
src/inc/tglobalcfg.h
+1
-0
src/system/detail/src/dnodeService.c
src/system/detail/src/dnodeService.c
+1
-0
src/util/src/tglobalcfg.c
src/util/src/tglobalcfg.c
+3
-0
src/util/src/version.c
src/util/src/version.c
+3
-2
未找到文件。
packaging/release.sh
浏览文件 @
103b8794
...
...
@@ -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
...
...
packaging/tools/install.sh
浏览文件 @
103b8794
...
...
@@ -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
...
...
packaging/tools/makeclient.sh
浏览文件 @
103b8794
...
...
@@ -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
=
"
${
co
mmunity_dir
}
/inc/taos.h
${
community
_dir
}
/inc/taoserror.h"
header_files
=
"
${
co
de_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
=
"
${
co
mmunity
_dir
}
/connector"
connector_dir
=
"
${
co
de
_dir
}
/connector"
mkdir
-p
${
install_dir
}
/connector
cp
${
build_dir
}
/lib/
*
.jar
${
install_dir
}
/connector
cp
-r
${
connector_dir
}
/grafana
${
install_dir
}
/connector/
...
...
src/inc/tglobalcfg.h
浏览文件 @
103b8794
...
...
@@ -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
];
...
...
src/system/detail/src/dnodeService.c
浏览文件 @
103b8794
...
...
@@ -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
)
{
...
...
src/util/src/tglobalcfg.c
浏览文件 @
103b8794
...
...
@@ -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
);
...
...
src/util/src/version.c
浏览文件 @
103b8794
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"
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录