Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
9cba7881
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
9cba7881
编写于
7月 30, 2022
作者:
wafwerar
提交者:
GitHub
7月 30, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15561 from taosdata/fix/ZhiqiangWang/TD-17728-remove-submodule
build: remove submodule
上级
def4481e
074ce5a2
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
43 addition
and
13 deletion
+43
-13
.gitmodules
.gitmodules
+0
-12
Jenkinsfile2
Jenkinsfile2
+2
-0
cmake/cmake.options
cmake/cmake.options
+6
-0
cmake/rust-bindings_CMakeLists.txt.in
cmake/rust-bindings_CMakeLists.txt.in
+12
-0
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+23
-0
examples/rust
examples/rust
+0
-1
未找到文件。
.gitmodules
已删除
100644 → 0
浏览文件 @
def4481e
[submodule "src/connector/go"]
path = src/connector/go
url = git@github.com:taosdata/driver-go.git
[submodule "src/connector/hivemq-tdengine-extension"]
path = src/connector/hivemq-tdengine-extension
url = git@github.com:taosdata/hivemq-tdengine-extension.git
[submodule "deps/TSZ"]
path = deps/TSZ
url = https://github.com/taosdata/TSZ.git
[submodule "examples/rust"]
path = examples/rust
url = https://github.com/songtianyi/tdengine-rust-bindings.git
Jenkinsfile2
浏览文件 @
9cba7881
...
@@ -118,6 +118,7 @@ def pre_test(){
...
@@ -118,6 +118,7 @@ def pre_test(){
git rm --cached tools/taos-tools 2>/dev/null || :
git rm --cached tools/taos-tools 2>/dev/null || :
git rm --cached tools/taosadapter 2>/dev/null || :
git rm --cached tools/taosadapter 2>/dev/null || :
git rm --cached tools/taosws-rs 2>/dev/null || :
git rm --cached tools/taosws-rs 2>/dev/null || :
git rm --cached examples/rust 2>/dev/null || :
'''
'''
sh '''
sh '''
cd ${WKC}
cd ${WKC}
...
@@ -269,6 +270,7 @@ def pre_test_win(){
...
@@ -269,6 +270,7 @@ def pre_test_win(){
git rm --cached tools/taos-tools 2>nul
git rm --cached tools/taos-tools 2>nul
git rm --cached tools/taosadapter 2>nul
git rm --cached tools/taosadapter 2>nul
git rm --cached tools/taosws-rs 2>nul
git rm --cached tools/taosws-rs 2>nul
git rm --cached examples/rust 2>nul
exit 0
exit 0
'''
'''
bat '''
bat '''
...
...
cmake/cmake.options
浏览文件 @
9cba7881
...
@@ -90,6 +90,12 @@ ELSE ()
...
@@ -90,6 +90,12 @@ ELSE ()
ENDIF ()
ENDIF ()
ENDIF ()
ENDIF ()
option(
RUST_BINDINGS
"If build with rust-bindings"
ON
)
option(
option(
JEMALLOC_ENABLED
JEMALLOC_ENABLED
"If build with jemalloc"
"If build with jemalloc"
...
...
cmake/rust-bindings_CMakeLists.txt.in
0 → 100644
浏览文件 @
9cba7881
# rust-bindings
ExternalProject_Add(rust-bindings
GIT_REPOSITORY https://github.com/songtianyi/tdengine-rust-bindings.git
GIT_TAG 7ed7a97
SOURCE_DIR "${TD_SOURCE_DIR}/examples/rust"
BINARY_DIR "${TD_SOURCE_DIR}/examples/rust"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
contrib/CMakeLists.txt
浏览文件 @
9cba7881
...
@@ -105,6 +105,11 @@ if(${BUILD_WITH_SQLITE})
...
@@ -105,6 +105,11 @@ if(${BUILD_WITH_SQLITE})
cat
(
"
${
TD_SUPPORT_DIR
}
/sqlite_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/sqlite_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
endif
(
${
BUILD_WITH_SQLITE
}
)
endif
(
${
BUILD_WITH_SQLITE
}
)
# rust-bindings
if
(
${
RUST_BINDINGS
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/rust-bindings_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
endif
(
${
RUST_BINDINGS
}
)
# lucene
# lucene
if
(
${
BUILD_WITH_LUCENE
}
)
if
(
${
BUILD_WITH_LUCENE
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/lucene_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
cat
(
"
${
TD_SUPPORT_DIR
}
/lucene_CMakeLists.txt.in"
${
CONTRIB_TMP_FILE
}
)
...
@@ -135,6 +140,24 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
...
@@ -135,6 +140,24 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
WORKING_DIRECTORY
"
${
TD_CONTRIB_DIR
}
/deps-download"
)
WORKING_DIRECTORY
"
${
TD_CONTRIB_DIR
}
/deps-download"
)
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
--build .
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
--build .
WORKING_DIRECTORY
"
${
TD_CONTRIB_DIR
}
/deps-download"
)
WORKING_DIRECTORY
"
${
TD_CONTRIB_DIR
}
/deps-download"
)
# clear submodule
execute_process
(
COMMAND git submodule deinit -f tools/taos-tools
WORKING_DIRECTORY
"
${
TD_SOURCE_DIR
}
"
)
execute_process
(
COMMAND git rm --cached tools/taos-tools
WORKING_DIRECTORY
"
${
TD_SOURCE_DIR
}
"
)
execute_process
(
COMMAND git submodule deinit -f tools/taosadapter
WORKING_DIRECTORY
"
${
TD_SOURCE_DIR
}
"
)
execute_process
(
COMMAND git rm --cached tools/taosadapter
WORKING_DIRECTORY
"
${
TD_SOURCE_DIR
}
"
)
execute_process
(
COMMAND git submodule deinit -f tools/taosws-rs
WORKING_DIRECTORY
"
${
TD_SOURCE_DIR
}
"
)
execute_process
(
COMMAND git rm --cached tools/taosws-rs
WORKING_DIRECTORY
"
${
TD_SOURCE_DIR
}
"
)
execute_process
(
COMMAND git submodule deinit -f examples/rust
WORKING_DIRECTORY
"
${
TD_SOURCE_DIR
}
"
)
execute_process
(
COMMAND git rm --cached examples/rust
WORKING_DIRECTORY
"
${
TD_SOURCE_DIR
}
"
)
# ================================================================================================
# ================================================================================================
# Build
# Build
...
...
rust
@
7ed7a977
比较
7ed7a977
...
7ed7a977
Subproject commit 7ed7a97715388fa144718764d6bf20f9bfc29a12
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录