Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
cf1c6346
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看板
提交
cf1c6346
编写于
8月 24, 2022
作者:
wafwerar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
build: cmake warning error
上级
94112865
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
20 deletion
+14
-20
cmake/cmake.define
cmake/cmake.define
+2
-0
packaging/release.bat
packaging/release.bat
+4
-14
source/client/src/clientEnv.c
source/client/src/clientEnv.c
+2
-0
source/os/src/osFile.c
source/os/src/osFile.c
+3
-2
source/os/src/osSysinfo.c
source/os/src/osSysinfo.c
+3
-4
未找到文件。
cmake/cmake.define
浏览文件 @
cf1c6346
...
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0)
...
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE OFF)
set(CMAKE_VERBOSE_MAKEFILE OFF)
SET(BUILD_SHARED_LIBS "OFF")
#set output directory
#set output directory
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
...
...
packaging/release.bat
浏览文件 @
cf1c6346
...
@@ -40,10 +40,12 @@ if not exist %work_dir%\debug\ver-%2-x86 (
...
@@ -40,10 +40,12 @@ if not exist %work_dir%\debug\ver-%2-x86 (
)
)
cd
%work_dir%
\debug\ver
-
%
2
-x
64
cd
%work_dir%
\debug\ver
-
%
2
-x
64
call
vcvarsall
.bat
x64
call
vcvarsall
.bat
x64
cmake
../../
-G
"NMake Makefiles JOM"
-DCMAKE
_MAKE_PROGRAM
=
jom
-DBUILD
_TOOLS
=
true
-DBUILD
_HTTP
=
false
-DVERNUMBER
=
%
2
-DCPUTYPE
=
x64
cmake
../../
-G
"NMake Makefiles JOM"
-DCMAKE
_MAKE_PROGRAM
=
jom
-DBUILD
_TOOLS
=
true
-DBUILD
_HTTP
=
false
-D
BUILD
_TEST
=
false
-D
VERNUMBER
=
%
2
-DCPUTYPE
=
x64
cmake
--build
.
cmake
--build
.
rd
/s /Q
C
:\TDengine
rd
/s /Q
C
:\TDengine
cmake
--install
.
cmake
--install
.
for
/r
c
:\TDengine
%%i
in
(*
.dll
)
do
signtool
sign
/f
D
:\\123.pfx
/p
taosdata
%%i
for
/r
c
:\TDengine
%%i
in
(*
.exe
)
do
signtool
sign
/f
D
:\\123.pfx
/p
taosdata
%%i
if
not
%errorlevel%
==
0
(
call
:RUNFAILED
build
x64
failed
&
exit
/b
1
)
if
not
%errorlevel%
==
0
(
call
:RUNFAILED
build
x64
failed
&
exit
/b
1
)
cd
%package_dir%
cd
%package_dir%
iscc
/DMyAppInstallName
=
"
%packagServerName
_x64
%
"
/DMyAppVersion
=
"
%
2"
/DMyAppExcludeSource
=
""
tools
\tdengine.iss
/O
..\release
iscc
/DMyAppInstallName
=
"
%packagServerName
_x64
%
"
/DMyAppVersion
=
"
%
2"
/DMyAppExcludeSource
=
""
tools
\tdengine.iss
/O
..\release
...
@@ -51,19 +53,7 @@ if not %errorlevel% == 0 ( call :RUNFAILED package %packagServerName_x64% faile
...
@@ -51,19 +53,7 @@ if not %errorlevel% == 0 ( call :RUNFAILED package %packagServerName_x64% faile
iscc
/DMyAppInstallName
=
"
%packagClientName
_x64
%
"
/DMyAppVersion
=
"
%
2"
/DMyAppExcludeSource
=
"taosd.exe"
tools
\tdengine.iss
/O
..\release
iscc
/DMyAppInstallName
=
"
%packagClientName
_x64
%
"
/DMyAppVersion
=
"
%
2"
/DMyAppExcludeSource
=
"taosd.exe"
tools
\tdengine.iss
/O
..\release
if
not
%errorlevel%
==
0
(
call
:RUNFAILED
package
%packagClientName
_x64
%
failed
&
exit
/b
1
)
if
not
%errorlevel%
==
0
(
call
:RUNFAILED
package
%packagClientName
_x64
%
failed
&
exit
/b
1
)
cd
%work_dir%
\debug\ver
-
%
2
-x
86
for
/r
..\release
%%i
in
(*
.exe
)
do
signtool
sign
/f
d
:\\123.pfx
/p
taosdata
%%i
call
vcvarsall
.bat
x86
cmake
../../
-G
"NMake Makefiles JOM"
-DCMAKE
_MAKE_PROGRAM
=
jom
-DBUILD
_TOOLS
=
true
-DBUILD
_HTTP
=
false
-DVERNUMBER
=
%
2
-DCPUTYPE
=
x86
cmake
--build
.
rd
/s /Q
C
:\TDengine
cmake
--install
.
if
not
%errorlevel%
==
0
(
call
:RUNFAILED
build
x86
failed
&
exit
/b
1
)
cd
%package_dir%
@REM iscc /DMyAppInstallName="%packagServerName_x86%" /DMyAppVersion="%2" /DMyAppExcludeSource="" tools\tdengine.iss /O..\release
@REM if not %errorlevel% == 0 ( call :RUNFAILED package %packagServerName_x86% failed & exit /b 1)
iscc
/DMyAppInstallName
=
"
%packagClientName
_x86
%
"
/DMyAppVersion
=
"
%
2"
/DMyAppExcludeSource
=
"taosd.exe"
tools
\tdengine.iss
/O
..\release
if
not
%errorlevel%
==
0
(
call
:RUNFAILED
package
%packagClientName
_x86
%
failed
&
exit
/b
1
)
goto
EXIT0
goto
EXIT0
:USAGE
:USAGE
...
...
source/client/src/clientEnv.c
浏览文件 @
cf1c6346
...
@@ -393,7 +393,9 @@ void taos_init_imp(void) {
...
@@ -393,7 +393,9 @@ void taos_init_imp(void) {
schedulerInit
();
schedulerInit
();
tscDebug
(
"starting to initialize TAOS driver"
);
tscDebug
(
"starting to initialize TAOS driver"
);
#ifndef WINDOWS
taosSetCoreDump
(
true
);
taosSetCoreDump
(
true
);
#endif
initTaskQueue
();
initTaskQueue
();
fmFuncMgtInit
();
fmFuncMgtInit
();
...
...
source/os/src/osFile.c
浏览文件 @
cf1c6346
...
@@ -203,10 +203,11 @@ int32_t taosRenameFile(const char *oldName, const char *newName) {
...
@@ -203,10 +203,11 @@ int32_t taosRenameFile(const char *oldName, const char *newName) {
}
}
int32_t
taosStatFile
(
const
char
*
path
,
int64_t
*
size
,
int32_t
*
mtime
)
{
int32_t
taosStatFile
(
const
char
*
path
,
int64_t
*
size
,
int32_t
*
mtime
)
{
struct
stat
fileStat
;
#ifdef WINDOWS
#ifdef WINDOWS
int32_t
code
=
_stat
(
path
,
&
fileStat
);
struct
_stati64
fileStat
;
int32_t
code
=
_stati64
(
path
,
&
fileStat
);
#else
#else
struct
stat
fileStat
;
int32_t
code
=
stat
(
path
,
&
fileStat
);
int32_t
code
=
stat
(
path
,
&
fileStat
);
#endif
#endif
if
(
code
<
0
)
{
if
(
code
<
0
)
{
...
...
source/os/src/osSysinfo.c
浏览文件 @
cf1c6346
...
@@ -851,13 +851,12 @@ char *taosGetCmdlineByPID(int pid) {
...
@@ -851,13 +851,12 @@ char *taosGetCmdlineByPID(int pid) {
}
}
void
taosSetCoreDump
(
bool
enable
)
{
void
taosSetCoreDump
(
bool
enable
)
{
if
(
!
enable
)
return
;
#ifdef WINDOWS
#ifdef WINDOWS
//
SetUnhandledExceptionFilter(exceptionHandler);
SetUnhandledExceptionFilter
(
exceptionHandler
);
//
SetUnhandledExceptionFilter(&FlCrashDump);
SetUnhandledExceptionFilter
(
&
FlCrashDump
);
#elif defined(_TD_DARWIN_64)
#elif defined(_TD_DARWIN_64)
#else
#else
if
(
!
enable
)
return
;
// 1. set ulimit -c unlimited
// 1. set ulimit -c unlimited
struct
rlimit
rlim
;
struct
rlimit
rlim
;
struct
rlimit
rlim_new
;
struct
rlimit
rlim_new
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录