Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
52c985ff
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
52c985ff
编写于
11月 16, 2021
作者:
sangshuduo
提交者:
GitHub
11月 16, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-11070]<fix>: cmake jemalloc script. (#8697)
上级
1e61044b
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
32 addition
and
26 deletion
+32
-26
cmake/platform.inc
cmake/platform.inc
+1
-1
deps/CMakeLists.txt
deps/CMakeLists.txt
+2
-0
packaging/release.sh
packaging/release.sh
+6
-1
packaging/tools/make_install.sh
packaging/tools/make_install.sh
+23
-24
未找到文件。
cmake/platform.inc
浏览文件 @
52c985ff
...
@@ -36,7 +36,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
...
@@ -36,7 +36,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# Get OS information and store in variable TD_OS_INFO.
# Get OS information and store in variable TD_OS_INFO.
#
#
execute_process
(
COMMAND
chmod
777
$
{
TD_COMMUNITY_DIR
}
/
packaging
/
tools
/
get_os
.
sh
)
execute_process
(
COMMAND
chmod
777
$
{
TD_COMMUNITY_DIR
}
/
packaging
/
tools
/
get_os
.
sh
)
execute_process
(
COMMAND
sh
$
{
TD_COMMUNITY_DIR
}
/
packaging
/
tools
/
get_os
.
sh
""
OUTPUT_VARIABLE
TD_OS_INFO
)
execute_process
(
COMMAND
$
{
TD_COMMUNITY_DIR
}
/
packaging
/
tools
/
get_os
.
sh
""
OUTPUT_VARIABLE
TD_OS_INFO
)
MESSAGE
(
STATUS
"The current os is "
$
{
TD_OS_INFO
})
MESSAGE
(
STATUS
"The current os is "
$
{
TD_OS_INFO
})
SET
(
TD_LINUX
TRUE
)
SET
(
TD_LINUX
TRUE
)
...
...
deps/CMakeLists.txt
浏览文件 @
52c985ff
...
@@ -55,6 +55,7 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
...
@@ -55,6 +55,7 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
MESSAGE
(
""
)
MESSAGE
(
""
)
MESSAGE
(
"setup deps/jemalloc, current source dir:"
${
CMAKE_CURRENT_SOURCE_DIR
}
)
MESSAGE
(
"setup deps/jemalloc, current source dir:"
${
CMAKE_CURRENT_SOURCE_DIR
}
)
MESSAGE
(
"binary dir:"
${
CMAKE_BINARY_DIR
}
)
MESSAGE
(
"binary dir:"
${
CMAKE_BINARY_DIR
}
)
include
(
ExternalProject
)
ExternalProject_Add
(
jemalloc
ExternalProject_Add
(
jemalloc
PREFIX
"jemalloc"
PREFIX
"jemalloc"
SOURCE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/jemalloc
SOURCE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/jemalloc
...
@@ -62,6 +63,7 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
...
@@ -62,6 +63,7 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=
${
CMAKE_BINARY_DIR
}
/build/
CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=
${
CMAKE_BINARY_DIR
}
/build/
BUILD_COMMAND
${
MAKE
}
BUILD_COMMAND
${
MAKE
}
)
)
INCLUDE_DIRECTORIES
(
${
CMAKE_BINARY_DIR
}
/build/include
)
ENDIF
()
ENDIF
()
IF
(
${
TSZ_ENABLED
}
MATCHES
"true"
)
IF
(
${
TSZ_ENABLED
}
MATCHES
"true"
)
...
...
packaging/release.sh
浏览文件 @
52c985ff
...
@@ -213,7 +213,12 @@ else
...
@@ -213,7 +213,12 @@ else
exit
1
exit
1
fi
fi
make
-j8
&&
${
csudo
}
make
install
if
[[
"
$allocator
"
==
"jemalloc"
]]
;
then
# jemalloc need compile first, so disable parallel build
make
V
=
1
&&
${
csudo
}
make
install
else
make
-j8
&&
${
csudo
}
make
install
fi
cd
${
curr_dir
}
cd
${
curr_dir
}
...
...
packaging/tools/make_install.sh
浏览文件 @
52c985ff
...
@@ -204,31 +204,31 @@ function install_jemalloc() {
...
@@ -204,31 +204,31 @@ function install_jemalloc() {
/usr/bin/install
-c
-d
/usr/local/bin
/usr/bin/install
-c
-d
/usr/local/bin
if
[
-f
"
${
binary_dir
}
/build/bin/jemalloc-config"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/bin/jemalloc-config"
]
;
then
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jemalloc-config /usr/local/bin
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jemalloc-config /usr/local/bin
fi
fi
if
[
-f
"
${
binary_dir
}
/build/bin/jemalloc.sh"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/bin/jemalloc.sh"
]
;
then
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jemalloc.sh /usr/local/bin
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jemalloc.sh /usr/local/bin
fi
fi
if
[
-f
"
${
binary_dir
}
/build/bin/jeprof"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/bin/jeprof"
]
;
then
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jeprof /usr/local/bin
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jeprof /usr/local/bin
fi
fi
if
[
-f
"
${
binary_dir
}
/build/include/jemalloc/jemalloc.h"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/include/jemalloc/jemalloc.h"
]
;
then
/usr/bin/install
-c
-d
/usr/local/include/jemalloc
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/include/jemalloc
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/include/jemalloc/jemalloc.h
\
${
csudo
}
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/include/jemalloc/jemalloc.h
\
/usr/local/include/jemalloc
/usr/local/include/jemalloc
fi
fi
if
[
-f
"
${
binary_dir
}
/build/lib/libjemalloc.so.2"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/lib/libjemalloc.so.2"
]
;
then
/usr/bin/install
-c
-d
/usr/local/lib
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc.so.2 /usr/local/lib
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc.so.2 /usr/local/lib
ln
-sf
libjemalloc.so.2 /usr/local/lib/libjemalloc.so
${
csudo
}
ln
-sf
libjemalloc.so.2 /usr/local/lib/libjemalloc.so
/usr/bin/install
-c
-d
/usr/local/lib
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib
[
-f
${
binary_dir
}
/build/lib/libjemalloc.a
]
&&
[
-f
${
binary_dir
}
/build/lib/libjemalloc.a
]
&&
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc.a /usr/local/lib
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc.a /usr/local/lib
[
-f
${
binary_dir
}
/build/lib/libjemalloc_pic.a
]
&&
[
-f
${
binary_dir
}
/build/lib/libjemalloc_pic.a
]
&&
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc_pic.a /usr/local/lib
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc_pic.a /usr/local/lib
if
[
-f
"
${
binary_dir
}
/build/lib/pkgconfig/jemalloc.pc"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/lib/pkgconfig/jemalloc.pc"
]
;
then
/usr/bin/install
-c
-d
/usr/local/lib/pkgconfig
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib/pkgconfig
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/lib/pkgconfig/jemalloc.pc
\
${
csudo
}
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/lib/pkgconfig/jemalloc.pc
\
/usr/local/lib/pkgconfig
/usr/local/lib/pkgconfig
fi
fi
if
[
-d
/etc/ld.so.conf.d
]
;
then
if
[
-d
/etc/ld.so.conf.d
]
;
then
...
@@ -239,29 +239,28 @@ function install_jemalloc() {
...
@@ -239,29 +239,28 @@ function install_jemalloc() {
fi
fi
fi
fi
if
[
-f
"
${
binary_dir
}
/build/share/doc/jemalloc/jemalloc.html"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/share/doc/jemalloc/jemalloc.html"
]
;
then
/usr/bin/install
-c
-d
/usr/local/share/doc/jemalloc
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/share/doc/jemalloc
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/share/doc/jemalloc/jemalloc.html
\
${
csudo
}
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/share/doc/jemalloc/jemalloc.html
\
/usr/local/share/doc/jemalloc
/usr/local/share/doc/jemalloc
fi
fi
if
[
-f
"
${
binary_dir
}
/build/share/man/man3/jemalloc.3"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/share/man/man3/jemalloc.3"
]
;
then
/usr/bin/install
-c
-d
/usr/local/share/man/man3
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/share/man/man3
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/share/man/man3/jemalloc.3
\
${
csudo
}
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/share/man/man3/jemalloc.3
\
/usr/local/share/man/man3
/usr/local/share/man/man3
fi
fi
fi
fi
}
}
function
install_avro
()
{
function
install_avro
()
{
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/
$1
/libavro.so.23.0.0"
]
;
then
if
[
-f
"
${
binary_dir
}
/build/
$1
/libavro.so.23.0.0"
]
;
then
/usr/bin/install
-c
-d
/usr/local/
$1
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/
$1
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/
$1
/libavro.so.23.0.0 /usr/local/
$1
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/
$1
/libavro.so.23.0.0 /usr/local/
$1
ln
-sf
libavro.so.23.0.0 /usr/local/
$1
/libavro.so.23
${
csudo
}
ln
-sf
libavro.so.23.0.0 /usr/local/
$1
/libavro.so.23
ln
-sf
libavro.so.23 /usr/local/
$1
/libavro.so
${
csudo
}
ln
-sf
libavro.so.23 /usr/local/
$1
/libavro.so
/usr/bin/install
-c
-d
/usr/local/
$1
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/
$1
[
-f
${
binary_dir
}
/build/
$1
/libavro.a
]
&&
[
-f
${
binary_dir
}
/build/
$1
/libavro.a
]
&&
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/
$1
/libavro.a /usr/local/
$1
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/
$1
/libavro.a /usr/local/
$1
if
[
-d
/etc/ld.so.conf.d
]
;
then
if
[
-d
/etc/ld.so.conf.d
]
;
then
echo
"/usr/local/
$1
"
|
${
csudo
}
tee
/etc/ld.so.conf.d/libavro.conf
echo
"/usr/local/
$1
"
|
${
csudo
}
tee
/etc/ld.so.conf.d/libavro.conf
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录